sugarcube 1.7.0 → 2.0.0

data/spec/{nsdate_spec.rb → ios/nsdate_spec.rb}

@@ -115,7 +115,7 @@ describe "NSDate" do
   end
 
   it "should have an NSDate#timezone method" do
-    String.should === @date.timezone.name
+    @date.timezone.name.should.be.kind_of(String)
   end
 
   it "should have an NSDate#era method" do
@@ -132,7 +132,7 @@ describe "NSDate" do
   end
 
   it "should have an NSDate#utc_offset method" do
-    Fixnum.should === @date.utc_offset
+    @date.utc_offset.should.be.kind_of(Fixnum)
   end
 
   it "should have an NSDate#leap_year method" do

data/spec/{nsdate_upto_spec.rb → ios/nsdate_upto_spec.rb}

@@ -38,7 +38,7 @@ describe "NSDate upto/downto" do
 
   it "should have an #upto method that should pass the date to the block" do
     @start.upto(@start.delta(days:1)) do |date|
-      NSDate.should === date
+      date.should.be.kind_of(NSDate)
     end
   end
 
@@ -84,7 +84,7 @@ describe "NSDate upto/downto" do
 
   it "should have a #downto method that should pass the date to the block" do
     @start.downto(@start.delta(days:-1)) do |date|
-      NSDate.should === date
+      date.should.be.kind_of(NSDate)
     end
   end
 

data/spec/{nsstring_files_spec.rb → ios/nsstring_files_spec.rb}

@@ -207,6 +207,13 @@ end
 
 
 describe 'NSString deprecated methods' do
+  before do
+    SugarCube.suppress? true
+  end
+
+  after do
+    SugarCube.suppress? false
+  end
 
   it "should have a #document method" do
     'foo'.document.should.start_with?('/Users')

data/spec/{nsstring_spec.rb → ios/nsstring_spec.rb}

@@ -2,14 +2,14 @@ describe "NSString" do
 
   it "should have a #nsurl method" do
     url = 'https://github.com/status'.nsurl
-    NSURL.should === url
+    url.should.be.kind_of(NSURL)
     url.absoluteString.should == 'https://github.com/status'
     url.host.should == 'github.com'
   end
 
   it "should have a #nsdata method" do
     data = 'test'.nsdata
-    NSData.should === data
+    data.should.be.kind_of(NSData)
     bytes = data.bytes
     bytes[0].should == 116
     bytes[1].should == 101
@@ -23,13 +23,13 @@ describe "NSString" do
 
   it "should have a #uiimageview method" do
     view = 'little_square'.uiimageview
-    UIView.should === view
+    view.should.be.kind_of(UIView)
     view.image.should == UIImage.imageNamed('little_square')
   end
 
   it "should have a #uifont method" do
     font = 'Helvetica'.uifont
-    UIFont.should === font
+    font.should.be.kind_of(UIFont)
     font.familyName.should == 'Helvetica'
     font.pointSize.should == UIFont.systemFontSize
   end

data/spec/{nsurl_spec.rb → ios/nsurl_spec.rb}

@@ -14,15 +14,15 @@ describe "NSURL" do
   end
 
   it "should have a method #nsdata" do
-    NSData.should === 'https://github.com'.nsurl.nsdata
+    'https://github.com'.nsurl.nsdata.should.be.kind_of(NSData)
   end
 
   it "should have a method #nsurlrequest" do
-    NSURLRequest.should === 'https://github.com'.nsurl.nsurlrequest
+    'https://github.com'.nsurl.nsurlrequest.should.be.kind_of(NSURLRequest)
   end
 
   it "should have a method #nsmutableurlrequest" do
-    NSMutableURLRequest.should === 'https://github.com'.nsurl.nsmutableurlrequest
+    'https://github.com'.nsurl.nsmutableurlrequest.should.be.kind_of(NSMutableURLRequest)
   end
 
 end

data/spec/{symbol_constants_spec.rb → ios/symbol_constants_spec.rb}

@@ -461,14 +461,14 @@ describe "Symbol - constants" do
 
   end
 
-  describe "deprecated" do
+  describe "Symbol deprecated methods" do
 
     before do
-      SugarCube::Legacy.log? true
+      SugarCube.suppress? true
     end
 
     after do
-      SugarCube::Legacy.log? false
+      SugarCube.suppress? false
     end
 
     it 'should support `uiautoresizemask`' do
@@ -477,12 +477,25 @@ describe "Symbol - constants" do
       :fixed_bottom.uiautoresizemask.should == :fill_bottom.uiautoresizemask
       :fixed_left.uiautoresizemask.should == :fill_left.uiautoresizemask
       :fixed_right.uiautoresizemask.should == :fill_right.uiautoresizemask
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
+    end
+
+    it 'should support `uitextalignment`' do
+      :left.uialignment.should == :left.uitextalignment
+    end
+
+    it 'should support `uibaselineadjustment`' do
+      :alignbaselines.uibaselineadjustment.should == UIBaselineAdjustmentAlignBaselines
+      :aligncenters.uibaselineadjustment.should == UIBaselineAdjustmentAlignCenters
+    end
+
+    it 'should have alias for `uibaselineadjustment`' do
+      :alignbaselines.uibaseline.should == :alignbaselines.uibaselineadjustment
     end
 
     it 'should support `uireturnkey`' do
       :emergencycall.uireturnkey.should == :emergency_call.uireturnkey
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uikeyboardtype`' do
@@ -493,7 +506,7 @@ describe "Symbol - constants" do
       :namephonepad.uikeyboardtype.should == :name_phone_pad.uikeyboardtype
       :nameandphone.uikeyboardtype.should == :name_and_phone.uikeyboardtype
       :emailaddress.uikeyboardtype.should == :email_address.uikeyboardtype
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uilinebreakmode`' do
@@ -502,40 +515,35 @@ describe "Symbol - constants" do
       :headtruncation.uilinebreakmode.should == :head_truncation.uilinebreakmode
       :tailtruncation.uilinebreakmode.should == :tail_truncation.uilinebreakmode
       :middletruncation.uilinebreakmode.should == :middle_truncation.uilinebreakmode
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `nsnumberstyle`' do
       :spellout.nsnumberstyle.should == :spell_out.nsnumberstyle
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uibarbuttonitem`' do
       :flexiblespace.uibarbuttonitem.should == :flexible_space.uibarbuttonitem
       :fixedspace.uibarbuttonitem.should == :fixed_space.uibarbuttonitem
       :fastforward.uibarbuttonitem.should == :fast_forward.uibarbuttonitem
-      SugarCube::Legacy.log.length.should > 0
-    end
-
-    it 'should support `uibaselineadjustment`' do
-      :alignbaselines.uibaselineadjustment.should == UIBaselineAdjustmentAlignBaselines
-      :aligncenters.uibaselineadjustment.should == UIBaselineAdjustmentAlignCenters
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uicontrolevent`' do
       :changed.uicontrolevent.should == :change.uicontrolevent
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uiactivityindicatorstyle`' do
       :whitelarge.uiactivityindicatorstyle.should == :white_large.uiactivityindicatorstyle
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uidatepickermode`' do
       :dateandtime.uidatepickermode.should == :date_and_time.uidatepickermode
       :countdowntimer.uidatepickermode.should == :count_down_timer.uidatepickermode
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uicontentmode`' do
@@ -546,26 +554,26 @@ describe "Symbol - constants" do
       :topright.uicontentmode.should == :top_right.uicontentmode
       :bottomleft.uicontentmode.should == :bottom_left.uicontentmode
       :bottomright.uicontentmode.should == :bottom_right.uicontentmode
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uitablecellaccessorytype`' do
       :disclosureindicator.uitablecellaccessorytype.should == :disclosure_indicator.uitablecellaccessorytype
       :detaildisclosurebutton.uitablecellaccessorytype.should == :detail_disclosure_button.uitablecellaccessorytype
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `uitablecellseparatorstyle`' do
       :singleline.uitablecellseparatorstyle.should == :single_line.uitablecellseparatorstyle
       :singlelineetched.uitablecellseparatorstyle.should == :single_line_etched.uitablecellseparatorstyle
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
     it 'should support `catimingfunction`' do
       :easein.catimingfunction.should == :ease_in.catimingfunction
       :easeout.catimingfunction.should == :ease_out.catimingfunction
       :easeinout.catimingfunction.should == :ease_in_out.catimingfunction
-      SugarCube::Legacy.log.length.should > 0
+      SugarCube.log.length.should > 0
     end
 
   end
@@ -581,12 +589,13 @@ describe "Symbol - constants" do
       :none.uiautoresize.should == :none.uiautoresizemask
     end
 
-    it 'should have alias for `uitextalignment`' do
-      :left.uialignment.should == :left.uitextalignment
+    it 'should support `uibaselineadjustment`' do
+      :align_baselines.uibaselineadjustment.should == UIBaselineAdjustmentAlignBaselines
+      :align_centers.uibaselineadjustment.should == UIBaselineAdjustmentAlignCenters
     end
 
     it 'should have alias for `uibaselineadjustment`' do
-      :alignbaselines.uibaseline.should == :alignbaselines.uibaselineadjustment
+      :align_baselines.uibaseline.should == :align_baselines.uibaselineadjustment
     end
 
     it 'should have alias for `uibordertype`' do

data/spec/{symbol_uicolor_spec.rb → ios/symbol_uicolor_spec.rb}

@@ -777,11 +777,16 @@ describe "Symbol uicolor" do
     end
   end
 
-  describe 'deprecated colors' do
+  describe 'Symbol deprecated colors' do
     before do
+      SugarCube.suppress? true
       @colors = Symbol.uicolors__deprecated
     end
 
+    after do
+      SugarCube.suppress? false
+    end
+
     it 'should have darkgray color' do
       @colors[:darkgray].should == :dark_gray
       :darkgray.uicolor.should.be.kind_of(UIColor)

data/spec/{symbol_uifont_spec.rb → ios/symbol_uifont_spec.rb}

@@ -1,20 +1,20 @@
 describe "Symbol - uifont" do
 
   it "should work with system fonts" do
-    UIFont.should === :system.uifont
-    UIFont.should === :bold.uifont
-    UIFont.should === :italic.uifont
+    :system.uifont.should.be.kind_of(UIFont)
+    :bold.uifont.should.be.kind_of(UIFont)
+    :italic.uifont.should.be.kind_of(UIFont)
   end
 
   it "should work with custom fonts" do
     :monospace.uifont.should != nil
-    UIFont.should === :monospace.uifont
+    :monospace.uifont.should.be.kind_of(UIFont)
   end
 
   it "should allow customization" do
     Symbol.uifont[:default] = 'Helvetica'
     :default.uifont.tap do |subject|
-      UIFont.should === subject
+      subject.should.be.kind_of(UIFont)
       subject.fontName.should == 'Helvetica'
     end
   end

data/spec/{uicontrol_spec.rb → ios/uicontrol_spec.rb}

@@ -74,8 +74,8 @@ describe 'UIControl' do
   end
 
   it 'should have two buttons' do
-    UIButton.should === controller.button1
-    UIButton.should === controller.button2
+    controller.button1.should.be.kind_of(UIButton)
+    controller.button2.should.be.kind_of(UIButton)
   end
 
   it 'button1 should respond to touches' do

data/spec/{uitableviewcell_spec.rb → ios/uitableviewcell_spec.rb}

@@ -2,28 +2,28 @@ describe UITableViewCell do
 
   it 'should create a default cell' do
     cell = UITableViewCell.default('cell_identifier')
-    UITableViewCell.should === cell
+    cell.should.be.kind_of(UITableViewCell)
     cell.reuseIdentifier.should == 'cell_identifier'
     # there's no way to test for the style :-/
   end
 
   it 'should create a value1 cell' do
     cell = UITableViewCell.value1('cell_identifier')
-    UITableViewCell.should === cell
+    cell.should.be.kind_of(UITableViewCell)
     cell.reuseIdentifier.should == 'cell_identifier'
     # there's no way to test for the style :-/
   end
 
   it 'should create a value2 cell' do
     cell = UITableViewCell.value2('cell_identifier')
-    UITableViewCell.should === cell
+    cell.should.be.kind_of(UITableViewCell)
     cell.reuseIdentifier.should == 'cell_identifier'
     # there's no way to test for the style :-/
   end
 
   it 'should create a subtitle cell' do
     cell = UITableViewCell.subtitle('cell_identifier')
-    UITableViewCell.should === cell
+    cell.should.be.kind_of(UITableViewCell)
     cell.reuseIdentifier.should == 'cell_identifier'
     # there's no way to test for the style :-/
   end

data/spec/{uiview_spec.rb → ios/uiview_spec.rb}

@@ -1,4 +1,18 @@
-describe "UIView" do
+describe UIView do
+
+  describe 'should support <<' do
+    view1 = UIView.new
+    view2 = UIView.new
+    view1 << view2
+    view2.superview.should == view1
+  end
+
+  describe 'should support unshift' do
+    view1 = UIView.new
+    view2 = UIView.new
+    view1.unshift view2
+    view2.superview.should == view1
+  end
 
   it "should convert to a UIImage" do
     test = UIView.alloc.initWithFrame([[0, 0], [10, 10]])
