sugarcube 0.20.13 → 0.20.15

data/Gemfile.lock

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

data/lib/sugarcube/adjust.rb

@@ -374,7 +374,7 @@ module SugarCube
     end
 
     def root
-      (UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]).rootViewController
+      UIApplication.sharedApplication.windows[0].rootViewController
     end
 
     ##|  RESTORE

data/lib/sugarcube/date_parser.rb

@@ -58,7 +58,7 @@ class String
   end
 
   def to_timezone
-    SugarCube::DateParser.parse_timezone(self)
+    SugarCube::DateParser.parse_time_zone(self)
   end
 
   def to_duration

data/lib/sugarcube/nsstring.rb

@@ -18,7 +18,9 @@ class NSString
 
   # @return [UIImage]
   def uiimage
-    UIImage.imageNamed(self)
+    UIImage.imageNamed(self).tap do |retval|
+      NSLog("No image named #{self}") unless retval
+    end
   end
 
   # @return [UIImageView]
@@ -89,4 +91,17 @@ class NSString
   end
   alias _ localized
 
+  def nstimezone
+    case self
+    when /([+-]?\d{4})/
+      sec = $1[-4,2].to_i * 3600
+      NSTimeZone.timeZoneForSecondsFromGMT(sec)
+    when /(GMT|UTC)([+-]\d{1,2})?/
+      sec = $2 ? $2.to_i * 3600 : 0
+      NSTimeZone.timeZoneForSecondsFromGMT(sec)
+    else
+      NSTimeZone.timeZoneWithName(self)
+    end
+  end
+  
 end

data/lib/sugarcube/symbol.rb

@@ -62,6 +62,9 @@ class Symbol
     attr :tableview_cellselectionstyle
     attr :tableview_cellseparatorstyle
 
+    attr :alert_view_styles
+    attr :action_sheet_styles
+
     attr :image_sourcetypes
     attr :image_capturemode
     attr :image_cameradevice
@@ -354,6 +357,20 @@ class Symbol
     etched: UITableViewCellSeparatorStyleSingleLineEtched,
   }
 
