motion-wiretap 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d28f1e832294f594579798c62718339c9822a31
-  data.tar.gz: aeeec36e2613e003f5d90788ffad2b9a06c4e56c
+  metadata.gz: 89990796420716d29cbbeaa225d9395e41087549
+  data.tar.gz: 834a690549b69160c7f694a674635a807fbe518b
 SHA512:
-  metadata.gz: 19c5b44d1a0b39827bf145baa0664f099ea239e487936a24246609aac88422a56cd2f8809c31043281618153c3fdf78748044a4a6808dc6e22721c004e534ee2
-  data.tar.gz: 6043ff1c69787e815f115d616399d19ad1296dc9fc9b08b3b2a67ce50f0febf8d9fc9795bbb566a577c51a20f4cf8a68cb55a6c6d7fdd67f0829c8aecc4944c2
+  metadata.gz: 90d3189dec24db8443afcefdb62d64e0276f3c51a44961d310f76ea8a0f418810219b70ae6bffe88bff42c5d6b749252bea96ddb5b69d3d0720c69d7ff5ac050
+  data.tar.gz: a44b1ffa4741e95a59cae83d4300572e4c008c292ec7516f4561e700bc01d2a89e2cb96c7b81e170099f1d0e75cef3ecf857b92583d8d54f5b5d925dc8ac7f4b

data/lib/motion-wiretap/ios/wiretap_gestures.rb

@@ -13,11 +13,13 @@ module MotionWiretap
     def tap(target, taps_or_options=nil)
       taps = nil
       fingers = nil
+      delegate = nil
 
       if taps_or_options
         if taps_or_options.is_a? Hash
-          taps = taps_or_options[:taps] || taps
-          fingers = taps_or_options[:fingers] || fingers
+          taps = taps_or_options[:taps]
+          fingers = taps_or_options[:fingers]
+          delegate = taps_or_options[:delegate]
         else
           taps = taps_or_options
         end
@@ -26,18 +28,47 @@ module MotionWiretap
       recognizer = UITapGestureRecognizer.alloc.initWithTarget(target, action: 'handle_gesture:')
       recognizer.numberOfTapsRequired = taps if taps
       recognizer.numberOfTouchesRequired = fingers if fingers
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 
     # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
-    def pinch(target)
+    def pinch(target, scale_or_options=nil)
+      scale = nil
+      delegate = nil
+
+      if scale_or_options
+        if scale_or_options.is_a? Hash
+          scale = scale_or_options[:scale]
+          delegate = scale_or_options[:delegate]
+        else
+          scale = scale_or_options
+        end
+      end
+
       recognizer = UIPinchGestureRecognizer.alloc.initWithTarget(target, action: 'handle_gesture:')
+      recognizer.scale = scale if scale
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 
     # @yield [recognizer] Handles the gesture event, and passes the recognizer instance to the block.
-    def rotate(target)
+    def rotate(target, rotation_or_options=nil)
+      rotation = nil
+      delegate = nil
+
+      if rotation_or_options
+        if rotation_or_options.is_a? Hash
+          rotation = rotation_or_options[:rotation]
+          delegate = rotation_or_options[:delegate]
+        else
+          rotation = rotation_or_options
+        end
+      end
+
       recognizer = UIRotationGestureRecognizer.alloc.initWithTarget(target, action: 'handle_gesture:')
+      recognizer.rotation = rotation if rotation
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 
@@ -50,11 +81,13 @@ module MotionWiretap
     def swipe(target, direction_or_options)
       direction = nil
       fingers = nil
+      delegate = nil
 
       if direction_or_options
         if direction_or_options.is_a? Hash
-          direction = direction_or_options[:direction] || direction
-          fingers = direction_or_options[:fingers] || fingers
+          direction = direction_or_options[:direction]
+          fingers = direction_or_options[:fingers]
+          delegate = direction_or_options[:delegate]
         else
           direction = direction_or_options
         end
@@ -74,6 +107,7 @@ module MotionWiretap
       recognizer = UISwipeGestureRecognizer.alloc.initWithTarget(target, action: 'handle_gesture:')
       recognizer.direction = direction if direction
       recognizer.numberOfTouchesRequired = fingers if fingers
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 
@@ -88,12 +122,14 @@ module MotionWiretap
       fingers = nil
       min_fingers = nil
       max_fingers = nil
+      delegate = nil
 
       if fingers_or_options
         if fingers_or_options.is_a? Hash
-          fingers = fingers_or_options[:fingers] || fingers
-          min_fingers = fingers_or_options[:min_fingers] || min_fingers
-          max_fingers = fingers_or_options[:max_fingers] || max_fingers
+          fingers = fingers_or_options[:fingers]
+          min_fingers = fingers_or_options[:min_fingers]
+          max_fingers = fingers_or_options[:max_fingers]
+          delegate = fingers_or_options[:delegate]
         else
           fingers = fingers_or_options
         end
@@ -106,6 +142,7 @@ module MotionWiretap
       recognizer = UIPanGestureRecognizer.alloc.initWithTarget(target, action: 'handle_gesture:')
       recognizer.maximumNumberOfTouches = min_fingers if min_fingers
       recognizer.minimumNumberOfTouches = max_fingers if max_fingers
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 
@@ -120,12 +157,14 @@ module MotionWiretap
       duration = nil
       taps = nil
       fingers = nil
+      delegate = nil
 
       if duration_or_options
         if duration_or_options.is_a? Hash
-          duration = duration_or_options[:duration] || duration
-          taps = duration_or_options[:taps] || taps
-          fingers = duration_or_options[:fingers] || fingers
+          duration = duration_or_options[:duration]
+          taps = duration_or_options[:taps]
+          fingers = duration_or_options[:fingers]
+          delegate = duration_or_options[:delegate]
         else
           duration = duration_or_options
         end
@@ -135,6 +174,7 @@ module MotionWiretap
       recognizer.minimumPressDuration = duration if duration
       recognizer.numberOfTapsRequired = taps if taps
       recognizer.numberOfTouchesRequired = fingers if fingers
+      recognizer.delegate = delegate if delegate
       return recognizer
     end
 

data/lib/motion-wiretap/ios/wiretap_ios.rb

@@ -32,7 +32,7 @@ module MotionWiretap
         @gesture_recognizers << recognizer
       end
 
-      listen(&block)
+      listen(&block) if block
 
       return self
     end

data/lib/motion-wiretap/version.rb

@@ -1,3 +1,3 @@
 module MotionWiretap
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-wiretap
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Colin T.A. Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies: []
 description: |
   ReactiveCocoa is an amazing system, and RubyMotion could benefit from the