add hashable generator with test

Author: wangjiejacques

CodeGenerator.xcodeproj/project.pbxproj

@@ -48,6 +48,12 @@
 		A08C585C1E13C5AA00034B76 /* ClosureType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08C585A1E13C5AA00034B76 /* ClosureType.swift */; };
 		A08C585E1E13CB8300034B76 /* SwiftType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08C585D1E13CB8300034B76 /* SwiftType.swift */; };
 		A08C585F1E13CB8300034B76 /* SwiftType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08C585D1E13CB8300034B76 /* SwiftType.swift */; };
+		A0A02CC31E1A60EA001900DC /* Generator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A02CC21E1A60EA001900DC /* Generator.swift */; };
+		A0A02CC51E1A616C001900DC /* HashableGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A02CC41E1A616C001900DC /* HashableGenerator.swift */; };
+		A0A02CC71E1A6868001900DC /* HashableGeneratorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A02CC61E1A6868001900DC /* HashableGeneratorTest.swift */; };
+		A0A02CC91E1A68D8001900DC /* GeneratedHash.txt in Resources */ = {isa = PBXBuildFile; fileRef = A0A02CC81E1A68D8001900DC /* GeneratedHash.txt */; };
+		A0A02CCA1E1A6A16001900DC /* HashableGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A02CC41E1A616C001900DC /* HashableGenerator.swift */; };
+		A0A02CCB1E1A6A3F001900DC /* Generator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A02CC21E1A60EA001900DC /* Generator.swift */; };
 		A0A82AE71E11571200F27EA3 /* interface1.txt in Resources */ = {isa = PBXBuildFile; fileRef = A0A82AE61E11571200F27EA3 /* interface1.txt */; };
 		A0A82AE91E11593800F27EA3 /* interface1Mock.txt in Resources */ = {isa = PBXBuildFile; fileRef = A0A82AE81E11593800F27EA3 /* interface1Mock.txt */; };
 		A0A82AEB1E1159C200F27EA3 /* NSObject+file.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A82AEA1E1159C200F27EA3 /* NSObject+file.swift */; };
@@ -134,6 +140,10 @@
 		A07FE2811E108D6900809837 /* InterfaceMockerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceMockerTests.swift; sourceTree = "<group>"; };
 		A08C585A1E13C5AA00034B76 /* ClosureType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClosureType.swift; sourceTree = "<group>"; };
 		A08C585D1E13CB8300034B76 /* SwiftType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftType.swift; sourceTree = "<group>"; };
+		A0A02CC21E1A60EA001900DC /* Generator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Generator.swift; sourceTree = "<group>"; };
+		A0A02CC41E1A616C001900DC /* HashableGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HashableGenerator.swift; sourceTree = "<group>"; };
+		A0A02CC61E1A6868001900DC /* HashableGeneratorTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HashableGeneratorTest.swift; sourceTree = "<group>"; };
+		A0A02CC81E1A68D8001900DC /* GeneratedHash.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GeneratedHash.txt; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		A0A82AE61E11571200F27EA3 /* interface1.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = interface1.txt; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		A0A82AE81E11593800F27EA3 /* interface1Mock.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = interface1Mock.txt; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		A0A82AEA1E1159C200F27EA3 /* NSObject+file.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+file.swift"; sourceTree = "<group>"; };
@@ -248,12 +258,14 @@
 				A0A82B1B1E127E9F00F27EA3 /* AccessLevelTests.swift */,
 				A0A82AEE1E11676B00F27EA3 /* SwiftTypeTests.swift */,
 				A0636FD51E1299100008CE98 /* EquatableGeneratorTests.swift */,
+				A0A02CC61E1A6868001900DC /* HashableGeneratorTest.swift */,
 				A0A82AEA1E1159C200F27EA3 /* NSObject+file.swift */,
 				A0A82AE61E11571200F27EA3 /* interface1.txt */,
 				A0A82AE81E11593800F27EA3 /* interface1Mock.txt */,
 				A03920701E0F3A7B005A6E89 /* Info.plist */,
 				A0636FD71E12997C0008CE98 /* EquatableClazz.txt */,
 				A0636FD91E1299A80008CE98 /* GeneratedEquals.txt */,
+				A0A02CC81E1A68D8001900DC /* GeneratedHash.txt */,
 				A04453D21E156A080063CB99 /* funcMock.txt */,
 			);
 			path = CodeGeneratorTests;
