sugarcube 0.20.20 → 0.20.21

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugarcube (0.20.20)
+    sugarcube (0.20.21)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1757,7 +1757,8 @@ Quick wrapper for `CFUUIDCreate()` and `CFUUIDCreateString()`.  Identical to the
 Ruby on Rails Ripoffs (RoR-R?)
 ---------------
 
-aka `ActiveSupport`.
+aka `ActiveSupport`.  Now that Thomas Kadauke has released [motion-support][],
+consider these extensions deprecated.  They will be removed in version 1.0.
 
 ```ruby
 # truthiness with `blank?`
@@ -1775,7 +1776,6 @@ true.blank?     # => false
 
 # and my favorite
 1.in? [1,2,3]  # => true
-1.in? 1,2,3    # => true
 1.in? 4..5     # => false
 ```
 

data/app/uicontrol_controller.rb

@@ -30,17 +30,17 @@ class UIControlController < UIViewController
       @button1.center = [@button1.center.x, @button1.center.y - 30]
       self.view << @button2
 
-      @button1.on :touch { |sender,event|
+      @button1.on :touch do |sender,event|
         @touched_1 = true
         @touched = sender
         @touched_count += 1
-      }
+      end
 
-      @button2.on :touch { |sender,event|
+      @button2.on :touch do |sender,event|
         @touched_2 = true
         @touched = sender
         @touched_count += 1
-      }
+      end
 
       reset
     end

data/lib/sugarcube/activesupport.rb

@@ -16,13 +16,14 @@ class Object
   # okay, this is strange, but `rake spec` fails if I define the method as `in?`
   # but passes if I alias it, as I do below.  weird, but I don't want to fight
   # it.
-  def in(*list)
-    if list.length == 1
-      return list[0].include?(self)
-    else
-      return list.include?(self)
+  def __in_workaround(args, *other_args)
+    if other_args.length > 0
+      raise "The varargs form of `Object#in?` has been removed.  Use an array instead."
     end
+    args.include?(self)
+  rescue NoMethodError
+    raise ArgumentError.new("The parameter passed to #in? must respond to #include?")
   end
-  alias :in? :in
+  alias in? __in_workaround
 
 end

data/lib/sugarcube/uicontrol.rb

@@ -61,7 +61,7 @@ class UIControl
     sendActionsForControlEvents(event_mask)
   end
 
-# private
+private
   # event blocks need to be retained, and the addTarget method explicitly does
   # *not* retain `target`.  This makes sure that callbacks are retained by
   # pushing the block onto a stack.

data/lib/sugarcube/uiview.rb

@@ -426,7 +426,6 @@ class UIView
       subviews.each do |subview|
         CGContextSaveGState(context)
         CGContextTranslateCTM(context, subview.frame.origin.x, subview.frame.origin.y)
-        # CGContextConcatCTM(subview.layer.affineTransform)
         subview.layer.renderInContext(context)
         CGContextRestoreGState(context)
       end
@@ -434,7 +433,6 @@ class UIView
       UIGraphicsEndImageContext()
     else
       UIGraphicsBeginImageContextWithOptions(bounds.size, false, scale)
-      # CGContextConcatCTM(layer.affineTransform)
       layer.renderInContext(UIGraphicsGetCurrentContext())
       image = UIGraphicsGetImageFromCurrentImageContext()
       UIGraphicsEndImageContext()

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.20'
+  Version = '0.20.21'
 end

data/spec/activesupport_spec.rb

@@ -1,3 +1,10 @@
+class LifeUniverseAndEverything
+  def include?(obj)
+    obj == 42
+  end
+end
+
+
 describe 'ActiveSupport' do
 
   describe "should have a blank? method" do
@@ -60,20 +67,30 @@ describe 'ActiveSupport' do
     end
   end
 
-  it "should have an in? method" do
-    1.in?(1,2,3).should == true
-    0.in?(1,2,3).should == false
+  describe "in?" do
+    it "should support arrays" do
+      1.in?([1,2,3]).should == true
+      0.in?([1,2,3]).should == false
+    end
 
-    1.in?([1,2,3]).should == true
-    0.in?([1,2,3]).should == false
+    it "should support hashes" do
+      :a.in?({a:1,b:2,c:3}).should == true
+      1.in?({a:1,b:2,c:3}).should == false
+    end
 
-    :a.in?({a:1,b:2,c:3}).should == true
-    1.in?({a:1,b:2,c:3}).should == false
+    it "should support ranges" do
+      1.in?(1..3).should == true
+      0.in?(1..3).should == false
+    end
 
-    1.in?(1..3).should == true
-    0.in?(1..3).should == false
+    it "should support strings" do
+      'a'.in?("apple").should == true
+    end
 
-    :anything.in?().should == false
+    it "should support anything that implements `include?`" do
+      42.in?(LifeUniverseAndEverything.new).should == true
+      0.in?(LifeUniverseAndEverything.new).should == false
+    end
   end
 
 end

data/spec/nsurl_spec.rb

@@ -12,4 +12,8 @@ describe "NSURL" do
     NSData.should === 'https://github.com'.nsurl.nsdata
   end
 
+  it "should have a method #nsurlrequest" do
+    NSURLRequest.should === 'https://github.com'.nsurl.nsurlrequest
+  end
+
 end

data/spec/uicontrol_spec.rb

@@ -1,3 +1,71 @@
+describe 'UIControl' do
+  describe 'should have sugarcube_callbacks' do
+    before do
+      @ctrl = UIButton.new
+    end
+    after do
+      @ctrl.off
+    end
+
+    it 'should start off empty' do
+      @ctrl.send(:sugarcube_callbacks).should == {}
+    end
+
+    it 'should add a touch handler' do
+      @ctrl.on(:touch) {}
+      @ctrl.send(:sugarcube_callbacks).length.should == 1
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside].length.should == 1
+    end
+
+    it 'should remove the touch handler' do
+      @ctrl.on(:touch) {}
+      @ctrl.off
+      @ctrl.send(:sugarcube_callbacks).length.should == 0
+    end
+
+    it 'should add two touch handlers' do
+      @ctrl.on(:touch) {}
+      @ctrl.on(:touch) {}
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside].length.should == 2
+    end
+
+    it 'should remove both touch handlers' do
+      @ctrl.on(:touch) {}
+      @ctrl.on(:touch) {}
+      @ctrl.off
+      @ctrl.send(:sugarcube_callbacks).length.should == 0
+    end
+
+    it 'should add multiple control events' do
+      @ctrl.on(:touch_start, :touch_stop) {}
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchDown | UIControlEventTouchDragEnter].length.should == 1
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit].length.should == 1
+    end
+
+    it 'should remove some events' do
+      @ctrl.on(:touch_start, :touch_stop) {}
+      @ctrl.off(:touch_start)
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit].length.should == 1
+    end
+
+    it 'should distinguish events' do
+      @ctrl.on(:touch) {}
+      @ctrl.on(:touch_start, :touch_stop) {}
+      @ctrl.off(:touch_start)
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside].length.should == 1
+      @ctrl.send(:sugarcube_callbacks)[UIControlEventTouchUpInside | UIControlEventTouchCancel | UIControlEventTouchDragExit].length.should == 1
+    end
+
+    it 'should remove all events' do
+      @ctrl.on(:touch_start, :touch_stop) {}
+      @ctrl.off(:touch_start)
+      @ctrl.off(:touch_stop)
+      @ctrl.send(:sugarcube_callbacks).should == {}
+    end
+
+  end
+end
+
 describe 'UIControl' do
   tests UIControlController
 

metadata

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