motion-alert 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b3d7db8129c6b046fdd95ffd4c36a73521f141
-  data.tar.gz: 963319f14db7c36da75d2c413e9927cc2679934b
+  metadata.gz: b501540738a246105b52baa7b52baf7271be567d
+  data.tar.gz: 1a82b0b367074926040b30ce2e20889109ddeb97
 SHA512:
-  metadata.gz: 5e7a56b0a7d1d95e0b089f116e5e06e9a5ba3dcd5247cdc5ed4cfe1a1b98a46e3ca937fa5a8bb530332319866cc337bfe1fc4c2f93bb3d96f7a62d850b8953dd
-  data.tar.gz: bb8d90f0964e80037a71b94b24869a0960f0908e34a9c83f62c0ca4be79901e983d40948afa013cb07d15a7eb77fecdb4275f8b700f9bf7678c91c15c7e79566
+  metadata.gz: 5ed39451a5e97e523fef53636c5587c494a9a6f962c9d2a06dbb98e867af3c5918fdd18b297b0fa9997ac9c8340e1b6f1d807ee2640afd1701daffeb70273cf4
+  data.tar.gz: 8475263610ca21df2e3a04e0a42ca5687c8c9017533a82edd99efc17c153924e9b01e19ba78887e2273d5d011931c4a84399aed98f696915eadc70c8e750e9df

data/README.md

@@ -26,9 +26,9 @@ Or install it yourself as:
 ## Usage
 
     def show_alert
-      Motion::Alert.new({title: "Alert!", message:"message"}).tap do |a|
-        a.add_action("OK", Proc.new { puts 'OK!' })
-        a.add_action("Cancel", Proc.new { puts 'Cancel!' })
+      Motion::Alert.new(title: "Alert!", message: "message").tap do |a|
+        a.actions.add("OK", Proc.new { puts 'OK!' })
+        a.actions.add("Cancel")
         a.show
       end
     end

data/lib/project/motion_action.rb

@@ -2,9 +2,15 @@ module Motion
   class Action
     attr_accessor :title, :action
 
-    def initialize(title, action)
+    def initialize(title, action=nil)
       self.title = title
       self.action = action
     end
+
+    def choose
+      if action != nil
+        action.call
+      end
+    end
   end
 end

data/lib/project/motion_alert.rb

@@ -13,52 +13,62 @@ module Motion
       instance.tap do |i|
         i.title = options.fetch(:title, nil)
         i.message = options.fetch(:message, nil)
-        i.actions = []
+        i.actions = Option.new
       end
     end
 
     def add_action(button_title, action_proc)
-      self.actions << Action.new(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
-      if can_show_controller?
-        root_controller.presentViewController(alert_view_controller, animated: false, completion: nil)
-      else
-        alert_view.delegate = UIApplication.sharedApplication.delegate
-        alert_view.show
-      end
+      show_as_controller || show_as_alert
     end
 
     def selected(index)
-      if action = self.actions[index].action
-        action.call
-      end
+      actions[index].choose
     end
 
     private
 
-    def alert_view_controller
-      alert_view_controller =
-        UIAlertController.alertControllerWithTitle(
-          title,
-          message: message,
-          preferredStyle: UIAlertControllerStyleAlert
-      )
-      self.actions.each do |a|
-        alert_action = UIAlertAction.actionWithTitle(
-          a.title,
-          style: UIAlertActionStyleDefault,
-          handler: ->(arg) { a.action.call }
-        )
-        alert_view_controller.addAction(alert_action)
+
+    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
+
+        root_controller.presentViewController(alert, animated: false, completion: nil)
       end
+    end
 
-      alert_view_controller
+    def show_as_alert
+      alert_view.tap do |alert|
+        self.actions.actions.each do |a|
+          alert.addButtonWithTitle(a.title)
+        end
+        alert.show
+      end
+    end
+
+    def alert_controller
+      UIAlertController.alertControllerWithTitle(
+        title,
+        message: message,
+        preferredStyle: UIAlertControllerStyleAlert
+      )
     end
 
     def alert_view
-      alert_view = UIAlertView.alloc.initWithTitle(
+      UIAlertView.alloc.initWithTitle(
         title,
         message: message,
         delegate: UIApplication.sharedApplication.delegate,
@@ -66,11 +76,6 @@ module Motion
         otherButtonTitles:
         nil
       )
-      self.actions.each do |a|
-        alert_view.addButtonWithTitle(a.title)
-      end
-
-      alert_view
     end
 
     def can_show_controller?

data/lib/project/motion_option.rb

@@ -0,0 +1,24 @@
+module Motion
+  class Option
+    attr_accessor :actions
+    def initialize
+      self.actions = []
+    end
+
+    def add(text, &block)
+      actions << Action.new(text, block)
+    end
+
+    def [](index)
+      actions[index]
+    end
+
+    def count
+      actions.count
+    end
+
+    def first
+      actions.first
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-alert
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Larrabee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,6 +50,7 @@ files:
 - lib/project/app_delegate.rb
 - lib/project/motion_action.rb
 - lib/project/motion_alert.rb
+- lib/project/motion_option.rb
 homepage: https://github.com/squidpunch/motion-alert
 licenses:
 - MIT