sugarcube 0.19.2 → 0.19.4

data/lib/sugarcube/nsdate.rb

@@ -3,7 +3,7 @@ class NSDate
   # a string using string_with_format's templating, and strings are concatenated
   # as-is
   SugarCubeFormats = {
-    iso8601: [:yyyy, '-', :MM, '-', :dd, ' ', :HH, ':', :mm, ':', :ss, '.', :SSS]
+    iso8601: [:yyyy, '-', :MM, '-', :dd, ' ', :'HH:mm:ss.SSS']
   }
 
   def self.from_components(components)

data/lib/sugarcube/to_s/nsurl.rb

@@ -0,0 +1,7 @@
+class NSError
+  def to_s
+    "#<#{self.class.name}:0x#{self.object_id.to_s(16)}, "+
+      "URL=#{self.absoluteString.inspect}"+
+     ">"
+  end
+end

data/lib/sugarcube/to_s/uicolor.rb

@@ -1,16 +1,14 @@
 class UIColor
 
   def to_s
+    alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
     system_color = system_name
-    return system_color if system_color
+    return "UIColor.#{system_color}#{alpha_s}" if system_color
 
-    inside = self.css_name || self.hex
+    alpha_s = ((alpha || 1) < 1 ? ", alpha: #{alpha}" : '')
+    inside = (css_name && ":#{css_name}") || (hex && "'#{hex}'")
     if inside
-      if self.alpha < 1
-        return "UIColor.color(#{inside}, #{alpha})"
-      else
-        return "UIColor.color(#{inside})"
-      end
+      return "UIColor.color(#{inside}#{alpha_s})"
     else
       super
     end

data/lib/sugarcube/uicolor.rb

@@ -120,13 +120,14 @@ class UIColor
 
   def system_name
     system_color = nil
+    without_alpha = self.uicolor(1)
     Symbol.uicolors.each_pair do |color, method|
-      if UIColor.send(method) == self
+      if UIColor.send(method) == without_alpha
         system_color = method
         break
       end
     end
-    return system_color.to_s
+    return system_color
   end
 
 private

data/lib/sugarcube/uiimage.rb

@@ -321,8 +321,8 @@ class UIImage
   def darken(options={})
     filter_name = 'CIColorControls'
     filter_options = {
-      inputBrightness: options[:brightness] || -0.5,
-      inputSaturation: options[:saturation] || -0.2,
+      inputBrightness: options[:brightness] || 0,
+      inputSaturation: options[:saturation] || 0,
     }
 
     cg_input_image = CIImage.alloc.initWithImage(self)

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.19.2'
+  Version = '0.19.4'
 end

data/spec/uicolor_other_representations_spec.rb

@@ -16,8 +16,8 @@ describe 'UIColor (CSS)' do
   end
 
   it "should have a #system_name method" do
-    UIColor.whiteColor.system_name.should == 'whiteColor'
-    UIColor.blackColor.system_name.should == 'blackColor'
+    UIColor.whiteColor.system_name.should == :whiteColor
+    UIColor.blackColor.system_name.should == :blackColor
   end
 
   it "should return css color names" do
@@ -34,6 +34,15 @@ describe 'UIColor (CSS)' do
     end
   end
 
+  it "should have good to_s return values" do
+    UIColor.whiteColor.to_s.should == 'UIColor.whiteColor'
+    UIColor.whiteColor.uicolor(0.5).to_s.should == 'UIColor.whiteColor(0.5)'
+    :indianred.uicolor.to_s.should == 'UIColor.color(:indianred)'
+    :indianred.uicolor(0.5).to_s.should == 'UIColor.color(:indianred, alpha: 0.5)'
+    '#12be3f'.uicolor.to_s.should == "UIColor.color('#12be3f')"
+    '#12be3f'.uicolor(0.5).to_s.should == "UIColor.color('#12be3f', alpha: 0.5)"
+  end
+
   it "should return UIColor objects" do
     Symbol.uicolors.each do |name, method|
       name.uicolor.should == UIColor.send(method)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -89,6 +89,7 @@ files:
 - lib/sugarcube/to_s/nserror.rb
 - lib/sugarcube/to_s/nslayoutconstraint.rb
 - lib/sugarcube/to_s/nsset.rb
+- lib/sugarcube/to_s/nsurl.rb
 - lib/sugarcube/to_s/uicolor.rb
 - lib/sugarcube/to_s/uievent.rb
 - lib/sugarcube/to_s/uilabel.rb