@@ -294,7 +306,9 @@
 		A0636FD21E12944B0008CE98 /* Equatable */ = {
 			isa = PBXGroup;
 			children = (
+				A0A02CC21E1A60EA001900DC /* Generator.swift */,
 				A0636FD31E1294650008CE98 /* EquatableGenerator.swift */,
+				A0A02CC41E1A616C001900DC /* HashableGenerator.swift */,
 			);
 			name = Equatable;
 			sourceTree = "<group>";
@@ -418,6 +432,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A0A02CC91E1A68D8001900DC /* GeneratedHash.txt in Resources */,
 				A0A82AE91E11593800F27EA3 /* interface1Mock.txt in Resources */,
 				A0636FDA1E1299A80008CE98 /* GeneratedEquals.txt in Resources */,
 				A0A82AE71E11571200F27EA3 /* interface1.txt in Resources */,
@@ -457,6 +472,8 @@
 				A0A82B1D1E127F1000F27EA3 /* AccessLevel.swift in Sources */,
 				A08C585E1E13CB8300034B76 /* SwiftType.swift in Sources */,
 				A0636FDB1E129B3E0008CE98 /* EquatableGenerator.swift in Sources */,
+				A0A02CCA1E1A6A16001900DC /* HashableGenerator.swift in Sources */,
+				A0A02CCB1E1A6A3F001900DC /* Generator.swift in Sources */,
 				A0E276661E1542D3003CC557 /* ParamMocker.swift in Sources */,
 				A01E468D1E1010C100395AED /* FuncParam.swift in Sources */,
 			);
@@ -468,6 +485,7 @@
 			files = (
 				A01E46951E1030E000395AED /* VarSignatureTests.swift in Sources */,
 				A0A82AEF1E11676B00F27EA3 /* SwiftTypeTests.swift in Sources */,
+				A0A02CC71E1A6868001900DC /* HashableGeneratorTest.swift in Sources */,
 				A0636FD61E1299100008CE98 /* EquatableGeneratorTests.swift in Sources */,
 				A01E467E1E0FE57A00395AED /* InterfaceSignatureTests.swift in Sources */,
 				A01E46911E1017F100395AED /* FuncSignatureTests.swift in Sources */,
@@ -500,7 +518,9 @@
 				A0636FD41E1294650008CE98 /* EquatableGenerator.swift in Sources */,
 				A01E46781E0FE21500395AED /* InterfaceSignature.swift in Sources */,
 				A01E46831E0FF78300395AED /* InterfaceMocker.swift in Sources */,
+				A0A02CC51E1A616C001900DC /* HashableGenerator.swift in Sources */,
 				A03920871E0F3A8B005A6E89 /* GenerateMockCommand.swift in Sources */,
+				A0A02CC31E1A60EA001900DC /* Generator.swift in Sources */,
 				A0E2765D1E142670003CC557 /* ParamMocker.swift in Sources */,
 				A01E468A1E100FB200395AED /* FuncParam.swift in Sources */,
 			);

CodeGeneratorTests/GeneratedHash.txt

@@ -0,0 +1,15 @@
+
+extension EquatableClazz: Hashable {
+    static func ==(lhs: EquatableClazz, rhs: EquatableClazz) -> Bool {
+        return lhs.var0 == rhs.var0 && lhs.var1 == rhs.var1 && lhs.var2 == rhs.var2
+    }
+
+    var hashValue: Int {
+        var hashValue = 1
+        let hashableVars: [Hashable?] = [var0, var1, var2]
+        hashableVars.forEach {
+            hashValue = 31 * hashValue + $0?.hashValue ?? 0
+        }
+        return hashValue
+    }
+}

CodeGeneratorTests/HashableGeneratorTest.swift

@@ -0,0 +1,37 @@
+//
+//  HashableGeneratorTest.swift
+//  CodeGenerator
+//
+//  Created by WANG Jie on 02/01/2017.
+//  Copyright © 2017 wangjie. All rights reserved.
+//
+
+import XCTest
+@testable import CodeGenerator
+
+class HashableGeneratorTest: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testEquatableGenerator() {
+        let source = string(from: "EquatableClazz", ofType: "txt")
+        let interface = InterfaceSignature(interfaceSource: source, lines: source.components(separatedBy: "\n"))
+        let hashableeGenerator = HashableGenerator(interfaceSignature: interface, indentation: "    ")
+
+        var expectedHashSource = string(from: "GeneratedHash", ofType: "txt").components(separatedBy: "\n")
+        expectedHashSource.removeLast()
+
+        XCTAssertEqual(hashableeGenerator.lines.count, expectedHashSource.count)
+        let count = min(hashableeGenerator.lines.count, expectedHashSource.count)
+        for i in 0..<count {
+            XCTAssertEqual(hashableeGenerator.lines[i], expectedHashSource[i])
+        }
+    }
+}

Generate.../EquatableGenerator.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-struct EquatableGenerator {
+struct EquatableGenerator: Generator {
     let varSignatures: [VarSignature]
     let indentation: String
     let interfaceDefinition: InterfaceDefinition
@@ -33,14 +33,20 @@ struct EquatableGenerator {
         var lines = [String]()
         lines.append("")
         lines.append("extension \(interfaceName): Equatable {")
+        lines.append(contentsOf: equatableLines)
+        lines.append("}")
+        return lines
+    }
+
+    var equatableLines: [String] {
+        var lines = [String]()
         lines.append("\(indentation)static func ==(lhs: \(interfaceName), rhs: \(interfaceName)) -> Bool {")
         var varsEquals = [String]()
         varSignatures.forEach { varSignature in
             varsEquals.append("lhs.\(varSignature.name) == rhs.\(varSignature.name)")
         }
         lines.append("\(indentation)\(indentation)return \(varsEquals.joined(separator: " && "))")
         lines.append("\(indentation)}")
-        lines.append("}")
         return lines
     }
 }

Generate.../Generator.swift

@@ -0,0 +1,13 @@
+//
+//  Generator.swift
+//  CodeGenerator
+//
+//  Created by WANG Jie on 02/01/2017.
+//  Copyright © 2017 wangjie. All rights reserved.
+//
+
+import Foundation
+
+protocol Generator {
+    var lines: [String] { get }
+}

Generate.../HashableGenerator.swift

@@ -0,0 +1,65 @@
+//
+//  HashableGenerator.swift
+//  CodeGenerator
+//
+//  Created by WANG Jie on 02/01/2017.
+//  Copyright © 2017 wangjie. All rights reserved.
+//
+
+import Foundation
+
+struct HashableGenerator: Generator {
+    var equatableGenerator: EquatableGenerator
+
+    var interfaceName: String {
+        return equatableGenerator.interfaceDefinition.name
+    }
+
+    var indentation: String {
+        return equatableGenerator.indentation
+    }
+
+    var varSignatures: [VarSignature] {
+        return equatableGenerator.varSignatures
+    }
+
+    init(interfaceSignature: InterfaceSignature, indentation: String) {
+        self.equatableGenerator = EquatableGenerator(interfaceSignature: interfaceSignature, indentation: indentation)
+    }
+
+    init(interfaceDefinition: InterfaceDefinition, varSignatures: [VarSignature], indentation: String) {
+        self.equatableGenerator = EquatableGenerator(interfaceDefinition: interfaceDefinition, varSignatures: varSignatures, indentation: indentation)
+    }
+
+    var lines: [String] {
+        var lines = [String]()
+        lines.append("")
+        lines.append("extension \(interfaceName): Hashable {")
+        lines.append(contentsOf: equatableGenerator.equatableLines)
+        lines.append("")
+        lines.append(contentsOf: hashValueLines)
+        lines.append("}")
+        return lines
+    }
+
+    var hashValueLines: [String] {
+        var lines = [String]()
+        lines.append("\(indentation)var hashValue: Int {")
+        lines.append("\(indentation)\(indentation)var hashValue = 1")
+        let hashableVars = varSignatures.map { $0.name }.joined(separator: ", ")
+        var varsType = "[Hashable]"
+        var varHash = "$0.hashValue"
+        if (varSignatures.filter { $0.type.isOptional }).count > 0 {
+            varsType = "[Hashable?]"
+            varHash = "$0?.hashValue ?? 0"
+        }
+        lines.append("\(indentation)\(indentation)let hashableVars: \(varsType) = [\(hashableVars)]")
+
+        lines.append("\(indentation)\(indentation)hashableVars.forEach {")
+        lines.append("\(indentation)\(indentation)\(indentation)hashValue = 31 * hashValue + \(varHash)")
+        lines.append("\(indentation)\(indentation)}")
+        lines.append("\(indentation)\(indentation)return hashValue")
+        lines.append("\(indentation)}")
+        return lines
+    }
+}