sugarcube 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93b8cbedc130c019d2eaf293a07337b5a041b10
-  data.tar.gz: 04d121961d44ba27a8258fc3844d9dd2a47cfd72
+  metadata.gz: 59c8482c83573e42f64f42c9aa90718298be515d
+  data.tar.gz: 58b279d2a997169e4ef3bb3582376c581257d484
 SHA512:
-  metadata.gz: 372c7d62dcd616471d92ff970278060813113569faf9a34040dea78631f39fccaa48d8b9b13ec0e3de1e035f81435f4e7c42134da90cf7e496456f693eb98efb
-  data.tar.gz: 496c37d5f0760e84024e6c5d3a84b79cf586e21bb93c005a6205df5c2d10b1f3309387ec8ef727a5efdf74d9af47c78259ebe3696dd4eb15aeb4daf632e787bb
+  metadata.gz: 1f199aad09635d42e99d6a352f813f3db32d64c1d01cdec9da5e3878f0b1462d3648a92dc78519936fdc49a7dd6ebcc8610c457e97d8799bb0c844b805bee5a9
+  data.tar.gz: c5a175dcf6a9c5502bc3d6757f9290b868ce52836aaafda2b4eba12cf5e79723d2a2b5f4dc034e59f4d214ccdc04a6b3eeb657e10be4ae14ff5ae510b8183eba

data/lib/osx/sugarcube-color/nsarray.rb

@@ -1,7 +1,7 @@
 class NSArray
 
   # [160, 210, 242].uicolor => 0xA0D2F2.uicolor
-  def uicolor(alpha=1.0)
+  def nscolor(alpha=1.0)
     red = self[0] / 255.0
     green = self[1] / 255.0
     blue = self[2] / 255.0

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.3.2'
+  Version = '3.3.3'
 end

data/spec/ios/color_spec.rb

@@ -4,6 +4,10 @@ describe UIColor do
     UIColor.redColor.uicolor.should == UIColor.redColor
   end
 
+  it "should have a #uicolor(alpha) method" do
+    UIColor.redColor.uicolor(0.5).alpha.should == 0.5
+  end
+
   it "should support #cgcolor" do
     -> do
       UIColor.redColor.cgcolor.should == UIColor.redColor.CGColor
@@ -14,10 +18,6 @@ describe UIColor do
     UIColor.redColor.skcolor.should == UIColor.redColor
   end
 
-  it "should have a #uicolor(alpha) method" do
-    UIColor.redColor.uicolor(0.5).alpha.should == 0.5
-  end
-
   it "should have a #skcolor(alpha) method" do
     UIColor.redColor.skcolor(0.5).alpha.should == 0.5
   end

data/spec/osx/color_spec.rb

@@ -1,9 +1,13 @@
-describe 'NSColor' do
+describe NSColor do
 
   it "should support #nscolor" do
     NSColor.redColor.nscolor.should == NSColor.redColor
   end
 
+  it "should support #nscolor(alpha) method" do
+    NSColor.redColor.nscolor(0.5).alpha.should == 0.5
+  end
+
   it "should support #cgcolor" do
     -> do
       NSColor.redColor.cgcolor.should == NSColor.redColor.CGColor
@@ -14,8 +18,8 @@ describe 'NSColor' do
     NSColor.redColor.skcolor.should == NSColor.redColor
   end
 
-  it "should support #nscolor(alpha) method" do
-    NSColor.redColor.nscolor(0.5).alpha.should == 0.5
+  it "should have a #skcolor(alpha) method" do
+    NSColor.redColor.skcolor(0.5).alpha.should == 0.5
   end
 
   describe "should have a #+(color) method" do
@@ -86,23 +90,23 @@ describe 'NSColor' do
   end
 
   it "should have a #invert method" do
-    :white.nscolor.invert.red.should == 0
-    :white.nscolor.invert.green.should == 0
-    :white.nscolor.invert.blue.should == 0
+    NSColor.redColor.invert.should == NSColor.cyanColor
+    NSColor.greenColor.invert.should == NSColor.magentaColor
+    NSColor.blueColor.invert.should == NSColor.yellowColor
 
-    :black.nscolor.invert.red.should == 1
-    :black.nscolor.invert.green.should == 1
-    :black.nscolor.invert.blue.should == 1
-  end
+    NSColor.whiteColor.invert.red.should == 0
+    NSColor.whiteColor.invert.green.should == 0
+    NSColor.whiteColor.invert.blue.should == 0
 
-  it "should process system colors with a NSNamedColorSpace correctly" do
-    NSColor.controlTextColor.invert.should.not.raise(StandardError)
+    NSColor.blackColor.invert.red.should == 1
+    NSColor.blackColor.invert.green.should == 1
+    NSColor.blackColor.invert.blue.should == 1
   end
 
   it "should have a #mix_with method" do
-    white = :white.nscolor
-    black = :black.nscolor
-    gray = :gray.nscolor
+    white = NSColor.whiteColor
+    black = NSColor.blackColor
+    gray = NSColor.grayColor
     white.mix_with(black, 0).red.should == 1
     white.mix_with(black, 0).green.should == 1
     white.mix_with(black, 0).blue.should == 1
@@ -124,4 +128,141 @@ describe 'NSColor' do
     white.mix_with(black, 0.75).blue.should == 0.25
   end
 
+  it "should process system colors with a NSNamedColorSpace correctly" do
+    NSColor.controlTextColor.invert.should.not.raise(StandardError)
+  end
+
+end
+
+
+describe 'Fixnum NSColor extensions' do
+  it "should support #nscolor" do
+    color = 0xffffff.nscolor
+    color.red.should == 1
+    color.green.should == 1
+    color.blue.should == 1
+    color.alpha.should == 1
+  end
+
+  it "should support #cgcolor" do
+    -> do
+      0xffffff.cgcolor.class.should == NSColor.redColor.CGColor.class
+    end.should.not.raise
+  end
+
+  it "should support #skcolor" do
+    0xffffff.skcolor.should.be.kind_of(NSColor)
+  end
+
+  it "should have a 0x000000#nscolor(0.5) method" do
+    color = 0.nscolor(0.5)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+end
+
+
+describe 'NSArray NSColor extensions' do
+  it "should support #nscolor" do
+    color = [255, 255, 255].nscolor
+    color.red.should == 1
+    color.green.should == 1
+    color.blue.should == 1
+    color.alpha.should == 1
+  end
+
+  it "should support #cgcolor" do
+    -> do
+      [255, 255, 255].cgcolor.class.should == NSColor.redColor.CGColor.class
+    end.should.not.raise
+  end
+
+  it "should support #skcolor" do
+    [255, 255, 255].skcolor.should.be.kind_of(NSColor)
+  end
+
+  it "should have a [0, 0, 0]#nscolor(0.5) method" do
+    color = [0, 0, 0].nscolor(0.5)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+end
+
+
+describe 'NSString NSColor extensions' do
+
+  it "should support #nscolor" do
+    color = '#ffffff'.nscolor
+    color.should.be.kind_of(NSColor)
+    color.red.should == 1.0
+    color.green.should == 1.0
+    color.blue.should == 1.0
+
+    color = '#808080'.nscolor
+    color.should.be.kind_of(NSColor)
+    ((color.red * 2).round / 2.0).should == 0.5
+    ((color.green * 2).round / 2.0).should == 0.5
+    ((color.blue * 2).round / 2.0).should == 0.5
+  end
+
+  it "should support #cgcolor" do
+    -> do
+      '#ffffff'.cgcolor.class.should == NSColor.redColor.CGColor.class
+    end.should.not.raise
+  end
+
+  it "should support #skcolor" do
+    '#ffffff'.skcolor.should.be.kind_of(NSColor)
+  end
+
+  it "should have '#000000'.nscolor(0.5) method" do
+    color = '#000000'.nscolor(0.5)
+    color.should.be.kind_of(NSColor)
+    color.red.should == 0
+    color.green.should == 0
+    color.blue.should == 0
+    color.alpha.should == 0.5
+  end
+
+  it "that supports image names" do
+    a = 'little_square'.nscolor
+    b = 'little_square'.nsimage.nscolor
+    a.should.be.kind_of(NSColor)
+    b.should.be.kind_of(NSColor)
+  end
+
+  it "that supports non-existant image names" do
+    'this is not my beautiful house!'.nscolor.should == nil
+  end
+
+end
+
+
+describe 'NSImage NSColor extensions' do
+  it 'should support #nscolor' do
+    color = NSImage.imageNamed('little_square').nscolor
+    color.should.be.kind_of(NSColor)
+  end
+
+  it 'should support #cgcolor' do
+    -> do
+      NSImage.imageNamed('little_square').cgcolor.class.should == NSColor.redColor.CGColor.class
+    end.should.not.raise
+  end
+
+  it "should support #skcolor" do
+    NSImage.imageNamed('little_square').skcolor.should.be.kind_of(NSColor)
+  end
+
+  it 'should support #nscolor(0.5)' do
+    -> do
+      NSImage.imageNamed('little_square').nscolor(0.5)
+      # unfortunately, this doesn't work:
+      # image.alpha.should == 0.5  # alpha returns 0 because this is not an RGB or HSB color
+    end.should.not.raise
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -306,12 +306,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []