motion-alert 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b501540738a246105b52baa7b52baf7271be567d
-  data.tar.gz: 1a82b0b367074926040b30ce2e20889109ddeb97
+  metadata.gz: 97f3260713af60d3f73c7a450284d7e66858772f
+  data.tar.gz: 5a1e3d1a3b6f53d0d93bb20f4325cbe0d37f89cf
 SHA512:
-  metadata.gz: 5ed39451a5e97e523fef53636c5587c494a9a6f962c9d2a06dbb98e867af3c5918fdd18b297b0fa9997ac9c8340e1b6f1d807ee2640afd1701daffeb70273cf4
-  data.tar.gz: 8475263610ca21df2e3a04e0a42ca5687c8c9017533a82edd99efc17c153924e9b01e19ba78887e2273d5d011931c4a84399aed98f696915eadc70c8e750e9df
+  metadata.gz: a5e076597768c17a51c4b9c6ac31f9ef9660e50273a6fb254478ada281e90dbc66c089ef7ced475178d66524f7ad574477f396d3ed9bae72594108e9d7561162
+  data.tar.gz: a168079b9e79c86cb35519da6ff17f209cfbc4a2cf49e677b9698355a7dfc52dd8df62801a1de463ed166887f4f784930e0f797c61fed6b10cb0d606d37cc162

data/lib/project/app_delegate.rb

@@ -4,4 +4,8 @@ class AppDelegate
   def alertView(alert_view, clickedButtonAtIndex: index)
     Motion::Alert.instance.selected(index)
   end
+
+  def actionSheet(action_sheet, clickedButtonAtIndex: index)
+    Motion::Alert.instance.selected(index)
+  end
 end

data/lib/project/motion_action.rb

@@ -1,10 +1,11 @@
 module Motion
   class Action
-    attr_accessor :title, :action
+    attr_accessor :title, :action, :style
 
-    def initialize(title, action=nil)
-      self.title = title
-      self.action = action
+    def initialize(options = {})
+      self.title = options.fetch(:title, nil)
+      self.action = options.fetch(:action, nil)
+      self.style = options.fetch(:style, nil) || UIAlertActionStyleDefault
     end
 
     def choose

data/lib/project/motion_alert.rb

@@ -3,6 +3,7 @@ module Motion
     attr_accessor :title
     attr_accessor :message
     attr_accessor :actions
+    attr_accessor :type
 
     def self.instance
       Dispatch.once { @instance ||= alloc.init }
@@ -13,17 +14,13 @@ module Motion
       instance.tap do |i|
         i.title = options.fetch(:title, nil)
         i.message = options.fetch(:message, nil)
+        i.type = options.fetch(:type, :alert)
         i.actions = Option.new
       end
     end
 
-    def add_action(button_title, action_proc)
-      puts "Deprecated: use actions.add will be removed in 0.3.0"
-      actions.add(button_title, &action_proc)
-    end
-
     def show
-      show_as_controller || show_as_alert
+      show_as_controller || show_as_alert || show_as_action_sheet
     end
 
     def selected(index)
@@ -32,49 +29,61 @@ module Motion
 
     private
 
-
     def show_as_controller
       return nil if !can_show_controller?
 
       alert_controller.tap do |alert|
-        self.actions.actions.each do |a|
-          alert_action = UIAlertAction.actionWithTitle(
-            a.title,
-            style: UIAlertActionStyleDefault,
-            handler: ->(arg) { a.action.call }
-          )
-          alert.addAction(alert_action)
-        end
-
+        self.actions.attach_to(alert)
         root_controller.presentViewController(alert, animated: false, completion: nil)
       end
     end
 
     def show_as_alert
-      alert_view.tap do |alert|
-        self.actions.actions.each do |a|
-          alert.addButtonWithTitle(a.title)
-        end
-        alert.show
+      if type == :alert
+        self.actions.attach_to(alert_view).show
       end
     end
 
+    def show_as_action_sheet
+      self.actions.attach_to(action_sheet).showInView(root_controller.view)
+    end
+
     def alert_controller
       UIAlertController.alertControllerWithTitle(
         title,
         message: message,
-        preferredStyle: UIAlertControllerStyleAlert
+        preferredStyle: style
       )
     end
 
+    def style
+      case type
+      when :alert
+        UIAlertControllerStyleAlert
+      when :action_sheet
+        UIAlertControllerStyleActionSheet
+      else
+        UIAlertControllerStyleAlert
+      end
+    end
+
     def alert_view
       UIAlertView.alloc.initWithTitle(
         title,
         message: message,
         delegate: UIApplication.sharedApplication.delegate,
         cancelButtonTitle: nil,
-        otherButtonTitles:
-        nil
+        otherButtonTitles: nil
+      )
+    end
+
+    def action_sheet
+      UIActionSheet.alloc.initWithTitle(
+        title,
+        delegate: UIApplication.sharedApplication.delegate,
+        cancelButtonTitle: nil,
+        destructiveButtonTitle: nil,
+        otherButtonTitles: nil
       )
     end
 

data/lib/project/motion_option.rb

@@ -1,12 +1,14 @@
 module Motion
   class Option
     attr_accessor :actions
+
     def initialize
       self.actions = []
+      self
     end
 
-    def add(text, &block)
-      actions << Action.new(text, block)
+    def add(text, style=nil, &block)
+      actions << Action.new(title: text, style: style, action: block)
     end
 
     def [](index)
@@ -20,5 +22,35 @@ module Motion
     def first
       actions.first
     end
+
+    def each
+      actions.each
+    end
+
+    def attach_to(view)
+      case view
+      when UIAlertView, UIActionSheet
+        actions.each_with_index do |action, index|
+          view.addButtonWithTitle(action.title)
+          case action.style
+          when UIAlertActionStyleCancel
+            view.cancelButtonIndex = index
+          when UIAlertActionStyleDestructive
+            view.destructiveButtonIndex = index
+          end
+        end
+      when UIAlertController
+        actions.each do |a|
+          alert_action = UIAlertAction.actionWithTitle(
+            a.title,
+            style: a.style,
+            handler: ->(arg) { a.action ? a.action.call : nil }
+          )
+          view.addAction(alert_action)
+        end
+      end
+
+      view
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-alert
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - David Larrabee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake