Merge pull request #5 from kayak/features/additional_attributions

Allow adding additional attributions
kayak · Jun 14, 2019 · e4891aa · e4891aa
2 parents 9a77769 + 346b006
commit e4891aa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/Attributions/Attributions/Attribution.swift b/Attributions/Attributions/Attribution.swift
@@ -1,10 +1,10 @@
 import Foundation
 
-class Attribution {
+public class Attribution {
 
-    let name: String
-    let displayedForMainBundleIDs: [String]
-    let license: License
+    public let name: String
+    public let displayedForMainBundleIDs: [String]
+    public let license: License
 
     convenience init?(json: [AnyHashable: Any]) {
         guard
@@ -19,7 +19,7 @@ class Attribution {
         self.init(name: name, displayedForMainBundleIDs: displayedForMainBundleIDs, license: license)
     }
 
-    init(name: String, displayedForMainBundleIDs: [String], license: License) {
+    public init(name: String, displayedForMainBundleIDs: [String], license: License) {
         self.name = name
         self.displayedForMainBundleIDs = displayedForMainBundleIDs
         self.license = license

diff --git a/Attributions/Attributions/AttributionReader.swift b/Attributions/Attributions/AttributionReader.swift
@@ -5,11 +5,12 @@ class AttributionReader {
     func compileAttributions(sections: [AttributionSection], mainBundle: Bundle, licenseFiles: [String]) throws -> [[Attribution]] {
         var attributionsPerSection = [[Attribution]]()
         for section in sections {
-            let attributions = try jsonToAttribution(file: section.file, mainBundle: mainBundle)
+            var attributions = try jsonToAttribution(file: section.file, mainBundle: mainBundle)
             try attributions.forEach {
                 let licenseReader = LicenseReader(attribution: $0, licenseFiles: licenseFiles)
                 try licenseReader.verifyLicenseExists()
             }
+            attributions.append(contentsOf: section.additionalAttributions)
             attributionsPerSection.append(attributions)
         }
         return attributionsPerSection

diff --git a/Attributions/Attributions/AttributionSection.swift b/Attributions/Attributions/AttributionSection.swift
@@ -4,10 +4,12 @@ public struct AttributionSection {
 
     public let file: URL
     public let description: String
+    public let additionalAttributions: [Attribution]
 
-    public init(file: URL, description: String) {
+    public init(file: URL, description: String, additionalAttributions: [Attribution] = []) {
         self.file = file
         self.description = description
+        self.additionalAttributions = additionalAttributions
     }
 
 }
diff --git a/Attributions/Attributions/License.swift b/Attributions/Attributions/License.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-enum License {
+public enum License {
 
     case id(String)
     case text(String)

diff --git a/Attributions/AttributionsTests/AttributionReaderTests.swift b/Attributions/AttributionsTests/AttributionReaderTests.swift
@@ -18,11 +18,13 @@ class AttributionReaderTests: XCTestCase {
             XCTFail()
             return
         }
-        sections.append(AttributionSection(file: path, description: "GoodJSON"))
+        let additionalAttribution = Attribution(name: "Additional Framework", displayedForMainBundleIDs: [], license: .text("It's free!!!"))
+        sections.append(AttributionSection(file: path, description: "GoodJSON", additionalAttributions: [additionalAttribution]))
 
         verifyReadingSections(framework: "Apache", hasBundleIDs: [])
         verifyReadingSections(framework: "Eclipse", hasBundleIDs: [])
         verifyReadingSections(framework: "Another Framework", hasBundleIDs: ["com.kayak.AttributionsTests"])
+        verifyReadingSections(framework: "Additional Framework", hasBundleIDs: [])
     }
 
     func testThrowsErrorForBadLicenseKey() {