Remove variadic functions, use array-based functions only.

natestedman · natestedman · commit d5f64e0a89b5 · 2015-12-19T11:00:20.000-05:00
diff --git a/Attributed/ColorType+Attributes.swift b/Attributed/ColorType+Attributes.swift
@@ -18,18 +18,6 @@ public extension ColorType
 {
     // MARK: - Foreground Color
     
-    /**
-     Applies a foreground color attribute to the enclosed attributed strings.
-     
-     The foreground color will not override a foreground color set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the foreground color to.
-     */
-    public func foregroundAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSForegroundColorAttributeName, self, strings)
-    }
-    
     /**
      Applies a foreground color attribute to the enclosed attributed strings.
      
@@ -44,18 +32,6 @@ public extension ColorType
     
     // MARK: - Background Color
     
-    /**
-     Applies a background color attribute to the enclosed attributed strings.
-     
-     The background color will not override a background color set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the background color to.
-     */
-    public func backgroundAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSBackgroundColorAttributeName, self, strings)
-    }
-    
     /**
      Applies a background color attribute to the enclosed attributed strings.
      
@@ -70,18 +46,6 @@ public extension ColorType
     
     // MARK: - Underline Color
     
-    /**
-     Applies an underline color attribute to the enclosed attributed strings.
-     
-     The underline color will not override an underline color set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the underline color to.
-     */
-    public func underlineAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSUnderlineColorAttributeName, self, strings)
-    }
-    
     /**
      Applies an underline color attribute to the enclosed attributed strings.
      
@@ -96,18 +60,6 @@ public extension ColorType
     
     // MARK: - Strikethrough Color
     
-    /**
-     Applies an strikethrough color attribute to the enclosed attributed strings.
-     
-     The strikethrough color will not override an strikethrough color set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the strikethrough color to.
-     */
-    public func strikethroughAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSStrikethroughColorAttributeName, self, strings)
-    }
-    
     /**
      Applies an strikethrough color attribute to the enclosed attributed strings.
      
diff --git a/Attributed/FontType+Attributes.swift b/Attributed/FontType+Attributes.swift
@@ -16,17 +16,7 @@
 
 public extension FontType
 {
-    /**
-     Applies a font attribute to the enclosed attributed strings.
-     
-     The font will not override a font set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the font to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSFontAttributeName, self, strings)
-    }
+    // MARK: - Attributes
     
     /**
      Applies a font attribute to the enclosed attributed strings.
diff --git a/Attributed/Functions.swift b/Attributed/Functions.swift
@@ -8,20 +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/>.
 
-/**
- Returns an attributed string convertible with the specified attributes applied at the root level.
- 
- 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?], _ strings: AttributedStringConvertible...)
-    -> AttributedStringConvertible
-{
-    return Attributed.attributes(attributes, strings)
-}
-
 /**
  Returns an attributed string convertible with the specified attributes applied at the root level.
  
@@ -36,21 +22,6 @@ public func attributes(attributes: [String:AnyObject?], _ strings: [AttributedSt
     return NestedAttributedString(attributes: attributes, children: strings)
 }
 
-/**
- Returns an attributed string convertible with the specified attribute applied at the root level.
- 
- 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?, _ strings: AttributedStringConvertible...)
-    -> AttributedStringConvertible
-{
-    return Attributed.attribute(attribute, value, strings)
-}
-
 /**
  Returns an attributed string convertible with the specified attribute applied at the root level.
  
diff --git a/Attributed/Ligature+Attributes.swift b/Attributed/Ligature+Attributes.swift
@@ -18,18 +18,6 @@ public extension Ligature
 {
     // MARK: - Attributes
     
-    /**
-     Applies a ligature setting to the enclosed attributed strings.
-     
-     The ligature setting will not override a ligature setting set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the ligature setting to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSLigatureAttributeName, self.rawValue, strings)
-    }
-    
     /**
      Applies a ligature setting to the enclosed attributed strings.
      
diff --git a/Attributed/NSCursor+Attributes.swift b/Attributed/NSCursor+Attributes.swift
@@ -14,17 +14,7 @@ import AppKit
 
 extension NSCursor
 {
-    /**
-     Applies a cursor to the enclosed attributed strings.
-     
-     The cursor will not override a cursor set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the shadow to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSCursorAttributeName, self, strings)
-    }
+    // MARK: - Attributes
     
     /**
      Applies a cursor to the enclosed attributed strings.
diff --git a/Attributed/NSNumberConvertible+Attributes.swift b/Attributed/NSNumberConvertible+Attributes.swift
@@ -17,17 +17,6 @@
 public extension NSNumberConvertible
 {
     // MARK: - Baseline Offset
-    /**
-    Applies a baseline offset attribute to the enclosed attributed strings.
-    
-    The baseline offset value will not override a baseline offset value set deeper in the hierarchy.
-    
-    - parameter strings: The attributed strings to apply the baseline offset to.
-    */
-    public func baselineOffsetAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSBaselineOffsetAttributeName, self.NSNumberValue, strings)
-    }
     
     /**
      Applies a baseline offset attribute to the enclosed attributed strings.
@@ -42,17 +31,6 @@ public extension NSNumberConvertible
     }
     
     // MARK: - Kern
-    /**
-     Applies a kerning attribute to the enclosed attributed strings.
-     
-     The kerning value will not override a kerning value set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the kerning attribute to.
-     */
-    func kernAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSKernAttributeName, self.NSNumberValue, strings)
-    }
     
     /**
      Applies a kerning attribute to the enclosed attributed strings.
diff --git a/Attributed/NSParagraphStyle+Attributes.swift b/Attributed/NSParagraphStyle+Attributes.swift
@@ -16,17 +16,7 @@
 
 public extension NSParagraphStyle
 {
-    /**
-     Applies a paragraph style to the enclosed attributed strings.
-     
-     The paragraph style will not override a paragraph style set deeper n the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the paragraph style to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSParagraphStyleAttributeName, self, strings)
-    }
+    // MARK: - Attributes
     
     /**
      Applies a paragraph style to the enclosed attributed strings.
diff --git a/Attributed/NSShadow+Attributes.swift b/Attributed/NSShadow+Attributes.swift
@@ -16,17 +16,7 @@
 
 public extension NSShadow
 {
-    /**
-     Applies a shadow to the enclosed attributed strings.
-     
-     The shadow will not override a shadow set deeper n the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the shadow to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSShadowAttributeName, self, strings)
-    }
+    // MARK: - Attributes
     
     /**
      Applies a shadow to the enclosed attributed strings.
diff --git a/Attributed/NSTextAttachment+Attributes.swift b/Attributed/NSTextAttachment+Attributes.swift
@@ -16,17 +16,7 @@
 
 public extension NSTextAttachment
 {
-    /**
-     Applies a text attachment attribute to the enclosed attributed strings.
-     
-     The text attachment value will not override a text attachment value set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the text attachment to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSAttachmentAttributeName, self, strings)
-    }
+    // MARK: - Attributes
     
     /**
      Applies a text attachment attribute to the enclosed attributed strings.
diff --git a/Attributed/NSUnderlineStyle+Attributes.swift b/Attributed/NSUnderlineStyle+Attributes.swift
@@ -18,18 +18,6 @@ public extension NSUnderlineStyle
 {
     // MARK: - Underline
     
-    /**
-     Applies an underline style attribute to the enclosed attributed strings.
-     
-     The underline style will not override an underline style set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the underline style to.
-     */
-    public func attribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSUnderlineStyleAttributeName, self.rawValue, strings)
-    }
-    
     /**
      Applies an underline style attribute to the enclosed attributed strings.
      
@@ -44,18 +32,6 @@ public extension NSUnderlineStyle
     
     // MARK: - Strikethrough
     
-    /**
-     Applies a strikethrough style attribute to the enclosed attributed strings.
-     
-     The strikethrough style will not override a strikethrough style set deeper in the hierarchy.
-     
-     - parameter strings: The attributed strings to apply the strikethrough style to.
-     */
-    public func strikethroughAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSStrikethroughStyleAttributeName, self.rawValue, strings)
-    }
-    
     /**
      Applies a strikethrough style attribute to the enclosed attributed strings.
      
diff --git a/Attributed/String+Attributes.swift b/Attributed/String+Attributes.swift
@@ -15,18 +15,6 @@ extension String
 {
     // MARK: - Tooltip
     
-    /**
-    Applies a tooltip attribute to the enclosed attributed strings.
-    
-    The tooltip will not override a tooltip set deeper in the hierarchy.
-    
-    - parameter strings: The attributed strings to apply the tooltip to.
-    */
-    public func toolTipAttribute(strings: AttributedStringConvertible...) -> AttributedStringConvertible
-    {
-        return Attributed.attribute(NSToolTipAttributeName, self, strings)
-    }
-    
     /**
      Applies a tooltip attribute to the enclosed attributed strings.
      
diff --git a/AttributedTests/AttributedTests.swift b/AttributedTests/AttributedTests.swift
@@ -15,17 +15,17 @@ class AttributedTests: XCTestCase
 {
     func testNestedColors()
     {
-        let attributed = ColorType.redColor().foregroundAttribute(
+        let attributed = ColorType.redColor().foregroundAttribute([
             "Test",
-            ColorType.blueColor().foregroundAttribute(
+            ColorType.blueColor().foregroundAttribute([
                 "Test",
-                ColorType.greenColor().foregroundAttribute(
+                ColorType.greenColor().foregroundAttribute([
                     "Test"
-                ),
+                ]),
                 "Test"
-            ),
+            ]),
             "Test"
-        ).attributedString
+        ]).attributedString
         
         let mutable = NSMutableAttributedString(string: "TestTestTestTestTest")
         mutable.addAttribute(NSForegroundColorAttributeName, value: ColorType.redColor(), range: NSMakeRange(0, 4))
@@ -39,17 +39,17 @@ class AttributedTests: XCTestCase
     
     func testDeepNesting()
     {
-        let attributed = 10.kernAttribute(
+        let attributed = 10.kernAttribute([
             "Test",
-            ColorType.blueColor().foregroundAttribute(
+            ColorType.blueColor().foregroundAttribute([
                 "Test",
-                ColorType.greenColor().foregroundAttribute(
+                ColorType.greenColor().foregroundAttribute([
                     "Test"
-                ),
+                ]),
                 "Test"
-            ),
+            ]),
             "Test"
-        ).attributedString
+        ]).attributedString
         
         let mutable = NSMutableAttributedString(string: "TestTestTestTestTest")
         mutable.addAttribute(NSKernAttributeName, value: 10, range: NSMakeRange(0, 20))
@@ -62,13 +62,13 @@ class AttributedTests: XCTestCase
     
     func testNilValue()
     {
-        let attributed = ColorType.blueColor().foregroundAttribute(
+        let attributed = ColorType.blueColor().foregroundAttribute([
             "Test",
-            attribute(NSForegroundColorAttributeName, nil,
+            attribute(NSForegroundColorAttributeName, nil, [
                 "Test",
-                ColorType.greenColor().foregroundAttribute("Test")
-            )
-        ).attributedString
+                ColorType.greenColor().foregroundAttribute(["Test"])
+            ])
+        ]).attributedString
         
         let mutable = NSMutableAttributedString(string: "TestTestTest")
         mutable.addAttribute(NSForegroundColorAttributeName, value: ColorType.blueColor(), range: NSMakeRange(0, 4))
diff --git a/README.md b/README.md
