sugarcube 3.3.7 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3fac9ee41dbe6575a593c28e8ca78d4c4845cb
-  data.tar.gz: 4337469e97bb91230469148a7e43b7c033d5e1bc
+  metadata.gz: 7c825347c6958710f5ee4933a8f1f0505b1c04df
+  data.tar.gz: f92835087ed01e21e55609e2b91deba8a6f7b83f
 SHA512:
-  metadata.gz: b73398655be28dce273a7ac5eafcb45572246feacddba87ba090db204576760a1d31f2969615868dbf78d57be732f878b851da3b0c14088bb094a076ba3dc34f
-  data.tar.gz: e9f30fdbaba910e761e6f146ca9bc3b6a376f0594cb714f496e50e64dc588298776f0f268f7806837d467d2c49f7e154a28af12704c955839c58af31846f0669
+  metadata.gz: a20731556cd87e0a446650fac5e1d60528e7869f8a8d388e4e43610a33ea42f4e95a50af74a0f875d3e9995d40d7d5f6953347dab4770d78150b5cb35917be23
+  data.tar.gz: a1ace56fcca4ac03c2d8d62ce56dc74640cd1120c180946b3f09b90c084847dfae3d6f8d42578d4f1d94a37d803dbc6c9380e3a3e2040c6e946abd1184d4cb6f

data/README.md

@@ -440,6 +440,9 @@ view.on_pan(2)  # minimum and maximum fingers required
 view.on_pan(fingers: 2)
 view.on_pan(min_fingers: 2, max_fingers: 3)
 
+# If present, overrides fingers options and instead handles gestures originating at specified screen edges (UIScreenEdgePanGestureRecognizer)
+view.on_pan(edges: [<list>]) #  Some combination of [:left, :right, :top, :bottom, :all]. 
+
 # `on_press` is a continuous event (it uses UILongPressGestureRecognizer), so
 # you need to check the `gesture`:
 view.on_press do |gesture|

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

@@ -248,6 +248,12 @@ class Symbol
   def uigesturerecognizerstate
     SugarCube.look_in(self, Symbol.uigesturerecognizerstate)
   end
+
+  def uirectedge 
+    SugarCube.look_in(self, Symbol.uirectedge)
+  end
+
+
   alias uigesturestate uigesturerecognizerstate
 
   class << self
@@ -324,6 +330,8 @@ class Symbol
 
     attr :uigesturerecognizerstate
 
+    attr :uirectedge
+
   end
 
   @uidevice = {
@@ -892,4 +900,15 @@ class Symbol
     recognized: UIGestureRecognizerStateRecognized,
   }
 
+
+  @uirectedge = {
+    left: UIRectEdgeLeft,
+    right: UIRectEdgeRight,
+    top: UIRectEdgeTop,
+    bottom: UIRectEdgeBottom,
+    none: UIRectEdgeNone,
+    all: UIRectEdgeAll
+  }
+
+
 end

data/lib/ios/sugarcube-gestures/gestures.rb

@@ -121,14 +121,18 @@ class UIView
   #   @option options [Fixnum] :min_fingers Minimum number of fingers for gesture to be recognized
   #   @option options [Fixnum] :max_fingers Maximum number of fingers for gesture to be recognized
   #   @option options [Fixnum] :fingers If min_fingers or max_fingers is not assigned, this will be the default.
+  #   @option options [Array]  :edges Some combination of [:left, :right, :top, :bottom, :all]. If present, overrides fingers options and instead handles gestures originating at specified screen edges.
   def on_pan(fingers_or_options=nil, &proc)
     fingers = nil
+    edge_options = [:none]
     min_fingers = nil
     max_fingers = nil
+    recognizer = nil
 
     if fingers_or_options
       if fingers_or_options.is_a? Hash
         fingers = fingers_or_options[:fingers] || fingers
+        edge_options = fingers_or_options[:edges] || edge_options
         min_fingers = fingers_or_options[:min_fingers] || min_fingers
         max_fingers = fingers_or_options[:max_fingers] || max_fingers
       else
@@ -136,13 +140,21 @@ class UIView
       end
     end
 
-    # if fingers is assigned, but not min/max, assign it as a default
-    min_fingers ||= fingers
-    max_fingers ||= fingers
-
-    recognizer = UIPanGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture:')
-    recognizer.maximumNumberOfTouches = min_fingers if min_fingers
-    recognizer.minimumNumberOfTouches = max_fingers if max_fingers
+    if edge_options.uniq == [:none] # full view pan, possibly with finger options
+      # if fingers is assigned, but not min/max, assign it as a default
+      min_fingers ||= fingers
+      max_fingers ||= fingers
+      recognizer = UIPanGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture:')
+      recognizer.maximumNumberOfTouches = min_fingers if min_fingers
+      recognizer.minimumNumberOfTouches = max_fingers if max_fingers
+    else #edges option, finger options ignored
+      edges = :none.uirectedge
+      edge_options.each do | edge |
+        edges |= (edge.uirectedge || 0)
+      end
+      recognizer = UIScreenEdgePanGestureRecognizer.alloc.initWithTarget(self, action:'sugarcube_handle_gesture:')
+      recognizer.edges = edges
+    end
     sugarcube_add_gesture(proc, recognizer)
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.3.7'
+  Version = '3.4.0'
 end

data/spec/ios/gestures_spec.rb

@@ -69,7 +69,7 @@ describe 'Gestures' do
       @view.gestureRecognizers.should.include?(gesture)
     end
 
-    it 'should work with options' do
+    it 'should work with fingers options' do
       gesture = @view.on_pan(min_fingers: 2, max_fingers: 2) do |gesture|
       end
       gesture.should.be.kind_of(UIPanGestureRecognizer)
@@ -77,6 +77,25 @@ describe 'Gestures' do
       gesture.minimumNumberOfTouches.should == 2
       @view.gestureRecognizers.should.include?(gesture)
     end
+
+    it 'should work with edges option' do 
+      gesture = @view.on_pan(edges: [:top, :left]) do |gesture|
+      end
+      gesture.should.be.kind_of(UIScreenEdgePanGestureRecognizer)
+      gesture.edges.should == (:left.uirectedge + :top.uirectedge)
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    it 'should ignore :none edges option' do 
+      gesture = @view.on_pan(edges: [:none], min_fingers: 2, max_fingers: 2) do |gesture|
+      end
+      gesture.should.be.kind_of(UIPanGestureRecognizer)
+      gesture.maximumNumberOfTouches.should == 2
+      gesture.minimumNumberOfTouches.should == 2
+      @view.gestureRecognizers.should.include?(gesture)
+    end
+
+    
   end
 
   describe 'on_press' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -312,17 +312,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully