Global functions return AttributeFunction.

This allows these to be composed with join, etc.

Author: natestedman

Attributed/ColorType+Attributes.swift

@@ -27,7 +27,7 @@ public extension ColorType
      */
     public func foregroundAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSForegroundColorAttributeName, self, string)
+        return Attributed.attribute(NSForegroundColorAttributeName, withValue: self)(string)
     }
 
     // MARK: - Background Color
@@ -41,7 +41,7 @@ public extension ColorType
      */
     public func backgroundAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSBackgroundColorAttributeName, self, string)
+        return Attributed.attribute(NSBackgroundColorAttributeName, withValue: self)(string)
     }
 
     // MARK: - Underline Color
@@ -55,7 +55,7 @@ public extension ColorType
      */
     public func underlineAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSUnderlineColorAttributeName, self, string)
+        return Attributed.attribute(NSUnderlineColorAttributeName, withValue: self)(string)
     }
 
     // MARK: - Strikethrough Color
@@ -69,6 +69,6 @@ public extension ColorType
      */
     public func strikethroughAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSStrikethroughColorAttributeName, self, string)
+        return Attributed.attribute(NSStrikethroughColorAttributeName, withValue: self)(string)
     }
 }

Attributed/FontType+Attributes.swift

@@ -27,6 +27,6 @@ public extension FontType
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSFontAttributeName, self, string)
+        return Attributed.attribute(NSFontAttributeName, withValue: self)(string)
     }
 }

Attributed/Functions.swift

@@ -9,30 +9,28 @@
 // this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 /**
- Returns an attributed string convertible with the specified attributes applied at the root level.
+ Returns an attribute function to apply the specified attributes.
 
  The attributes will not override matching attributes deeper in the hierarchy.
 
  - parameter attributes: The attributes to apply.
- - parameter strings:    The convertible strings.
  */
-public func attributes(attributes: [String:AnyObject?], _ string: AttributedStringConvertible)
-    -> AttributedStringConvertible
+public func attributesWithValues(attributes: [String:AnyObject?]) -> AttributeFunction
 {
-    return NestedAttributedString(attributes: attributes, children: [string])
+    return { string in
+        return NestedAttributedString(attributes: attributes, children: [string])
+    }
 }
 
 /**
- Returns an attributed string convertible with the specified attribute applied at the root level.
+ Returns an attribute function to apply the specified attribute.
 
  The attribute value will not override a matching attribute deeper in the hierarchy.
 
  - parameter attribute: The attribute name to apply.
  - parameter value:     The attribute value to apply.
- - parameter strings:   The convertible strings.
  */
-public func attribute(attribute: String, _ value: AnyObject?, _ string: AttributedStringConvertible)
-    -> AttributedStringConvertible
+public func attribute(attribute: String, withValue value: AnyObject?) -> AttributeFunction
 {
-    return Attributed.attributes([attribute: value], string)
+    return attributesWithValues([attribute: value])
 }

Attributed/Ligature+Attributes.swift

@@ -27,6 +27,6 @@ public extension Ligature
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSLigatureAttributeName, self.rawValue, string)
+        return Attributed.attribute(NSLigatureAttributeName, withValue: self.rawValue)(string)
     }
 }

Attributed/NSCursor+Attributes.swift

@@ -25,7 +25,7 @@ extension NSCursor
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSCursorAttributeName, self, string)
+        return Attributed.attribute(NSCursorAttributeName, withValue: self)(string)
     }
 }
 

Attributed/NSNumberConvertible+Attributes.swift

@@ -27,7 +27,7 @@ public extension NSNumberConvertible
      */
     public func baselineOffsetAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSBaselineOffsetAttributeName, self.NSNumberValue, string)
+        return Attributed.attribute(NSBaselineOffsetAttributeName, withValue: self.NSNumberValue)(string)
     }
 
     // MARK: - Kern
@@ -41,6 +41,6 @@ public extension NSNumberConvertible
      */
     func kernAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSKernAttributeName, self.NSNumberValue, string)
+        return Attributed.attribute(NSKernAttributeName, withValue: self.NSNumberValue)(string)
     }
 }

Attributed/NSParagraphStyle+Attributes.swift

@@ -27,6 +27,6 @@ public extension NSParagraphStyle
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSParagraphStyleAttributeName, self, string)
+        return Attributed.attribute(NSParagraphStyleAttributeName, withValue: self)(string)
     }
 }

Attributed/NSShadow+Attributes.swift

@@ -27,6 +27,6 @@ public extension NSShadow
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSShadowAttributeName, self, string)
+        return Attributed.attribute(NSShadowAttributeName, withValue: self)(string)
     }
 }

Attributed/NSTextAttachment+Attributes.swift

@@ -27,6 +27,6 @@ public extension NSTextAttachment
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSAttachmentAttributeName, self, string)
+        return Attributed.attribute(NSAttachmentAttributeName, withValue: self)(string)
     }
 }

Attributed/NSUnderlineStyle+Attributes.swift

@@ -27,7 +27,7 @@ public extension NSUnderlineStyle
      */
     public func attribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSUnderlineStyleAttributeName, self.rawValue, string)
+        return Attributed.attribute(NSUnderlineStyleAttributeName, withValue: self.rawValue)(string)
     }
 
     // MARK: - Strikethrough
@@ -41,6 +41,6 @@ public extension NSUnderlineStyle
      */
     public func strikethroughAttribute(string: AttributedStringConvertible) -> AttributedStringConvertible
     {
-        return Attributed.attribute(NSStrikethroughStyleAttributeName, self.rawValue, string)
+        return Attributed.attribute(NSStrikethroughStyleAttributeName, withValue: self.rawValue)(string)
     }
 }