sugarcube 1.0.3 → 1.0.4

data/Gemfile.lock

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

data/README.md

@@ -157,7 +157,7 @@ quick overview:
   > w 15
   ```
 
-Be sure to read more in the [REPL Adjustments][REPL Wiki] Wiki page.
+Be sure to read more in the [REPL Additions][REPL Wiki] Wiki page.
 
 [REPL Wiki]: https://github.com/rubymotion/sugarcube/wiki/REPL-Additions
 

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.0.3'
+  Version = '1.0.4'
 end

data/lib/sugarcube-classic.rb

@@ -12,6 +12,7 @@ ignore = [
   'sugarcube-attributedstring.rb',
   'sugarcube-awesome.rb',
   'sugarcube-gestures.rb',
+  'sugarcube-pipes.rb',
   'sugarcube-repl.rb',
   'sugarcube-unholy.rb',
 ]

data/lib/sugarcube-color/uicolor.rb

@@ -41,7 +41,8 @@ class UIColor
     color = color.uicolor
 
     # make amount between 0 and 1
-    amount = [[0, amount].max, 1].min
+    amount = amount > 0 ? amount : 0
+    amount = amount < 1 ? amount : 1
     # start with precise amounts: 0, 0.5, and 1.
     if amount == 0 && self.alpha == color.alpha
       self

data/lib/sugarcube-common.rb

@@ -9,6 +9,7 @@ ignore = [
 
   'sugarcube-anonymous.rb',
   'sugarcube-awesome.rb',
+  'sugarcube-pipes.rb',
   'sugarcube-unholy.rb',
 ]
 

data/lib/sugarcube-factories/uiactionsheet.rb

@@ -144,9 +144,12 @@ module SugarCube
       if handler
         if handler.arity == 0
           handler.call
-        else
+        elsif handler.arity == 1
           button = buttons[index]
           handler.call(button)
+        else
+          button = buttons[index]
+          handler.call(button, index)
         end
       end
 

data/lib/sugarcube-factories/uialertview.rb

@@ -96,19 +96,26 @@ module SugarCube
       end
 
       if handler
-        # construct all the possible arguments you could send
-        args = [buttons[index]]
-        # add the first input if this is not the default
-        if alert.alertViewStyle != UIAlertViewStyleDefault
-          args << alert.textFieldAtIndex(0).text
+        if handler.arity == 0
+          args = []
+        else
+          # construct all the possible arguments you could send
+          args = [buttons[index]]
+          # add the first input if this is not the default
+          if alert.alertViewStyle != UIAlertViewStyleDefault
+            args << alert.textFieldAtIndex(0).text
+          end
+          # add the second one if this is a login+password input
+          if alert.alertViewStyle == UIAlertViewStyleLoginAndPasswordInput
+            args << alert.textFieldAtIndex(1).text
+          end
+
+          # and maybe you want the index, too
+          args << index
+
+          # but only send the ones they asked for
+          args = args[0...handler.arity]
         end
-        # add the second one if this is a login+password input
-        if alert.alertViewStyle == UIAlertViewStyleLoginAndPasswordInput
-          args << alert.textFieldAtIndex(1).text
-        end
-
-        # but only send the ones they asked for
-        args = args[0...handler.arity]
         handler.call(*args)
       end
 

data/lib/sugarcube-gestures/gestures.rb

@@ -187,6 +187,9 @@ private
 
   # Adds the recognizer and keeps a strong reference to the Proc object.
   def sugarcube_add_gesture(proc, recognizer)
+    unless self.userInteractionEnabled?
+      puts("SugarCube: userInteractionEnabled is false on #{self.inspect}. Adding a gesture will have no effect.")
+    end
     self.addGestureRecognizer(recognizer)
 
     @sugarcube_recognizers = {} unless @sugarcube_recognizers

data/lib/sugarcube-nsdate/nsdate.rb

@@ -150,7 +150,7 @@ class NSDate
   #  (main)> t.time_array
   #  => [11, 29, 12]
   def time_array
-    return [self.hour, self.min, self.sec]
+    return [self.hour, self.send(:min), self.sec]
   end
 
   #  (main)> t = Time.new
@@ -158,7 +158,7 @@ class NSDate
   #  (main)> t.time_array
   #  => [2012, 9, 12, 11, 29, 12]
   def datetime_array
-    return [self.year, self.month, self.day, self.hour, self.min, self.sec]
+    return [self.year, self.month, self.day, self.hour, self.send(:min), self.sec]
   end
 
   #  (main)> t = Time.new

data/lib/sugarcube-uikit/uiview.rb

@@ -76,25 +76,35 @@ class UIView
    # the future, if this argument becomes something that accepts multiple values,
    # those two are sacred.
   def uiimage(use_content_size=false)
-     scale = UIScreen.mainScreen.scale
-     if use_content_size
-       UIGraphicsBeginImageContextWithOptions(contentSize, false, scale)
-       context = UIGraphicsGetCurrentContext()
-       subviews.each do |subview|
-         CGContextSaveGState(context)
-         CGContextTranslateCTM(context, subview.frame.origin.x, subview.frame.origin.y)
-         subview.layer.renderInContext(context)
-         CGContextRestoreGState(context)
-       end
-       image = UIGraphicsGetImageFromCurrentImageContext()
-       UIGraphicsEndImageContext()
-     else
-       UIGraphicsBeginImageContextWithOptions(bounds.size, false, scale)
-       layer.renderInContext(UIGraphicsGetCurrentContext())
-       image = UIGraphicsGetImageFromCurrentImageContext()
-       UIGraphicsEndImageContext()
-     end
-     return image
-   end
+    scale = UIScreen.mainScreen.scale
+    if use_content_size
+      UIGraphicsBeginImageContextWithOptions(contentSize, false, scale)
+      context = UIGraphicsGetCurrentContext()
+      subviews.each do |subview|
+        CGContextSaveGState(context)
+        CGContextTranslateCTM(context, subview.frame.origin.x, subview.frame.origin.y)
+        subview.layer.renderInContext(context)
+        CGContextRestoreGState(context)
+      end
+      image = UIGraphicsGetImageFromCurrentImageContext()
+      UIGraphicsEndImageContext()
+    else
+      UIGraphicsBeginImageContextWithOptions(bounds.size, false, scale)
+      layer.renderInContext(UIGraphicsGetCurrentContext())
+      image = UIGraphicsGetImageFromCurrentImageContext()
+      UIGraphicsEndImageContext()
+    end
+    return image
+  end
+
+  # Returns the receiver's bounds in the coordinate system of `destination`
+  def convert_bounds(destination)
+    self.convertRect(self.bounds, toView:destination)
+  end
+
+  # Returns the receiver's bounds in the coordinate system of `destination`
+  def convert_origin(destination)
+    self.convertPoint([0, 0], toView:destination)
+  end
 
 end

data/spec/uiactionsheet_spec.rb

@@ -71,7 +71,7 @@ describe 'UIActionSheet' do
   end
 
   it 'should call block with "OK" pressed' do
-    alert = UIActionSheet.alert('test') { |button| @touched = button }
+    alert = UIActionSheet.alert('test') { |button, index| @touched, @touched_index = button, index }
     proper_wait 0.6
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
     @touched.should == 'OK'
@@ -81,7 +81,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
-      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive', 'ok']) { |button| @touched = button }
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive', 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
 
@@ -109,7 +109,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
-      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive']) { |button| @touched = button }
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
 
@@ -121,12 +121,14 @@ describe 'UIActionSheet' do
       @alert.cancelButtonIndex.should == 1
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
       @touched.should == 'cancel'
+      @touched_index.should == @alert.cancelButtonIndex
     end
 
     it 'should call block with "destructive" when destructive button is pressed' do
       @alert.destructiveButtonIndex.should == 0
       @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
       @touched.should == 'destructive'
+      @touched_index.should == @alert.destructiveButtonIndex
     end
 
     it 'should not have other buttons' do
@@ -139,7 +141,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
-      @alert = UIActionSheet.alert('test', buttons: ['cancel', nil, 'ok']) { |button| @touched = button }
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', nil, 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
 
@@ -151,6 +153,7 @@ describe 'UIActionSheet' do
       @alert.cancelButtonIndex.should == 1
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
       @touched.should == 'cancel'
+      @touched_index.should == @alert.cancelButtonIndex
     end
 
     it 'should not have destructive button' do
@@ -161,6 +164,7 @@ describe 'UIActionSheet' do
       @alert.firstOtherButtonIndex.should == 0
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
       @touched.should == 'ok'
+      @touched_index.should == @alert.firstOtherButtonIndex
     end
 
   end
@@ -169,7 +173,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
-      @alert = UIActionSheet.alert('test', buttons: [nil, 'destructive', 'ok']) { |button| @touched = button }
+      @alert = UIActionSheet.alert('test', buttons: [nil, 'destructive', 'ok']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
 
@@ -177,20 +181,22 @@ describe 'UIActionSheet' do
       @alert.dismissWithClickedButtonIndex(-1, animated: false) if @alert.visible?
     end
 
-    it 'should call block with "cancel" when cancel button is pressed' do
+    it 'should not have cancel button' do
       @alert.cancelButtonIndex.should == -1
     end
 
-    it 'should not have destructive button' do
+    it 'should call block with "destructive" when destructive button is pressed' do
       @alert.destructiveButtonIndex.should == 0
       @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
       @touched.should == 'destructive'
+      @touched_index.should == @alert.destructiveButtonIndex
     end
 
     it 'should call block with "ok" when other button is pressed' do
       @alert.firstOtherButtonIndex.should == 1
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
       @touched.should == 'ok'
+      @touched_index.should == @alert.firstOtherButtonIndex
     end
 
   end
@@ -199,7 +205,7 @@ describe 'UIActionSheet' do
 
     before do
       @touched = nil
-      @alert = UIActionSheet.alert('test', buttons: [nil, nil, 'test1', 'test2']) { |button| @touched = button }
+      @alert = UIActionSheet.alert('test', buttons: [nil, nil, 'test1', 'test2']) { |button, index| @touched, @touched_index = button, index }
       proper_wait 0.6
     end
 
@@ -219,11 +225,13 @@ describe 'UIActionSheet' do
       @alert.firstOtherButtonIndex.should == 0
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
       @touched.should == 'test1'
+      @touched_index.should == @alert.firstOtherButtonIndex
     end
 
     it 'should call block with "test2" when second button is pressed' do
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
       @touched.should == 'test2'
+      @touched_index.should == @alert.firstOtherButtonIndex + 1
     end
 
   end
@@ -236,7 +244,7 @@ describe 'UIActionSheet' do
         buttons: ['cancel', 'destructive', 'test1', 'test2'],
         cancel: ->{ @touched = :cancel },
         destructive: ->{ @touched = :destructive },
-        success: ->(button){ @touched = button },
+        success: ->(button, index){ @touched, @touched_index = button, index },
         )
       proper_wait 0.6
     end
@@ -257,11 +265,13 @@ describe 'UIActionSheet' do
       @alert.firstOtherButtonIndex.should == 1
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
       @touched.should == 'test1'
+      @touched_index.should == @alert.firstOtherButtonIndex
     end
 
     it 'should call block with "test2" when second button is pressed' do
       @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
       @touched.should == 'test2'
+      @touched_index.should == @alert.firstOtherButtonIndex + 1
     end
 
   end

data/spec/uialertview_spec.rb

@@ -99,6 +99,15 @@ describe 'UIAlertView' do
     @touched.should == 'OK'
   end
 
+  it 'should call the block and pass the button and index when dismissed' do
+    alert = UIAlertView.alert('test') { |button, index| @touched, @touched_index = button, index }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+
+    @touched.should == 'OK'
+    @touched_index.should == 0
+  end
+
   it 'should call the block when dismissed no matter when cancel button pressed' do
     alert = UIAlertView.alert('test', buttons:['cancel','ok']) { @touched = true }
     alert.numberOfButtons.should == 2
@@ -116,6 +125,15 @@ describe 'UIAlertView' do
     @touched.should == 'cancel'
   end
 
+  it 'should call the block and pass the button and index when dismissed with multiple buttons' do
+    alert = UIAlertView.alert('test', buttons: ['cancel', 'ok']) { |button, index| @touched, @touched_index = button, index }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+    @touched.should == 'cancel'
+    @touched_index.should == 0
+  end
+
   describe 'Should call the appropriate block when :cancel and :success handlers are used' do
 
     before do
@@ -182,6 +200,20 @@ describe 'UIAlertView' do
       @text.should == 'test text 1 + test text 2'
     end
 
+    it 'should work with :login_and_password_input and pass the index' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) { |button, text1, text2, index|
+        @text = "#{text1} + #{text2}"
+        @touched_index = index
+      }
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text 1'
+      alert.textFieldAtIndex(1).text = 'test text 2'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+      @text.should == 'test text 1 + test text 2'
+      @touched_index.should == alert.cancelButtonIndex
+    end
+
   end
 
 end

data/spec/uiview_spec.rb

@@ -28,4 +28,28 @@ describe "UIView" do
     image.scale.should == UIScreen.mainScreen.scale
   end
 
+  it "should convert bounds" do
+    view1 = UIView.alloc.initWithFrame([[0, 0], [100, 100]])
+    view2 = UIView.alloc.initWithFrame([[10, 5], [80, 90]])
+    view1 << view2
+    view3 = UIView.alloc.initWithFrame([[10, 5], [60, 80]])
+    view2 << view3
+    frame = view3.convert_bounds(view1)
+    frame.origin.x.should == 20
+    frame.origin.y.should == 10
+    frame.size.width.should == 60
+    frame.size.height.should == 80
+  end
+
+  it "should convert point" do
+    view1 = UIView.alloc.initWithFrame([[0, 0], [100, 100]])
+    view2 = UIView.alloc.initWithFrame([[10, 5], [80, 90]])
+    view1 << view2
+    view3 = UIView.alloc.initWithFrame([[10, 5], [60, 80]])
+    view2 << view3
+    point = view3.convert_origin(view1)
+    point.x.should == 20
+    point.y.should == 10
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description