sugarcube 0.20.16 → 0.20.17

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -14,7 +14,13 @@ class Symbol
       end
     else
       # css colors
-      color = sugarcube_look_in(Symbol.css_colors).uicolor(alpha)
+      color = sugarcube_look_in(Symbol.css_colors).uicolor
+      Symbol.css_colors[self] = color
+      if alpha.nil?
+        color
+      else
+        color.uicolor(alpha)
+      end
     end
 
     color

data/lib/sugarcube/uicolor.rb

@@ -19,6 +19,21 @@ class UIColor
     mix_with(color.uicolor, 0.5)
   end
 
+  # blends two colors by adding the colors, with an upper maximum of 255.
+  # Adding white to any color will create white, adding black will do nothing.
+  # Also takes transparency into account; adding a transparent color has no
+  # effect, adding an opaque color has the most effect.
+  # @example
+  #     :red.uicolor << :blue.uicolor == '#ff00ff'.uicolor (:magenta)
+  #     :red.uicolor << :blue.uicolor(0.5) == '#ff0080'.uicolor (pinkish)
+  def <<(color)
+    r = [1.0, color.red * color.alpha + self.red].min
+    g = [1.0, color.green * color.alpha + self.green].min
+    b = [1.0, color.blue * color.alpha + self.blue].min
+    a = self.alpha
+    UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
+  end
+
   # a more generic color mixing method.  mixes two colors, but a second
   # parameter determines how much of each.  0.5 means equal parts, 0.0 means use
   # all of the first, and 1.0 means use all of the second
@@ -28,21 +43,30 @@ class UIColor
     # make amount between 0 and 1
     amount = [[0, amount].max, 1].min
     # start with precise amounts: 0, 0.5, and 1.
-    if amount == 0
+    if amount == 0 && self.alpha == color.alpha
       self
-    elsif amount == 1
+    elsif amount == 1 && self.alpha == color.alpha
       color
-    elsif amount == 0.5
+    elsif amount == 0.5 && self.alpha == color.alpha
       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)
     else
-      r = (color.red - self.red) * amount + self.red
-      g = (color.green - self.green) * amount + self.green
-      b = (color.blue - self.blue) * amount + self.blue
       a = (color.alpha - self.alpha) * amount + self.alpha
+      return UIColor.clearColor if a == 0
+
+      color_red = color.red * color.alpha + self.red * (1 - color.alpha)
+      self_red = self.red * self.alpha + color.red * (1 - self.alpha)
+      color_green = color.green * color.alpha + self.green * (1 - color.alpha)
+      self_green = self.green * self.alpha + color.green * (1 - self.alpha)
+      color_blue = color.blue * color.alpha + self.blue * (1 - color.alpha)
+      self_blue = self.blue * self.alpha + color.blue * (1 - self.alpha)
+
+      r = (color_red - self_red) * amount + self_red
+      g = (color_green - self_green) * amount + self_green
+      b = (color_blue - self_blue) * amount + self_blue
       UIColor.colorWithRed(r, green:g, blue:b, alpha:a)
     end
   end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.16'
+  Version = '0.20.17'
 end

data/spec/uicolor_spec.rb

@@ -8,11 +8,71 @@ 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
+  describe "should have a #+(color) method" do
+
+    it 'should add white and black to make gray' 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
+      new_color.alpha.should == 1.0
+    end
+
+    it 'should add black and white to make gray' do
+      new_color = UIColor.blackColor + UIColor.whiteColor
+      new_color.red.should == 0.5
+      new_color.green.should == 0.5
+      new_color.blue.should == 0.5
+      new_color.alpha.should == 1.0
+    end
+
+    it 'should add alpha channel (white + clear)' do
+      new_color = UIColor.whiteColor + UIColor.clearColor
+      new_color.red.should == 1.0
+      new_color.green.should == 1.0
+      new_color.blue.should == 1.0
+      new_color.alpha.should == 0.5
+    end
+
+    it 'should add alpha channel (clear + white)' do
+      new_color = UIColor.clearColor + UIColor.whiteColor
+      new_color.red.should == 1.0
+      new_color.green.should == 1.0
+      new_color.blue.should == 1.0
+      new_color.alpha.should == 0.5
+    end
+
+  end
+
+  describe "should have a #<<(color) method" do
+    it "should return white no matter what" do
+      new_color = UIColor.whiteColor << UIColor.blackColor
+      new_color.red.should == 1.0
+      new_color.green.should == 1.0
+      new_color.blue.should == 1.0
+    end
+
+    it "should have no effect with black" do
+      new_color = UIColor.blueColor << UIColor.blackColor
+      new_color.red.should == 0.0
+      new_color.green.should == 0.0
+      new_color.blue.should == 1.0
+    end
+
+    it "should add blue to red" do
+      new_color = UIColor.redColor << UIColor.blueColor
+      new_color.red.should == 1.0
+      new_color.green.should == 0.0
+      new_color.blue.should == 1.0
+    end
+
+    it "should use opacity when adding blue to red" do
+      new_color = UIColor.redColor << UIColor.blueColor.colorWithAlphaComponent(0.5)
+      new_color.red.should == 1.0
+      new_color.green.should == 0.0
+      new_color.blue.should == 0.5
+    end
+
   end
 
   it "should have a #invert method" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.16
+  version: 0.20.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description