+  @alert_view_styles = {
+    default: UIAlertViewStyleDefault,
+    secure_text_input: UIAlertViewStyleSecureTextInput,
+    plain_text_input: UIAlertViewStylePlainTextInput,
+    login_and_password_input: UIAlertViewStyleLoginAndPasswordInput,
+  }
+
+  @action_sheet_styles = {
+    automatic: UIActionSheetStyleAutomatic,
+    default: UIActionSheetStyleDefault,
+    black_translucent: UIActionSheetStyleBlackTranslucent,
+    black_opaque: UIActionSheetStyleBlackOpaque,
+  }
+
   @statusbar_styles = {
     default:     UIStatusBarStyleDefault,
     black:       UIStatusBarStyleBlackOpaque,
@@ -628,6 +645,16 @@ class Symbol
     sugarcube_look_in(Symbol.tableview_cellseparatorstyle)
   end
 
+  def uialertstyle
+    sugarcube_look_in(Symbol.alert_view_styles)
+  end
+  alias uialertviewstyle uialertstyle
+
+  def uiactionstyle
+    sugarcube_look_in(Symbol.action_sheet_styles)
+  end
+  alias uiactionsheetstyle uiactionstyle
+
   def uistatusbarstyle
     sugarcube_look_in(Symbol.statusbar_styles)
   end

data/lib/sugarcube/uiactionsheet.rb

@@ -1,18 +1,26 @@
 class UIActionSheet
 
-  # UIActionSheet.alert("title",
-  #   # The first button is considered the 'cancel' button, for the purposes of
-  #   # whether the cancel or success handler gets called, the second button is
-  #   # the 'destructive' button, and the rest are plain old buttons.
-  #   buttons: %w"Cancel OK No-way",
-  #   cancel: proc{ puts "nevermind" },
-  #   destructive: proc{ puts "OHHH YEAAH!" },
-  #   success: proc{ |pressed| puts "pressed: #{pressed}" },
-  #   )
+  # For the purposes of whether the cancel or success handler gets called, the
+  # first button is considered the 'cancel' button, the second button is the
+  # 'destructive' button, and the rest are plain old buttons.
+  #
+  # If you use just one block, it will be used for *all* of the buttons.
+  #
+  # @example
+  #     # use a different handler for each button type
+  #     UIActionSheet.alert("title",
+  #       buttons: %w"Cancel Delete No-way",
+  #       cancel: proc{ puts "nevermind" },
+  #       destructive: proc{ puts "OHHH YEAAH!" },
+  #       success: proc{ |pressed| puts "pressed: #{pressed}" },
+  #       )
+  #     # use one handler for all buttons
+  #     UIActionSheet.alert("title", buttons: [...]) { |button| }
   def self.alert(title, options={}, &block)
     # create the delegate
     delegate = SugarCube::ActionSheetDelegate.new
-    delegate.on_success = options[:success] || block
+    delegate.on_default = block
+    delegate.on_success = options[:success]
     delegate.on_destructive = options[:destructive]
     delegate.on_cancel = options[:cancel]
     delegate.send(:retain)
@@ -24,61 +32,87 @@ class UIActionSheet
     buttons.concat(options[:buttons]) if options[:buttons]
 
     if buttons.empty?
-      # cancelButtonTitle: is first, so check for cancel handler
-      if options[:cancel]
-        buttons << 'Cancel'
-      else
-        buttons << nil
-      end
-
-      # destructiveButtonTitle, check for destructive handler
-      if options[:destructive]
-        buttons << 'Delete'
-      else
-        buttons << nil
-      end
-    elsif buttons.length == 1 and (options[:cancel] or options[:destructive])
-      raise 'If you only have one button, use a :success handler, not :cancel or :destructive'
-    end
-
-    # uses localized buttons in the actual alert
-    if buttons.length == 0
-      buttons = [nil, nil]
-    elsif buttons.length == 1
+      # cancelButtonTitle:
       buttons << nil
-    end
 
-    last_index = buttons.length - 1
-    offset = 0
-
-    button_index_map = {}
-    if buttons[1]  # destructive
-      button_index_map[0] = buttons[1]
-      offset += 1
-    else
-      last_index -= 1
-    end
+      # destructiveButtonTitle
+      buttons << nil
 
-    if buttons[0]  # cancel
-      button_index_map[last_index] = buttons[0]
+      # otherButtonTitles:
+      buttons << 'OK'
+    elsif buttons.length == 1 && (options[:cancel] || options[:destructive])
+      raise 'If you only have one button, use a :success handler, not :cancel or :destructive'
     end
 
-    buttons[2..-1].each_with_index { |button, index|
-      button_index_map[index + offset] = button
-    }
-    # the button titles, mapped to how UIActionSheet orders them.  These are passed to the success handler.
-    delegate.button_index_map = button_index_map
-
+    # cancelButtonTitle:destructiveButtonTitle:otherButtonTitles:
     args.concat(buttons.map{ |s| s ? s.localized : nil })
     args << nil  # otherButtonTitles:..., nil
 
+    # the button titles, mapped to how UIActionSheet orders them.  These are
+    # passed to the success handler.
+    buttons_mapped = {}
+    if args[2] && args[3]  # cancel && destructive buttons
+      buttons_mapped[0] = buttons[1]                   # destructiveIndex == 0, button == 1
+      buttons_mapped[buttons.length - 1] = buttons[0]  # cancelIndex == last, button == 0
+      # from first+1 to last-1
+      buttons[2..-1].each_with_index do |button,index|
+        buttons_mapped[index + 1] = button
+      end
+    elsif args[3]  # destructive button
+      buttons_mapped[0] = buttons[1]                   # destructiveIndex == 0, button == 1
+      # from first+1 to last-1
+      buttons[2..-1].each_with_index do |button,index|
+        buttons_mapped[index + 1] = button
+      end
+    elsif args[2]  # cancel button
+      buttons_mapped[buttons.length - 2] = buttons[0]  # cancelIndex == last, button == 0
+      buttons[2..-1].each_with_index do |button,index|
+        buttons_mapped[index] = button
+      end
+    else
+      buttons[2..-1].each_with_index do |button,index|
+        buttons_mapped[index] = button
+      end
+    end
+    delegate.buttons = buttons_mapped
+
     alert = self.alloc
     alert.send('initWithTitle:delegate:cancelButtonTitle:destructiveButtonTitle:otherButtonTitles:', *args)
-    window = UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
-    alert.showInView(window)
+    if options.key?(:style)
+      style = options[:style]
+      style = style.uiactionstyle unless style.is_a?(Fixnum)
+      alert.actionSheetStyle = style
+    end
+    if options.fetch(:show, true)
+      if options.key?(:from)
+        from = options[:from]
+      else
+        from = UIApplication.sharedApplication.windows[0]
+      end
+
+      case from
+      when CGRect
+        view = UIApplication.sharedApplication.windows[0]
+        alert.showInRect(from, inView: view, animated: true)
+      when UIBarButtonItem
+        alert.showFromBarButtonItem(from)
+      when UIToolbar
+        alert.showFromToolbar(from)
+      when UITabBar
+        alert.showFromTabBar(from)
+      when UIView
+        alert.showInView(from)
+      else
+        raise "Unknown :from option #{from.inspect}"
+      end
+    end
     alert
   end
 
+  def <<(title)
+    addButtonWithTitle(title)
+  end
+
   private
   def dummy
     self.initWithTitle(nil, delegate:nil, cancelButtonTitle:nil, destructiveButtonTitle:nil, otherButtonTitles:nil)
@@ -89,22 +123,28 @@ end
 
 module SugarCube
   class ActionSheetDelegate
-    attr_accessor :button_index_map
+    attr_accessor :buttons
+    attr_accessor :on_default
     attr_accessor :on_cancel
     attr_accessor :on_destructive
     attr_accessor :on_success
 
     def actionSheet(alert, didDismissWithButtonIndex:index)
+      handler = nil
       if index == alert.destructiveButtonIndex && on_destructive
-        on_destructive.call
+        handler = on_destructive || on_default
       elsif index == alert.cancelButtonIndex && on_cancel
-        on_cancel.call
-      elsif on_success
-        if on_success.arity == 0
-          on_success.call
+        handler = on_cancel || on_default
+      else
+        handler = on_success || on_default
+      end
+
+      if handler
+        if handler.arity == 0
+          handler.call
         else
-          button = button_index_map[index]
-          on_success.call(button)
+          button = buttons[index]
+          handler.call(button)
         end
       end
 

data/lib/sugarcube/uialertview.rb

@@ -8,9 +8,12 @@ class UIAlertView
   #   cancel: proc{ puts "nevermind" },
   #   success: proc{ |pressed| puts "pressed: #{pressed}" },
   #   )
-  def self.alert(title, options={}, &block)
+  #
+  # If you choose
+  def self.alert(title, options={}, more_options={}, &block)
     if options.is_a? String
-      options = {message: options}
+      more_options[:message] = options
+      options = more_options
     end
 
     # create the delegate
@@ -33,7 +36,7 @@ class UIAlertView
 
       # otherButtonTitles:
       if buttons.empty?
-        buttons << nil  # cancel button => nil
+        args << nil  # cancel button => nil
         buttons << "OK"  # other buttons => "OK"
       elsif options[:success]
         buttons << "OK"
@@ -51,10 +54,21 @@ class UIAlertView
 
     alert = self.alloc
     alert.send(:"initWithTitle:message:delegate:cancelButtonTitle:otherButtonTitles:", *args)
-    alert.show
+    if options.key?(:style)
+      style = options[:style]
+      style = style.uialertstyle unless style.is_a?(Fixnum)
+      alert.alertViewStyle = style
+    end
+    if options.fetch(:show, true)
+      alert.show
+    end
     alert
   end
 
+  def <<(title)
+    addButtonWithTitle(title)
+  end
+
   private
   def dummy
     self.initWithTitle(nil, message:nil, delegate:nil, cancelButtonTitle:nil, otherButtonTitles:nil)
@@ -82,12 +96,20 @@ module SugarCube
       end
 
       if handler
-        if handler.arity == 0
-          handler.call
-        else
-          button = buttons[index]
-          handler.call(button)
+        # construct all the possible arguments you could send
+        args = [buttons[index]]
+        # add the first input if this is not the default
+        if alert.alertViewStyle != :default.uialertstyle
+          args << alert.textFieldAtIndex(0).text
+        end
+        # add the second one if this is a login+password input
+        if alert.alertViewStyle == :login_and_password_input.uialertstyle
+          args << alert.textFieldAtIndex(1).text
         end
+
+        # but only send the ones they asked for
+        args = args[0...handler.arity]
+        handler.call(*args)
       end
 
       self.send(:autorelease)

data/lib/sugarcube/uiview.rb

@@ -240,6 +240,32 @@ class UIView
     self
   end
 
+  def resize_to(size, options={}, &after)
+    if options.is_a? Numeric
+      options = { duration: options }
+    end
+
+    options[:after] = after
+
+    animate(options) {
+      f = self.frame
+      f.size = SugarCube::CoreGraphics::Size(size)
+      self.frame = f
+    }
+  end
+
+  def reframe_to(frame, options={}, &after)
+    if options.is_a? Numeric
+      options = { duration: options }
+    end
+
+    options[:after] = after
+
+    animate(options) {
+      self.frame = frame
+    }
+  end
+
   # Changes the current rotation to `new_angle`
   # (`rotate` rotates relative to the current rotation)
   def rotate_to(options={}, more_options={}, &after)
@@ -368,7 +394,7 @@ class UIView
     end
 
     self.animate(options) {
-      window = UIApplication.sharedApplication.keyWindow || UIApplication.sharedApplication.windows[0]
+      window = UIApplication.sharedApplication.windows[0]
       top = self.convertPoint([0, 0], toView:nil).y
       height = window.frame.size.height - top
       offset = CGPoint.new(0, height * 1.5)

data/lib/sugarcube/version.rb

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

data/spec/nsstring_timezone_spec.rb

@@ -0,0 +1,23 @@
+describe "NSString to NSTimeZone" do
+
+  it "should parse timezone as UTC" do
+    "UTC".nstimezone.secondsFromGMT.should == 0
+  end
+  
+  it "should parse timezone as Asia/Tokyo" do
+    "Asia/Tokyo".nstimezone.secondsFromGMT.should == 9 * 60 * 60
+  end
+  
+  it "should parse timezone as Asia/Tokyo" do
+    "UTC+9".nstimezone.secondsFromGMT.should == 9 * 60 * 60
+  end
+  
+  it "should parse timezone as Asia/Tokyo" do
+    "GMT+9".nstimezone.secondsFromGMT.should == 9 * 60 * 60
+  end
+  
+  it "should parse timezone as Asia/Tokyo" do
+    "+0900".nstimezone.secondsFromGMT.should == 9 * 60 * 60
+  end
+  
+end

data/spec/uiactionsheet_spec.rb

@@ -0,0 +1,253 @@
+describe 'UIActionSheet' do
+  tests UIViewController  # this is just needed so that a window is available
+
+  before do
+    @touched = nil
+  end
+
+  it 'should have :show option (show: false)' do
+    alert = UIActionSheet.alert('test', show: false)
+    proper_wait 0.6
+    alert.visible?.should == false
+  end
+
+  it 'should have :show option (show: true)' do
+    alert = UIActionSheet.alert('test', show: true)
+    proper_wait 0.6
+    alert.visible?.should == true
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+  end
+
+  it 'should show by default' do
+    alert = UIActionSheet.alert('test')
+    proper_wait 0.6
+    alert.visible?.should == true
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+  end
+
+  it 'should assign the title' do
+    alert = UIActionSheet.alert('test title', show: false)
+    alert.title.should == 'test title'
+  end
+
+  it 'should have << method' do
+    alert = UIActionSheet.alert('test', show: false)
+    -> {
+      alert << 'title'
+    }.should.not.raise
+  end
+
+  it 'should have :style option' do
+    Symbol.action_sheet_styles.each do |style, value|
+      # as symbol
+      alert = UIActionSheet.alert('test', show: false, style: style)
+      alert.actionSheetStyle.should == value
+
+      # as constant
+      alert = UIActionSheet.alert('test', show: false, style: value)
+      alert.actionSheetStyle.should == value
+    end
+  end
+
+  it 'should add a button with << method' do
+    alert = UIActionSheet.alert('test', show: false)
+    alert << 'title'
+    alert.buttonTitleAtIndex(alert.firstOtherButtonIndex + 1).should == 'title'
+  end
+
+  it 'should show "OK" by default' do
+    alert = UIActionSheet.alert('test', show: false)
+    alert.cancelButtonIndex.should == -1
+    alert.destructiveButtonIndex.should == -1
+    alert.firstOtherButtonIndex.should == 0
+    alert.buttonTitleAtIndex(alert.firstOtherButtonIndex).should == 'OK'
+  end
+
+  it 'should call block when pressed' do
+    alert = UIActionSheet.alert('test') { @touched = true }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+    @touched.should == true
+  end
+
+  it 'should call block with "OK" pressed' do
+    alert = UIActionSheet.alert('test') { |button| @touched = button }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+    @touched.should == 'OK'
+  end
+
+  describe 'with all :buttons defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive', 'ok']) { |button| @touched = button }
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 2
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == 'cancel'
+    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'
+    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'
+    end
+
+  end
+
+  describe 'with cancel and destructive :buttons defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', 'destructive']) { |button| @touched = button }
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == 'cancel'
+    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'
+    end
+
+    it 'should not have other buttons' do
+      @alert.firstOtherButtonIndex.should == -1
+    end
+
+  end
+
+  describe 'with cancel and other :buttons defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test', buttons: ['cancel', nil, 'ok']) { |button| @touched = button }
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == 'cancel'
+    end
+
+    it 'should not have destructive button' do
+      @alert.destructiveButtonIndex.should == -1
+    end
+
+    it 'should call block with "ok" when other button is pressed' do
+      @alert.firstOtherButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == 'ok'
+    end
+
+  end
+
+  describe 'with destructive and other :buttons defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test', buttons: [nil, 'destructive', 'ok']) { |button| @touched = button }
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == -1
+    end
+
+    it 'should not have destructive button' do
+      @alert.destructiveButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
+      @touched.should == 'destructive'
+    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'
+    end
+
+  end
+
+  describe 'with other :buttons defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test', buttons: [nil, nil, 'test1', 'test2']) { |button| @touched = button }
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == -1
+    end
+
+    it 'should not have destructive button' do
+      @alert.destructiveButtonIndex.should == -1
+    end
+
+    it 'should call block with "test1" when first button is pressed' do
+      @alert.firstOtherButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == 'test1'
+    end
+
+    it 'should call block with "test2" when second button is pressed' do
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
+      @touched.should == 'test2'
+    end
+
+  end
+
+  describe 'with all handlers defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test',
+        buttons: ['cancel', 'destructive', 'test1', 'test2'],
+        cancel: ->{ @touched = :cancel },
+        destructive: ->{ @touched = :destructive },
+        success: ->(button){ @touched = button },
+        )
+      proper_wait 0.6
+    end
+
+    it 'should call block with "cancel" when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 3
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == :cancel
+    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
+    end
+
+    it 'should call block with "test1" when first button is pressed' do
+      @alert.firstOtherButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == 'test1'
+    end
+
+    it 'should call block with "test2" when second button is pressed' do
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
+      @touched.should == 'test2'
+    end
+
+  end
+
+end

data/spec/uialertview_spec.rb

@@ -0,0 +1,187 @@
+describe 'UIAlertView' do
+  tests UIViewController  # this is just needed so that a window is available
+
+  it 'should have :show option (show: false)' do
+    alert = UIAlertView.alert('test', show: false)
+    proper_wait 0.6
+    alert.visible?.should == false
+  end
+
+  it 'should have :show option (show: true)' do
+    alert = UIAlertView.alert('test', show: true)
+    proper_wait 0.6
+    alert.visible?.should == true
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+  end
+
+  it 'should show by default' do
+    alert = UIAlertView.alert('test')
+    proper_wait 0.6
+    alert.visible?.should == true
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+  end
+
+  it 'should assign the title' do
+    alert = UIAlertView.alert('test title', show: false)
+    alert.title.should == 'test title'
+  end
+
+  it 'should support three args' do
+    alert = UIAlertView.alert('test title', 'test message', show: false)
+    alert.visible?.should == false
+  end
+
+  describe 'should assign the message' do
+
+    it 'should use the second arg' do
+      alert = UIAlertView.alert('test title', 'test message', show: false)
+      alert.message.should == 'test message'
+    end
+
+    it 'should use the :message option' do
+      alert = UIAlertView.alert('test title', message: 'test message', show: false)
+      alert.message.should == 'test message'
+    end
+
+  end
+
+  it 'should have << method' do
+    alert = UIAlertView.alert('test', show: false)
+    -> {
+      alert << 'title'
+    }.should.not.raise
+  end
+
+  it 'should add a button with << method' do
+    alert = UIAlertView.alert('test', show: false)
+    alert << 'title'
+    alert.buttonTitleAtIndex(alert.firstOtherButtonIndex + 1).should == 'title'
+  end
+
+  it 'should display "OK" when no buttons are specified' do
+    alert = UIAlertView.alert('test', show: false)
+    alert.cancelButtonIndex.should == -1
+    alert.buttonTitleAtIndex(alert.firstOtherButtonIndex).should == 'OK'
+  end
+
+  it 'should use a cancel button if any buttons are specified' do
+    alert = UIAlertView.alert('test', buttons: ['a', 'b'], show: false)
+    alert.buttonTitleAtIndex(alert.cancelButtonIndex).should == 'a'
+    alert.buttonTitleAtIndex(alert.firstOtherButtonIndex).should == 'b'
+  end
+
+  it 'should have :style option' do
+    Symbol.alert_view_styles.each do |style, value|
+      # as symbol
+      alert = UIAlertView.alert('test', show: false, style: style)
+      alert.alertViewStyle.should == value
+
+      # as constant
+      alert = UIAlertView.alert('test', show: false, style: value)
+      alert.alertViewStyle.should == value
+    end
+  end
+
+  it 'should call the block when dismissed' do
+    alert = UIAlertView.alert('test') { @touched = true }
+    alert.numberOfButtons.should == 1
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+
+    @touched.should == true
+  end
+
+  it 'should call the block and pass the button when dismissed' do
+    alert = UIAlertView.alert('test') { |button| @touched = button }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+
+    @touched.should == 'OK'
+  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
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+    @touched.should == true
+  end
+
+  it 'should call the block and pass the button when dismissed with multiple buttons' do
+    alert = UIAlertView.alert('test', buttons: ['cancel', 'ok']) { |button| @touched = button }
+    proper_wait 0.6
+    alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+    @touched.should == 'cancel'
+  end
+
+  describe 'Should call the appropriate block when :cancel and :success handlers are used' do
+
+    before do
+      @touched = nil
+      @alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'],
+        cancel: ->{ @touched = :cancel },
+        success: ->{ @touched = :success }
+        )
+    end
+
+    it 'should work for :cancel' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+
+      @touched.should == :cancel
+    end
+
+    it 'should work for :success' do
+      proper_wait 0.6
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+
+      @touched.should == :success
+    end
+
+  end
+
+  describe 'should call the block and pass the button and inputs' do
+
+    before do
+      @text = nil
+    end
+
+    it 'should work with :secure_text_input' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :secure_text_input) { |button, text|
+        @text = text
+      }
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+      @text.should == 'test text'
+    end
+
+    it 'should work with :plain_text_input' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :plain_text_input) { |button, text|
+        @text = text
+      }
+      proper_wait 0.6
+      alert.textFieldAtIndex(0).text = 'test text'
+      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+
+      @text.should == 'test text'
+    end
+
+    it 'should work with :login_and_password_input' do
+      alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :login_and_password_input) { |button, text1, text2|
+        @text = "#{text1} + #{text2}"
+      }
+      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'
+    end
+
+  end
+
+end

data/spec/uiview_animation_spec.rb

@@ -7,7 +7,15 @@ describe "UIView animation methods" do
     @view.delta_to([1,2]).frame.should == CGRectMake(2,4,3,4)
   end
 
-  it 'should delta_to x:1 y:2' do
+  it 'should resize_to w:5 h:6' do
+    @view.resize_to([5,6]).frame.should == CGRectMake(1,2,5,6)
+  end
+
+  it 'should reframe_to ' do
+    @view.reframe_to([[2,4],[5,6]]).frame.should == CGRectMake(2,4,5,6)
+  end
+
+  it 'should move_to x:2 y:4' do
     @view.move_to([2,4]).frame.should == CGRectMake(2,4,3,4)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.13
+  version: 0.20.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -155,11 +155,14 @@ files:
 - spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb
+- spec/nsstring_timezone_spec.rb
 - spec/nsurl_spec.rb
 - spec/numeric_spec.rb
 - spec/symbol_spec.rb
 - spec/symbol_uicolor_spec.rb
 - spec/timer_spec.rb
+- spec/uiactionsheet_spec.rb
+- spec/uialertview_spec.rb
 - spec/uibarbuttonitem_spec.rb
 - spec/uicolor_components_spec.rb
 - spec/uicolor_other_representations_spec.rb
@@ -221,11 +224,14 @@ test_files:
 - spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb
+- spec/nsstring_timezone_spec.rb
 - spec/nsurl_spec.rb
 - spec/numeric_spec.rb
 - spec/symbol_spec.rb
 - spec/symbol_uicolor_spec.rb
 - spec/timer_spec.rb
+- spec/uiactionsheet_spec.rb
+- spec/uialertview_spec.rb
 - spec/uibarbuttonitem_spec.rb
 - spec/uicolor_components_spec.rb
 - spec/uicolor_other_representations_spec.rb