sugarcube 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea660a3118fd4a7088293e17717ce63bcd5eace
-  data.tar.gz: 125596accb09c632e465ad0c6210ee85f277482f
+  metadata.gz: 4927c830c7506b761237ac68832cd66de069053c
+  data.tar.gz: e8c5a0ce9349cda4d726d8867396a7f58f33b588
 SHA512:
-  metadata.gz: deb47f000d638c607df1cad4f716ba5d409c33aa79e9e431db534bf0a8dcc7bcf2ec16d05065ce4db09614a873a571d9dbbd16ed47f973022abcb6cb77e9f4a8
-  data.tar.gz: 70c071626397a53e0f2f5635c0add025c93731c3b2a815fb460c4b6d6091ec5e32e4cfad890f32369860a6e3859c98cc717f72e16e49923fe2c602fc9e8c21db
+  metadata.gz: a90054a85c93abbc71842479b0cdc19410d23e73500ab5862b20454e8f1e9c737d36286750272167e4f8894ae0bbb4c80ec5ec0b14e350a77403b576e15de4a8
+  data.tar.gz: 883da51ede064c5d663aef73ff023473971ee8ab478183b2f268b8a96bafda318c114ff23fb7b9f8412267a76b7da61678e4f7205c6b281fd224a2c91249b815

data/README.md

@@ -745,6 +745,34 @@ UIActionSheet.alert('Well, how bout it?',
 end
 ```
 
+###### UIAlertController
+
+Starting with iOS 8.0, UIActionSheet and UIAlertView are deprecated and replaced by UIAlertController.
+
+This is very similar to `UIAlertView.alert` and `UIActionSheet.alert` but you have to pass a `UIViewController` as first argument.
+
+Options:
+
+    UIAlertController.alert(controller, options)
+    UIAlertController.alert(controller, title, options)
+    0 => title => String - title of the action sheet
+    :title => Title of the alert sheet
+    :buttons => [] - List of buttons ([cancel, destructive, others...])
+    :style => Symbol | Fixnum - A symbol (uialertcontrollerstyle) or constant (UIAlertControllerStyle*)
+    :show => Boolean - Whether to show the alert controller (default: true)
+    :from => CGRect | UIBarButtonItem | UIView (default: first window)
+             Where to display the alert.  Mostly relevant on iPad.
+    :view => UIView (default: first window)
+             The view to display the alert when used with :from => CGRect
+
+```ruby
+# simple
+UIAlertController.alert(self, 'This is happening, OK?', buttons: ['Cancel', 'Kill it!', 'Uh, what?']
+  ) do |button|
+  # button is 'Cancel', 'Kill it!' or 'Uh, what?'
+end
+```
+
 ###### UIButton
 ```ruby
 UIButton.buttonWithType(:custom.uibuttontype)

data/lib/ios/sugarcube-constants/symbol.rb

@@ -193,6 +193,14 @@ class Symbol
   end
   alias uiactionsheetstyle uiactionstyle
 
+  def uialertcontrollerstyle
+    SugarCube.look_in(self, Symbol.uialertcontrollerstyle)
+  end
+
+  def uialertactionstyle
+    SugarCube.look_in(self, Symbol.uialertactionstyle)
+  end
+
   def uiimagesource
     SugarCube.look_in(self, Symbol.uiimagesource)
   end
@@ -289,6 +297,9 @@ class Symbol
     attr :uialertstyle
     attr :uiactionstyle
 
+    attr :uialertcontrollerstyle
+    attr :uialertactionstyle
+
     attr :uiimagesource
     attr :uiimagecapture
     attr :uiimagecamera
@@ -763,6 +774,22 @@ class Symbol
     login_and_password_input: UIAlertViewStyleLoginAndPasswordInput,
   }
 
+  if defined?(UIAlertControllerStyleAlert)
+    @uialertcontrollerstyle = {
+        alert:        UIAlertControllerStyleAlert,
+        action_sheet: UIAlertControllerStyleActionSheet
+    }
+
+    @uialertactionstyle = {
+        default:     UIAlertActionStyleDefault,
+        cancel:      UIAlertActionStyleCancel,
+        destructive: UIAlertActionStyleDestructive
+    }
+  else
+    @uialertcontrollerstyle = {}
+    @uialertactionstyle = {}
+  end
+
   @uiactionstyle = {
     automatic:         UIActionSheetStyleAutomatic,
     default:           UIActionSheetStyleDefault,

data/lib/ios/sugarcube-factories/uiactionsheet.rb

@@ -56,7 +56,7 @@ class UIActionSheet
     # cancelButtonTitle:destructiveButtonTitle:otherButtonTitles:
     # uses localized buttons in the actual alert
     if buttons.is_a?(NSDictionary)
-      button_titles = buttons.keys
+      button_keys = buttons.keys
       if buttons.key?(:cancel)
         args << (buttons[:cancel] && NSBundle.mainBundle.localizedStringForKey(buttons[:cancel], value: nil, table: nil))
       else
@@ -69,31 +69,31 @@ class UIActionSheet
       end
       args.concat(buttons.select { |k, m| k != :cancel && k != :destructive }.map { |k, m| m && NSBundle.mainBundle.localizedStringForKey(m, value: nil, table: nil) })
     else
-      button_titles = buttons
+      button_keys = buttons
       args.concat(buttons.map { |m| m && NSBundle.mainBundle.localizedStringForKey(m, value: nil, table: nil) })
     end
     args << nil  # otherButtonTitles:..., nil
 
     if args[2] && args[3]  # cancel && destructive buttons
-      buttons_mapped[0] = button_titles[1]                   # destructiveIndex == 0, button == 1
-      buttons_mapped[button_titles.length - 1] = button_titles[0]  # cancelIndex == last, button == 0
+      buttons_mapped[0] = button_keys[1]                   # destructiveIndex == 0, button == 1
+      buttons_mapped[button_keys.length - 1] = button_keys[0]  # cancelIndex == last, button == 0
       # from first+1 to last-1
-      button_titles[2..-1].each_with_index do |button,index|
+      button_keys[2..-1].each_with_index do |button,index|
         buttons_mapped[index + 1] = button
       end
     elsif args[3]  # destructive button
-      buttons_mapped[0] = button_titles[1]                   # destructiveIndex == 0, button == 1
+      buttons_mapped[0] = button_keys[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] = button_titles[0]  # cancelIndex == last, button == 0
-      button_titles[2..-1].each_with_index do |button,index|
+      buttons_mapped[buttons.length - 2] = button_keys[0]  # cancelIndex == last, button == 0
+      button_keys[2..-1].each_with_index do |button,index|
         buttons_mapped[index] = button
       end
     else
-      button_titles[2..-1].each_with_index do |button,index|
+      button_keys[2..-1].each_with_index do |button,index|
         buttons_mapped[index] = button
       end
     end

data/lib/ios/sugarcube-factories/uialertcontroller.rb

@@ -0,0 +1,112 @@
+class UIAlertController
+
+  attr_accessor :sugarcube_handler
+
+  # @example
+  #     UIAlertController.alert(controller, "title",
+  #       message: "help!",
+  #       buttons: %w"Cancel OK No-way"
+  #       ) { |pressed| } # pressed will be Cancel OK No-way
+  def self.alert(controller, title, options={}, more_options={}, &block)
+    if title.is_a?(NSDictionary)
+      options = title
+      title   = options[:title]
+      message = options[:message]
+    elsif options.is_a? String
+      message = options
+      options = more_options
+    else
+      message = options[:message]
+    end
+
+    style = options[:style] || UIAlertControllerStyleAlert
+    style = style.uialertcontrollerstyle if style.respond_to?(:uialertcontrollerstyle)
+
+    alert = self.alertControllerWithTitle(title, message: message, preferredStyle: style)
+
+    buttons = options[:buttons]
+    if buttons.nil?
+      buttons = %w(OK Cancel)
+    end
+
+    if block
+      alert.sugarcube_handler = SugarCube::UIAlertControllerCallbackHelper.new(block)
+    end
+
+    if buttons.is_a?(NSDictionary)
+      button_keys = buttons.keys
+      buttons = buttons.values
+    else
+      button_keys = buttons
+    end
+    buttons.each_with_index do |button, index|
+      key = button_keys[index]
+      case key
+        when :cancel, 'Cancel'
+          action_style = UIAlertActionStyleCancel
+          button = 'Cancel' if button == :cancel
+        when :destructive, 'Destructive'
+          action_style = UIAlertActionStyleDestructive
+          button = 'Destructive' if button == :destructive
+        else
+          action_style = UIAlertActionStyleDefault
+      end
+      label = NSBundle.mainBundle.localizedStringForKey(button, value: nil, table: nil)
+      action = UIAlertAction.actionWithTitle(label,
+                                             style:   action_style,
+                                             handler: proc { |_|
+                                               alert.sugarcube_handler.call(key) unless alert.sugarcube_handler.nil?
+                                             })
+      alert.addAction action
+    end
+
+    if style == UIAlertControllerStyleActionSheet and UIDevice.currentDevice.userInterfaceIdiom == :ipad.uidevice
+      alert.modalPresentationStyle = UIModalPresentationPopover
+      alert.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionAny
+
+      from = options.fetch(:from, UIApplication.sharedApplication.windows[0])
+      case from
+        when CGRect
+          view                                           = options.fetch(:view, UIApplication.sharedApplication.windows[0])
+          alert.popoverPresentationController.sourceView = view
+          alert.popoverPresentationController.sourceRect = from
+        when UIBarButtonItem
+          alert.popoverPresentationController.barButtonItem = from
+        when UIView
+          frame                                          = [[CGRectGetMidX(from.bounds), CGRectGetMidY(from.bounds)], [1.0, 1.0]]
+          alert.popoverPresentationController.sourceView = from
+          alert.popoverPresentationController.sourceRect = frame
+        else
+          raise "Unknown :from option #{from.inspect}"
+      end
+    end
+
+    if options.fetch(:show, true)
+      controller.presentViewController(alert, animated: true, completion: nil)
+    end
+
+    alert
+  end
+
+  def <<(title)
+    action = UIAlertAction.actionWithTitle(title,
+                                           style:   UIAlertActionStyleDefault,
+                                           handler: proc { |_|
+                                             sugarcube_handler.call(title) unless sugarcube_handler.nil?
+                                           })
+    addAction action
+  end
+end
+
+module SugarCube
+  class UIAlertControllerCallbackHelper
+
+    def initialize(callback)
+      @callback = callback.respond_to?('weak!') ? callback.weak! : callback
+    end
+
+    def call(button)
+      @callback.call(button)
+    end
+  end
+end

data/lib/ios/sugarcube-factories/uialertview.rb

@@ -65,7 +65,7 @@ class UIAlertView
 
     # uses localized buttons in the actual alert
     if buttons.is_a?(NSDictionary)
-      button_titles = buttons.keys
+      button_keys = buttons.keys
       if buttons.key?(:cancel)
         args << (buttons[:cancel] && NSBundle.mainBundle.localizedStringForKey(buttons[:cancel], value: nil, table: nil))
       else
@@ -73,10 +73,10 @@ class UIAlertView
       end
       args.concat(buttons.select { |k, m| k != :cancel }.map { |k, m| m && NSBundle.mainBundle.localizedStringForKey(m, value: nil, table: nil) })
     else
-      button_titles = buttons
+      button_keys = buttons
       args.concat(buttons.map { |m| m && NSBundle.mainBundle.localizedStringForKey(m, value: nil, table: nil) })
     end
-    delegate.buttons = button_titles
+    delegate.buttons = button_keys
     args << nil  # otherButtonTitles:..., nil
 
     alert = self.alloc

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.2.0'
+  Version = '2.3.0'
 end

data/spec/ios/symbol_constants_spec.rb

@@ -411,6 +411,17 @@ describe "Symbol - constants" do
       :black_opaque.uiactionstyle.should == UIActionSheetStyleBlackOpaque
     end
 
+    it 'should support `uialertcontrollerstyle`' do
+      :alert.uialertcontrollerstyle.should == UIAlertControllerStyleAlert
+      :action_sheet.uialertcontrollerstyle.should == UIAlertControllerStyleActionSheet
+    end
+
+    it 'should support `uialertactionstyle`' do
+      :default.uialertactionstyle.should == UIAlertActionStyleDefault
+      :cancel.uialertactionstyle.should == UIAlertActionStyleCancel
+      :destructive.uialertactionstyle.should == UIAlertActionStyleDestructive
+    end
+
     it 'should support `uiimagesource`' do
       :camera.uiimagesource.should == UIImagePickerControllerSourceTypeCamera
       :library.uiimagesource.should == UIImagePickerControllerSourceTypePhotoLibrary
@@ -853,6 +864,14 @@ describe "Symbol - constants" do
       should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.uiactionstyle }
     end
 
+    it 'should not find nonexistant `uialertcontrollerstyle`' do
+      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.uialertcontrollerstyle }
+    end
+
+    it 'should not find nonexistant `uialertactionstyle`' do
+      should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.uialertactionstyle }
+    end
+
     it 'should not find nonexistant `uiimagesource`' do
       should.raise(SugarCubeNotFoundException) { :definitely_doesnt_exist_i_am_really_sure_of_it.uiimagesource }
     end

data/spec/ios/uialertcontroller_spec.rb

@@ -0,0 +1,130 @@
+describe UIAlertController do
+  tests UIViewController
+
+  it 'should have :show option (show: false)' do
+    alert = UIAlertController.alert(controller, 'test', show: false)
+    wait 0.6 do
+      alert.presentingViewController.should == nil
+    end
+  end
+
+  it 'should show by default' do
+    alert = UIAlertController.alert(controller, 'test')
+    wait 0.6 do
+      alert.presentingViewController.should == controller
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should assign the title' do
+    alert = UIAlertController.alert(controller, 'test title', show: false)
+    alert.title.should == 'test title'
+    wait 0.001 do
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should assign the title by options' do
+    alert = UIAlertController.alert(controller, title: 'test title', show: false)
+    alert.title.should == 'test title'
+    wait 0.001 do
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should have :style option' do
+    Symbol.uialertcontrollerstyle.each do |style, value|
+      # as symbol
+      alert = UIAlertController.alert(controller, 'test', show: false, style: style)
+      alert.preferredStyle.should == value
+
+      # as constant
+      alert = UIAlertController.alert(controller, 'test', show: false, style: value)
+      alert.preferredStyle.should == value
+    end
+  end
+
+  it 'should have :from option that accepts CGRect' do
+    alert = UIAlertController.alert(controller, 'test', from: CGRect.new([0, 0], [320, 0]))
+    wait 0.6 do
+      alert.presentingViewController.should == controller
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+
+  it 'should have :from option that accepts CGRect and a :view that accepts UIView' do
+    view   = UIView.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    window = UIApplication.sharedApplication.windows[0]
+    window << view
+    alert = UIAlertController.alert(controller, 'test', from: CGRect.new([0, 0], [320, 0]), view: view)
+    wait 0.6 do
+      alert.presentingViewController.should == controller
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should have :from option that accepts UIBarButtonItem' do
+    button        = UIBarButtonItem.done
+    toolbar       = UIToolbar.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    toolbar.items = [button]
+    window        = UIApplication.sharedApplication.windows[0]
+    window << toolbar
+    alert = UIAlertController.alert(controller, 'test', from: button)
+    wait 0.6 do
+      alert.presentingViewController.should == controller
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should have :from option that accepts UIView' do
+    view = UIView.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    window = UIApplication.sharedApplication.windows[0]
+    window << view
+    alert = UIAlertController.alert(controller, 'test', from: view)
+    wait 0.6 do
+      alert.presentingViewController.should == controller
+      controller.dismissViewControllerAnimated(false, completion: nil)
+    end
+  end
+
+  it 'should add a button with << method' do
+    alert = UIAlertController.alert(controller, 'test', show: false)
+    alert << 'title'
+    alert.actions.lastObject.title.should == 'title'
+  end
+
+  it 'should show "OK" by default as first button' do
+    alert = UIAlertController.alert(controller, 'test', show: false)
+    alert.actions[0].title.should == 'OK'
+  end
+
+  it 'should show "Cancel" by default as second button' do
+    alert = UIAlertController.alert(controller, 'test', show: false)
+    alert.actions[1].title.should == 'Cancel'
+  end
+
+  it 'should have :buttons option' do
+    alert = UIAlertController.alert(controller, 'test', :buttons => %w(Hello World From Test), show: false)
+    alert.actions.count.should == 4
+  end
+
+  it 'should support Hash for :buttons option' do
+    alert = UIAlertController.alert(controller, 'test', :buttons => {
+      cancel: 'Nevermind',
+      ok: 'OK',
+      destructive: 'Do eet',
+      other: 'Other',
+      }, show: false)
+    alert.actions.count.should == 4
+    alert.actions[0].title.should == 'Nevermind'
+    alert.actions[0].style.should == UIAlertActionStyleCancel
+    alert.actions[1].title.should == 'OK'
+    alert.actions[1].style.should == UIAlertActionStyleDefault
+    alert.actions[2].title.should == 'Do eet'
+    alert.actions[2].style.should == UIAlertActionStyleDestructive
+    alert.actions[3].title.should == 'Other'
+    alert.actions[3].style.should == UIAlertActionStyleDefault
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -105,6 +105,7 @@ files:
 - lib/ios/sugarcube-factories/nserror.rb
 - lib/ios/sugarcube-factories/uiactionsheet.rb
 - lib/ios/sugarcube-factories/uiactivityindicatorview.rb
+- lib/ios/sugarcube-factories/uialertcontroller.rb
 - lib/ios/sugarcube-factories/uialertview.rb
 - lib/ios/sugarcube-factories/uibarbuttonitem.rb
 - lib/ios/sugarcube-factories/uibutton.rb
@@ -245,6 +246,7 @@ files:
 - spec/ios/symbol_uifont_spec.rb
 - spec/ios/timer_spec.rb
 - spec/ios/uiactionsheet_spec.rb
+- spec/ios/uialertcontroller_spec.rb
 - spec/ios/uialertview_spec.rb
 - spec/ios/uibarbuttonitem_spec.rb
 - spec/ios/uicolor_spec.rb
@@ -333,6 +335,7 @@ test_files:
 - spec/ios/symbol_uifont_spec.rb
 - spec/ios/timer_spec.rb
 - spec/ios/uiactionsheet_spec.rb
+- spec/ios/uialertcontroller_spec.rb
 - spec/ios/uialertview_spec.rb
 - spec/ios/uibarbuttonitem_spec.rb
 - spec/ios/uicolor_spec.rb