sugarcube 0.20.12 → 0.20.13

data/lib/sugarcube/uicontrol.rb

@@ -7,7 +7,7 @@ class UIControl
   # @example
   #   button = UIButton.alloc.initWithFrame([0, 0, 10, 10])
   #   button.on(:touch) { my_code }
-  #   button.on(:touchupoutside, :touchcancel) { my_code }
+  #   button.on(:touch_up_outside, :touch_cancel) { my_code }
   #   # up to two arguments can be passed in
   #   button.on(:touch) { |sender,touch_event| my_code }
   def on(*events, &block)
@@ -29,7 +29,7 @@ class UIControl
   #
   # @example
   #   button.off(:touch)
-  #   button.off(:touchupoutside, :touchcancel)
+  #   button.off(:touch_up_outside, :touch_cancel)
   #   button.off  # all events
   def off(*events)
     if events.length == 0
@@ -47,6 +47,20 @@ class UIControl
     self
   end
 
+  # Useful during testing, or to simulate a button press.
+  #
+  # @example
+  #   button.trigger(:touch)
+  #   button.trigger(:touch_drag_outside, :touch_drag_exits)
+  def trigger(*events)
+    event_mask = 0
+    events.each do |event|
+      event = event.uicontrolevent unless event.is_a? Fixnum
+      event_mask |= event
+    end
+    sendActionsForControlEvents(event_mask)
+  end
+
 # private
   # event blocks need to be retained, and the addTarget method explicitly does
   # *not* retain `target`.  This makes sure that callbacks are retained by

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.12'
+  Version = '0.20.13'
 end

data/lib/sugarcube-attributedstring/nsattributedstring.rb

@@ -226,7 +226,7 @@ class NSAttributedString
   end
 
   def +(attributedstring)
-    NSMutableAttributedString.alloc.initWithAttributedString(self) + attributedstring
+    NSMutableAttributedString.alloc.initWithAttributedString(self) + attributedstring.nsattributedstring
   end
 
 end

data/spec/uicontrol_spec.rb

@@ -17,6 +17,13 @@ describe 'UIControl' do
     controller.touched_count.should == 1
   end
 
+  it 'button1 should respond to touches using `trigger`' do
+    controller.button1.trigger(:touch)
+    controller.touched.should == controller.button1
+    controller.touched_1.should == true
+    controller.touched_count.should == 1
+  end
+
   it 'button2 should respond to touches' do
     controller.button2.sendActionsForControlEvents(:touch.uicontrolevent)
     controller.touched.should == controller.button2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.12
+  version: 0.20.13
   prerelease: 
 platform: ruby
 authors: