sugarcube 0.18.16 → 0.18.17

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -173,6 +173,22 @@ class Symbol
     wheat:                0xf5deb3,
     whitesmoke:           0xf5f5f5,
     yellowgreen:          0x9acd32,
+
+    # for to_s to pick up on these colors, they need to be defined here
+    black:     0x000000,
+    blue:      0x0000ff,
+    brown:     0x996633,
+    cyan:      0x00ffff,
+    darkgray:  0x555555,
+    gray:      0x808080,
+    green:     0x00ff00,
+    lightgray: 0xaaaaaa,
+    magenta:   0xff00ff,
+    orange:    0xff8000,
+    purple:    0x800080,
+    red:       0xff0000,
+    yellow:    0xffff00,
+    white:     0xffffff,
   }
 
 end

data/lib/sugarcube/uicolor.rb

@@ -1,4 +1,5 @@
 class UIColor
+
   def uicolor(alpha=nil)
     if alpha
       self.colorWithAlphaComponent(alpha.to_f)
@@ -11,6 +12,17 @@ class UIColor
     self.CGColor
   end
 
+  # blends two colors by averaging the RGB and alpha components.
+  # @example
+  # :white.uicolor + :black.uicolor == :gray.uicolor
+  def +(color)
+    r = (self.red + color.red) / 2
+    g = (self.green + color.green) / 2
+    b = (self.blue + color.blue) / 2
+    a = (self.alpha + color.alpha) / 2
+    UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
+  end
+
   def red
     _sugarcube_colors && _sugarcube_colors[:red]
   end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.18.16'
+  Version = '0.18.17'
 end

data/spec/animation_chain_spec.rb

@@ -117,6 +117,11 @@ describe "SugarCube::AnimationChain" do
       f = controller.view.frame
       f.origin.x -= 20
       controller.view.frame = f
+    }.and_then {
+      @variable_a += 1
+      f = controller.view.frame
+      f.origin.x += 20
+      controller.view.frame = f
     }.loop
     SugarCube::AnimationChain.chains.length.should == 1
 
@@ -127,12 +132,10 @@ describe "SugarCube::AnimationChain" do
 
     wait 0.31 {
       @chain.abort
-      SugarCube::AnimationChain.chains.length.should == 0
-      @variable_a.should > 1
-      @variable_a.should < 4
       @num_loops = @variable_a
     }
     wait 0.51 {
+      SugarCube::AnimationChain.chains.length.should == 0
       @variable_a.should == @num_loops
     }
   end

data/spec/nsdate_delta_spec.rb

@@ -85,25 +85,48 @@ describe "NSDate#delta" do
     feb_28_2012.delta(years:4).should == NSDate.from_components(year:2016, month: 2, day: 28)
   end
 
-  it "should handle daylight savings logically" do
+  it "should handle daylight savings (lose an hour) logically" do
     # early hours
-    mar_9_2012 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 1)
-    mar_9_2012.delta(days:1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 1)
+    mar_9_2013 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 1)
+    mar_9_2013.delta(days:1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 1)
 
     # late hours
-    mar_9_2012 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 13)
-    mar_9_2012.delta(days:1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 13)
+    mar_9_2013 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 13)
+    mar_9_2013.delta(days:1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 13)
   end
 
-  it "should handle daylight savings logically unless you assign an hour" do
-    mar_9_2012 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 13)
+  it "should handle daylight savings (lose an hour) logically unless you assign an hour" do
+    mar_9_2013 = NSDate.from_components(year:2013, month: 3, day: 9, hour: 13)
 
-    tz = mar_9_2012.timezone
-    mar_11_2012 = NSDate.from_components(year:2013, month: 3, day: 11)
-    if tz.isDaylightSavingTimeForDate(mar_11_2012)
-      mar_9_2012.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 15)
+    # @TODO this should use a fixed timezone, not the user's timezone
+    mar_11_2013 = NSDate.from_components(year:2013, month: 3, day: 11)
+    tz = mar_11_2013.timezone
+    if tz.isDaylightSavingTimeForDate(mar_11_2013)
+      mar_9_2013.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 15)
     else
-      mar_9_2012.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 14)
+      mar_9_2013.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 3, day: 10, hour: 14)
+    end
+  end
+
+  it "should handle daylight savings (gain an hour) logically" do
+    # early hours
+    nov_2_2013 = NSDate.from_components(year:2013, month: 11, day: 2, hour: 1)
+    nov_2_2013.delta(days:1).should == NSDate.from_components(year:2013, month: 11, day: 3, hour: 1)
+
+    # late hours
+    nov_2_2013 = NSDate.from_components(year:2013, month: 11, day: 2, hour: 13)
+    nov_2_2013.delta(days:1).should == NSDate.from_components(year:2013, month: 11, day: 3, hour: 13)
+  end
+
+  it "should handle daylight savings (gain an hour) logically unless you assign an hour" do
+    nov_2_2013 = NSDate.from_components(year:2013, month: 11, day: 2, hour: 13)
+
+    # @TODO this should use a fixed timezone, not the user's timezone
+    tz = nov_2_2013.timezone
+    if tz.isDaylightSavingTimeForDate(nov_2_2013)
+      nov_2_2013.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 11, day: 3, hour: 13)
+    else
+      nov_2_2013.delta(days:1, hours: 1).should == NSDate.from_components(year:2013, month: 11, day: 3, hour: 14)
     end
   end
 

data/spec/uicolor_css_spec.rb

@@ -1,7 +1,7 @@
 describe 'UIColor (CSS)' do
 
   it "should return css color names" do
-    except_for = [:aqua, :fuchsia, :lime]
+    except_for = [:aqua, :fuchsia, :lime, :black, :blue, :brown, :cyan, :darkgray, :gray, :green, :lightgray, :magenta, :orange, :purple, :red, :yellow, :white]
     Symbol.css_colors.each do |name, val|
       next if except_for.include? name
 

data/spec/uicolor_spec.rb

@@ -8,4 +8,11 @@ describe 'UIColor' do
     UIColor.redColor.uicolor(0.5).alpha.should == 0.5
   end
 
+  it "should have a #+(color) method" do
+    new_color = UIColor.whiteColor + UIColor.blackColor
+    new_color.red.should == 0.5
+    new_color.green.should == 0.5
+    new_color.blue.should == 0.5
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.18.16
+  version: 0.18.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -210,3 +210,4 @@ test_files:
 - spec/uiview_attr_updates_spec.rb
 - spec/uiview_spec.rb
 - spec/unholy_spec.rb
+has_rdoc: