sugarcube 0.20.10 → 0.20.11

data/README.md

@@ -1141,9 +1141,9 @@ puts @label.font.pointSize # => Will be 40 or less depending on the font type an
 
 ```ruby
 # Get an instance containing the specified system item.
-UIBarButtonItem.done {
+UIBarButtonItem.done do
   self.dismissViewControllerAnimated true, completion:nil
-}
+end
 # =>
 UIBarButtonItem.alloc.initWithBarButtonSystemItem(:done.uibarbuttonitem, target:self, action:"action:")
 # with 'action' defined as:
@@ -1152,52 +1152,49 @@ def action(sender)
 end
 
 # the method names are 1::1 with the uibarbuttonitem constants in symbol.rb
-UIBarButtonItem.cancel(&action)           => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:cancel.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonItem.edit(&action)             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:edit.uibarbuttonitem, target:self, action:"action:")
-UIBarButtonItem.save(&action)             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:save.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.cancel { ... }           => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:cancel.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.edit { ... }             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:edit.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.save { ... }             => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:save.uibarbuttonitem, target:self, action:"action:")
   .
   .
   .
-UIBarButtonItem.pagecurl(&action)         => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:pagecurl.uibarbuttonitem, target:self, action:"action:")
+UIBarButtonItem.pagecurl { ... }         => UIBarButtonItem.alloc.initWithBarButtonSystemItem(:pagecurl.uibarbuttonitem, target:self, action:"action:")
 
-# Get an instance containing the specified title.
-UIBarButtonItem.titled('Close') {
-  self.dismissViewControllerAnimated true, completion:nil
-}
+# Create a UIBarButtonItem, specifying the title
+UIBarButtonItem.titled('Close') do
+  self.dismissViewControllerAnimated(true, completion:nil)
+end
 # =>
 UIBarButtonItem.alloc.initWithTitle('Close', style: :bordered.uibarbuttonstyle, target:self, action:"action:")
-
-def action:sender
-  self.dismissViewControllerAnimated true, completion:nil
+def action(sender)
+  self.dismissViewControllerAnimated(true, completion:nil)
 end
 
-# You can also specify a style.
-UIBarButtonItem.titled('Close', :plain.uibarbuttonstyle) {
-  self.dismissViewControllerAnimated true, completion:nil
-}
 
+# You can also specify the style.
+UIBarButtonItem.titled('Close', :plain) do  # :plain, :bordered, :done
+  # ...
+end
 
-# Get an instance containing the specified image.
-UIBarButtonItem.imaged('close'.uiimage) {
-  self.dismissViewControllerAnimated true, completion:nil
-}
-# =>
-UIBarButtonItem.alloc.initWithImage('Close'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
-def action:sender
-  self.dismissViewControllerAnimated true, completion:nil
+
+# Or specify the image instead
+UIBarButtonItem.imaged('close_icon') do  # 'close_icon' will be coerced into a UIImage
+  # ...
 end
+# =>
+UIBarButtonItem.alloc.initWithImage('Close'.uiimage, style: :bordered.uibarbuttonstyle, ...)
 
-# You can also specify a style.
-UIBarButtonItem.imaged('close'.uiimage, :plain.uibarbuttonstyle) {
-  self.dismissViewControllerAnimated true, completion:nil
-}
+# And, like `titled`, specify the style
+UIBarButtonItem.imaged('close'.uiimage, :done) do
+  # ...
+end
 
-# Get an instance containing the specified array which contains a portrate image and a landscape iamge.
-UIBarButtonItem.imaged(['portrate'.uiimage, 'landscape'.uiimage) {
-  self.dismissViewControllerAnimated true, completion:nil
-}
+# If you provide two images, they will be used as the portrait and landscape images
+UIBarButtonItem.imaged(['portrait'.uiimage, 'landscape'.uiimage) do
+  # ...
+end
 # =>
-UIBarButtonItem.alloc.initWithImage('portrate'.uiimage, landscapeImagePhone:'landscape'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
+UIBarButtonItem.alloc.initWithImage('portrait'.uiimage, landscapeImagePhone:'landscape'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
 ```
 
 Example Usage:

data/lib/sugarcube/uialertview.rb

@@ -81,11 +81,13 @@ module SugarCube
         handler = success_handler
       end
 
-      if handler.arity == 0
-        handler.call
-      else
-        button = buttons[index]
-        handler.call(button)
+      if handler
+        if handler.arity == 0
+          handler.call
+        else
+          button = buttons[index]
+          handler.call(button)
+        end
       end
 
       self.send(:autorelease)

data/lib/sugarcube/uibarbuttonitem.rb

@@ -1,111 +1,112 @@
+# Factory methods for UIBarButtonItem
 class UIBarButtonItem
-  
+
   class << self
-  
+
     def done(&action)
-      sugarcube_barbuttonitem :done.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:done, action)
     end
 
     def cancel(&action)
-      sugarcube_barbuttonitem :cancel.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:cancel, action)
     end
-  
+
     def edit(&action)
-      sugarcube_barbuttonitem :edit.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:edit, action)
     end
-  
+
     def save(&action)
-      sugarcube_barbuttonitem :save.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:save, action)
     end
-  
+
     def add(&action)
-      sugarcube_barbuttonitem :add.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:add, action)
     end
-  
+
     def flexiblespace(&action)
-      sugarcube_barbuttonitem :flexiblespace.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:flexiblespace, action)
     end
-  
+
     def fixedspace(&action)
-      sugarcube_barbuttonitem :fixedspace.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:fixedspace, action)
     end
-  
+
     def compose(&action)
-      sugarcube_barbuttonitem :compose.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:compose, action)
     end
-  
+
     def reply(&action)
-      sugarcube_barbuttonitem :reply.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:reply, action)
     end
-  
+
     def action(&action)
-      sugarcube_barbuttonitem :action.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:action, action)
     end
-  
+
     def organize(&action)
-      sugarcube_barbuttonitem :organize.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:organize, action)
     end
-  
+
     def bookmarks(&action)
-      sugarcube_barbuttonitem :bookmarks.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:bookmarks, action)
     end
-  
+
     def search(&action)
-      sugarcube_barbuttonitem :search.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:search, action)
     end
-  
+
     def refresh(&action)
-      sugarcube_barbuttonitem :refresh.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:refresh, action)
     end
-  
+
     def stop(&action)
-      sugarcube_barbuttonitem :stop.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:stop, action)
     end
-  
+
     def camera(&action)
-      sugarcube_barbuttonitem :camera.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:camera, action)
     end
-  
+
     def trash(&action)
-      sugarcube_barbuttonitem :trash.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:trash, action)
     end
-  
+
     def play(&action)
-      sugarcube_barbuttonitem :play.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:play, action)
     end
-  
+
     def pause(&action)
-      sugarcube_barbuttonitem :pause.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:pause, action)
     end
-  
+
     def rewind(&action)
-      sugarcube_barbuttonitem :rewind.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:rewind, action)
     end
 
     def fastforward(&action)
-      sugarcube_barbuttonitem :fastforward.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:fastforward, action)
     end
 
     def undo(&action)
-      sugarcube_barbuttonitem :undo.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:undo, action)
     end
 
     def redo(&action)
-      sugarcube_barbuttonitem :redo.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:redo, action)
     end
 
     def pagecurl(&action)
-      sugarcube_barbuttonitem :pagecurl.uibarbuttonitem, action
+      sugarcube_barbuttonitem(:pagecurl, action)
     end
 
-    def titled(title, style = :bordered.uibarbuttonstyle, &action)
+    def titled(title, style = :bordered, &action)
       sugarcube_barbuttonitem_with_title(title, style, action)
     end
-  
-    def imaged(image, style = :bordered.uibarbuttonstyle, &action)
+
+    def imaged(image, style = :bordered, &action)
       sugarcube_barbuttonitem_with_image(image, style, action)
     end
-  
+
   end
 
   # Adds the action and keeps a strong reference to the Proc object.
@@ -119,23 +120,26 @@ class UIBarButtonItem
 private
 
   def self.sugarcube_barbuttonitem(systemitem, action)
-    b = UIBarButtonItem.alloc.initWithBarButtonSystemItem systemitem, target:nil, action:nil
+    systemitem = systemitem.uibarbuttonitem if systemitem.is_a?(Symbol)
+    b = UIBarButtonItem.alloc.initWithBarButtonSystemItem(systemitem, target:nil, action:nil)
     b.set_target_and_action b, action
     b
   end
 
   def self.sugarcube_barbuttonitem_with_title(title, style, action)
-    b = UIBarButtonItem.alloc.initWithTitle title, style:style, target:nil, action:nil
+    style = style.uibarbuttonstyle if style.is_a?(Symbol)
+    b = UIBarButtonItem.alloc.initWithTitle(title, style:style, target:nil, action:nil)
     b.set_target_and_action b, action
     b
   end
 
   def self.sugarcube_barbuttonitem_with_image(image, style, action)
+    style = style.uibarbuttonstyle if style.is_a?(Symbol)
     case image
     when Array
-      b = UIBarButtonItem.alloc.initWithImage image.first, landscapeImagePhone:image.last, style:style, target:nil, action:nil
+      b = UIBarButtonItem.alloc.initWithImage(image.first.uiimage, landscapeImagePhone:image.last.uiimage, style:style, target:nil, action:nil)
     else
-      b = UIBarButtonItem.alloc.initWithImage image, style:style, target:nil, action:nil
+      b = UIBarButtonItem.alloc.initWithImage(image.uiimage, style:style, target:nil, action:nil)
     end
     b.set_target_and_action b, action
     b

data/lib/sugarcube/uiview.rb

@@ -228,24 +228,27 @@ class UIView
 
   # Changes the current rotation to `new_angle`
   # (`rotate` rotates relative to the current rotation)
-  def rotate_to(options={}, &after)
+  def rotate_to(options={}, more_options={}, &after)
     if options.is_a? Numeric
-      options = { angle: options }
+      new_angle = options
+      options = more_options
+    else
+      new_angle = options[:angle]
     end
 
     options[:after] = after
 
     animate(options) {
-      self.transform = CGAffineTransformMakeRotation(options[:angle])
+      self.transform = CGAffineTransformMakeRotation(new_angle)
     }
   end
 
   # Changes the current rotation by `new_angle`
   # (`rotate` rotates to a specific angle)
-  def rotate(options={}, &after)
+  def rotate(options={}, more_options={}, &after)
     if options.is_a? Numeric
       new_angle = options
-      options = {}
+      options = more_options
     else
       new_angle = options[:angle]
     end
@@ -255,10 +258,10 @@ class UIView
     rotate_to(options, &after)
   end
 
-  def slide(direction, options={}, more_options=nil, &after)
+  def slide(direction, options={}, more_options={}, &after)
     if options.is_a? Numeric
       size = options
-      options = more_options || {}
+      options = more_options
     else
       size = options[:size]
     end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.10'
+  Version = '0.20.11'
 end

metadata

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