Add join() as an extension of SequenceType.

Author: natestedman

Attributed.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		433A9C0E1BECF169009A3919 /* SequenceType+Join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433A9C0D1BECF169009A3919 /* SequenceType+Join.swift */; };
+		433A9C0F1BECF169009A3919 /* SequenceType+Join.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433A9C0D1BECF169009A3919 /* SequenceType+Join.swift */; };
 		434DBBC81BEC39FA00C11F09 /* NSUnderlineStyle+Attributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434DBBC71BEC39FA00C11F09 /* NSUnderlineStyle+Attributes.swift */; };
 		434DBBCA1BEC3AD000C11F09 /* NSShadow+Attributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434DBBC91BEC3AD000C11F09 /* NSShadow+Attributes.swift */; };
 		434DBBCB1BEC3AD000C11F09 /* NSShadow+Attributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434DBBC91BEC3AD000C11F09 /* NSShadow+Attributes.swift */; };
@@ -62,6 +64,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		433A9C0D1BECF169009A3919 /* SequenceType+Join.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SequenceType+Join.swift"; sourceTree = "<group>"; };
 		434DBBC71BEC39FA00C11F09 /* NSUnderlineStyle+Attributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSUnderlineStyle+Attributes.swift"; sourceTree = "<group>"; };
 		434DBBC91BEC3AD000C11F09 /* NSShadow+Attributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSShadow+Attributes.swift"; sourceTree = "<group>"; };
 		43C752301BEA525100F928E5 /* ColorType+Attributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ColorType+Attributes.swift"; sourceTree = "<group>"; };
@@ -153,6 +156,7 @@
 				434DBBC91BEC3AD000C11F09 /* NSShadow+Attributes.swift */,
 				43C752391BEA601900F928E5 /* NSTextAttachment+Attributes.swift */,
 				434DBBC71BEC39FA00C11F09 /* NSUnderlineStyle+Attributes.swift */,
+				433A9C0D1BECF169009A3919 /* SequenceType+Join.swift */,
 			);
 			name = Extensions;
 			sourceTree = "<group>";
@@ -371,6 +375,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				433A9C0E1BECF169009A3919 /* SequenceType+Join.swift in Sources */,
 				43C993E91BE3BDC000CF90DD /* PlatformTypes.swift in Sources */,
 				434DBBCA1BEC3AD000C11F09 /* NSShadow+Attributes.swift in Sources */,
 				43C752401BEA61B000F928E5 /* Ligature+Attributes.swift in Sources */,
@@ -401,6 +406,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				433A9C0F1BECF169009A3919 /* SequenceType+Join.swift in Sources */,
 				434DBBCC1BEC3AD400C11F09 /* NSUnderlineStyle+Attributes.swift in Sources */,
 				43C994131BE3DE8900CF90DD /* Functions.swift in Sources */,
 				43C752411BEA61B000F928E5 /* Ligature+Attributes.swift in Sources */,

Attributed/Functions.swift

@@ -8,26 +8,6 @@
 // You should have received a copy of the CC0 Public Domain Dedication along with
 // this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-/**
- Joins multiple `AttributedStringConvertible` values into one.
-
- - parameter strings: The convertibles to join.
-*/
-public func Join(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-{
-    return NestedAttributedString(attributes: [:], children: strings)
-}
-
-/**
- Joins multiple `AttributedStringConvertible` values into one.
- 
- - parameter strings: The convertibles to join.
- */
-public func Join(strings: [AttributedStringConvertible]) -> AttributedStringConvertible
-{
-    return NestedAttributedString(attributes: [:], children: strings)
-}
-
 /**
  Returns an attributed string convertible with the specified attributes applied at the root level.
 

Attributed/SequenceType+Join.swift

@@ -0,0 +1,20 @@
+// Attributed
+// Written in 2015 by Nate Stedman <[email protected]>
+//
+// To the extent possible under law, the author(s) have dedicated all copyright and
+// related and neighboring rights to this software to the public domain worldwide.
+// This software is distributed without any warranty.
+//
+// You should have received a copy of the CC0 Public Domain Dedication along with
+// this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+public extension SequenceType where Generator.Element == AttributedStringConvertible
+{
+    /**
+     Joins multiple `AttributedStringConvertible` values into one.
+     */
+    public func join() -> AttributedStringConvertible
+    {
+        return NestedAttributedString(attributes: [:], children: Array(self))
+    }
+}

AttributedTests/AttributedTests.swift

@@ -76,4 +76,17 @@ class AttributedTests: XCTestCase
 
         XCTAssertEqual(attributed, mutable)
     }
+    
+    func testJoin()
+    {
+        let attributed = [
+            "Test",
+            NSAttributedString(string: "Test", attributes: [NSForegroundColorAttributeName: ColorType.redColor()])
+        ].join().attributedString
+        
+        let mutable = NSMutableAttributedString(string: "TestTest")
+        mutable.addAttribute(NSForegroundColorAttributeName, value: ColorType.redColor(), range: NSMakeRange(4, 4))
+        
+        XCTAssertEqual(attributed, mutable)
+    }
 }

README.md

@@ -9,7 +9,7 @@ A Swift DSL for `NSAttributedString`.
 Attributed strings are composed through function calls on extensions of attribute value types, where the parameter is a list of attributed string values to apply the attributes to. The return values of these function calls can be included within lists passed to other function calls, creating a nested structure.
 
 ```swift
-label.attributedText = Join(
+label.attributedText = [
     "This is a string with ",
     UIColor.blueColor().foregroundAttribute(
         "blue ",
@@ -24,10 +24,10 @@ label.attributedText = Join(
         " text"
     ),
     "."
-).attributedString
+].join().attributedString
 ```
 
-The `Join` function can be used to combine attributed strings without applying any additional attributes.
+The `join` extension of `SequenceType` can be used to combine attributed strings without applying any additional attributes.
 
 Any value that conforms to the `AttributedStringConvertible` protocol can be passed as an argument. Implementations for `NSAttributedString` and `String` are included, so it shouldn't be necessary to implement this type. All attribute functions return a value of this protocol type. It can be unwrapped into a `NSAttributedString` with the `attributedString` property.