@@ -154,48 +168,4 @@ describe "UIView" do
 
   end
 
-  it "should return x" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.x.should == view.frame.origin.x
-  end
-
-  it "should set x" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.x = 500
-    view.x.should == 500
-  end
-
-  it "should return y" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.y.should == view.frame.origin.y
-  end
-
-  it "should set y" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.y = 500
-    view.y.should == 500
-  end
-
-  it "should return width" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.width.should == view.frame.size.width
-  end
-
-  it "should set width" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.width = 500
-    view.width.should == 500
-  end
-
-  it "should return height" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.height.should == view.frame.size.height
-  end
-
-  it "should set height" do
-    view = UIView.alloc.initWithFrame([[100, 200], [300, 400]])
-    view.height = 500
-    view.height.should == 500
-  end
-
 end

data/spec/osx/color_components_spec.rb

@@ -0,0 +1,33 @@
+describe "NSColor component methods" do
+  before do
+    @black = NSColor.blackColor
+    @gray = NSColor.grayColor
+    @white = NSColor.whiteColor
+    @some_color = NSColor.colorWithRed(0.6, green: 0.4, blue: 0.5, alpha:1.0)
+  end
+
+  it "should return 1,1,1 for white" do
+    @white.red.should == 1
+    @white.green.should == 1
+    @white.blue.should == 1
+  end
+
+  it "should return 0,0,0 for black" do
+    @black.red.should == 0
+    @black.green.should == 0
+    @black.blue.should == 0
+  end
+
+  it "should return 0.5,0.5,0.5 for gray" do
+    @gray.red.should == 0.5
+    @gray.green.should == 0.5
+    @gray.blue.should == 0.5
+  end
+
+  it "should return correct rgb for some_color" do
+    @some_color.red.should == 0.6
+    @some_color.green.should == 0.4
+    @some_color.blue.should == 0.5
+  end
+
+end

data/spec/osx/color_other_representations_spec.rb

@@ -0,0 +1,58 @@
+describe 'NSColor (CSS)' do
+
+  it "should have a #to_i method" do
+    NSColor.whiteColor.to_i.should == 16777215
+    NSColor.blackColor.to_i.should == 0
+  end
+
+  it "should have a #to_a method" do
+    NSColor.whiteColor.to_a.should == [255, 255, 255]
+    NSColor.blackColor.to_a.should == [0, 0, 0]
+  end
+
+  it "should have a #hex method" do
+    NSColor.whiteColor.hex.should == '#ffffff'
+    NSColor.blackColor.hex.should == '#000000'
+  end
+
+  it "should have a #system_name method" do
+    NSColor.whiteColor.system_name.should == :whiteColor
+    NSColor.blackColor.system_name.should == :blackColor
+    NSColor.lightGrayColor.system_name.should == :lightGrayColor
+  end
+
+  it "should return css color names" do
+    corrections = {
+      aqua: :cyan,
+      lime: :green,
+      fuchsia: :magenta,
+    }
+    Symbol.css_colors.each do |name, val|
+      name = corrections.fetch(name, name)
+
+      color = val.nscolor
+      color.css_name.should == name
+    end
+  end
+
+  it "should have good to_s return values" do
+    NSColor.whiteColor.to_s.should == 'NSColor.whiteColor'
+    NSColor.whiteColor.nscolor(0.5).to_s.should == 'NSColor.whiteColor(0.5)'
+    :indianred.nscolor.to_s.should == 'NSColor.color(:indianred)'
+    :indianred.nscolor(0.5).to_s.should == 'NSColor.color(:indianred, alpha: 0.5)'
+    '#12be3f'.nscolor.to_s.should == "NSColor.color('#12be3f')"
+    '#12be3f'.nscolor(0.5).to_s.should == "NSColor.color('#12be3f', alpha: 0.5)"
+  end
+
+  Symbol.nscolors.each do |name, method|
+    it "should support #{name.inspect}.nscolor" do
+      name.nscolor.should.be.kind_of(NSColor)
+    end
+  end
+  Symbol.css_colors.each do |name, val|
+    it "should support #{name.inspect}.nscolor" do
+      name.nscolor.should.be.kind_of(NSColor)
+    end
+  end
+
+end