ruby_motion_query 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36206f4aa5851fc94846f652c572a70611c553e3
-  data.tar.gz: 3094ad46a32906503f7a131b9721bdd413ffe5d8
+  metadata.gz: 2470da3bf0ecba5d45eaca32dbfa623c1f8b6d69
+  data.tar.gz: bf6cfd75685027a85c41718fc6b2c1b845c3dc24
 SHA512:
-  metadata.gz: a7fd7969a95296f5d3c21c3a556812c71378b03ec657e8059443841b660249f15de0397788727cdd42166ca1e26eeae1db8fbec1d0c6c997575d64703ac0b3c1
-  data.tar.gz: c9e7d776bedfab71771c1df803950dd91edbbae2e3a24b7020967c7fb588b3ff5da932f9ba3138b1ac0910951ee51dad8ec48e11b2b935212b0b1ea79a6c5b6f
+  metadata.gz: 383304052b21e730b67132d4f17e9d5f2829897cc1c06851a5410a27456a7dcdd7c3b96a6f0c83a2581abc6ee5b5aaf8a550737f983a71d6f6fc5fb7585697a9
+  data.tar.gz: fc9e2f23eed27d67fe809525fe6f809dd76bfcf0c314a13bab0e543f7a402aa14adfbcd2d718b3055a24bfd7e2fffee7368524f078f84cb6e186c76976d194cc

data/motion/ruby_motion_query/accessibility.rb

@@ -0,0 +1,20 @@
+module RubyMotionQuery
+  class RMQ
+
+    # @return [Accessibility]
+    def self.accessibility
+      Accessibility
+    end
+
+    # @return [Accessibility]
+    def accessibility
+      Accessibility
+    end
+  end
+
+  class Accessibility
+    def self.voiceover_running?
+      UIAccessibilityIsVoiceOverRunning()
+    end
+  end
+end

data/motion/ruby_motion_query/animations.rb

@@ -44,13 +44,17 @@ module RubyMotionQuery
           nil
         end
 
-        UIView.animateWithDuration(
-          opts[:duration] || 0.3,
-          delay: opts[:delay] || 0.0,
-          options: opts[:options] || UIViewAnimationOptionCurveEaseInOut,
-          animations: animations_lambda,
-          completion: after_lambda
-        )
+        if accessibility.voiceover_running?
+          after_lambda.call(true)
+        else
+          UIView.animateWithDuration(
+            opts[:duration] || 0.3,
+            delay: opts[:delay] || 0.0,
+            options: opts[:options] || UIViewAnimationOptionCurveEaseInOut,
+            animations: animations_lambda,
+            completion: after_lambda
+          )
+        end
       end
 
       self

data/motion/ruby_motion_query/base.rb

@@ -156,9 +156,9 @@ module RubyMotionQuery
     # Which means it only has 1 selected view, and that view
     # is the view you called rmq in. Which is a tad confusing, but if you call *just* rmq inside a
     # view, then only that view will be *selected* and this rmq will be *root*. If you call rmq
-    # inside a controller, only controller.view will be selected and the rma instance will be a root.
+    # inside a controller, only controller.view will be selected and the rmq instance will be a root.
     def root?
-      (selected.length == 1) && (selected.first == @context)
+      (selected.length == 1) && (selected.first == context_or_context_view)
     end
 
     # The context is where rmq was created (not the selectors).

data/motion/ruby_motion_query/event.rb

@@ -9,30 +9,33 @@ module RubyMotionQuery
         return ValidationEvent.new(block)
       elsif @sdk_event_or_recognizer = VIEW_GESTURES[event]
         @gesture = true
-      elsif sender.is_a?(UIControl)
+        @custom_event = false
+      elsif sender.is_a?(UIControl) && (@sdk_event_or_recognizer = CONTROL_EVENTS[event])
         @gesture = false
-        @sdk_event_or_recognizer = CONTROL_EVENTS[event]
+        @custom_event = false
+      else
+        @gesture = false
+        @sdk_event_or_recognizer = nil
+        @custom_event = true
       end
 
-      if @sdk_event_or_recognizer
-        @sender = sender
-        @event = event
-        @block = block
+      @sender = sender
+      @event = event
+      @block = block
 
+      if @sdk_event_or_recognizer
         if @gesture
           @recognizer = @sdk_event_or_recognizer.alloc.initWithTarget(self, action: "handle_gesture_or_event:")
           @sender.addGestureRecognizer(@recognizer)
         else
           @sender.addTarget(self, action: "handle_gesture_or_event:", forControlEvents: @sdk_event_or_recognizer)
         end
-      else
-        raise "[RMQ Error]  Invalid event or gesture or invalid sender (#{event}). Example of use: button.on(:touch) { my_code }"
       end
     end
 
     def handle_gesture_or_event(gesture)
       # Don't fire :long_press events twice.
-      return if @sdk_event_or_recognizer == VIEW_GESTURES[:long_press] && gesture.state == UIGestureRecognizerStateEnded
+      return if gesture.class == VIEW_GESTURES[:long_press] && gesture.state != UIGestureRecognizerStateBegan
 
       # Handle debounce logic
       if @debounce_length
@@ -78,7 +81,6 @@ module RubyMotionQuery
             when :swipe_right then o.direction = UISwipeGestureRecognizerDirectionRight
           end
 
-
           if opts.include?(:init)
             opts[:init].call(@recognizer)
           end
@@ -90,6 +92,14 @@ module RubyMotionQuery
       @gesture
     end
 
+    def sdk_event?
+      !@custom_event && !@gesture
+    end
+
+    def custom_event?
+      @custom_event
+    end
+
     def location
       if gesture?
         @recognizer.locationInView(@sender)

data/motion/ruby_motion_query/events.rb

@@ -106,6 +106,14 @@ module RubyMotionQuery
       self
     end
 
+    def trigger(event)
+      selected.each do |view|
+        events(view)[event].block.call(view.rmq) if events(view)[event]
+      end
+
+      self
+    end
+
     protected
 
     def events(view)
@@ -134,7 +142,9 @@ module RubyMotionQuery
       raise "[RMQ Error]  Event already exists on this object: #{event}. Remove first, using .off" if @event_set[event]
 
       if rmqe = event_instance(view, event, block)
-        view.userInteractionEnabled = true
+        if rmqe.is_a?(RubyMotionQuery::Event) && !rmqe.custom_event?
+          view.userInteractionEnabled = true
+        end
 
         rmqe.set_options(args) if rmqe.respond_to? :set_options
 

data/motion/ruby_motion_query/stylesheet.rb

@@ -262,14 +262,27 @@ module RubyMotionQuery
     def iphone?
       device.iphone?
     end
+
     def ipad?
       device.ipad?
     end
 
+    def three_point_five_inch?
+      device.three_point_five_inch?
+    end
+
     def four_inch?
       device.four_inch?
     end
 
+    def four_point_seven_inch?
+      device.four_point_seven_inch?
+    end
+
+    def five_point_five_inch?
+      device.five_point_five_inch?
+    end
+
     def retina?
       device.retina?
     end

data/motion/ruby_motion_query/traverse.rb

@@ -35,8 +35,13 @@ module RubyMotionQuery
     #
     # @example
     #   rmq.all.log
+    #   rmq(:container).all
     def all
-      self.weak_view_controller.rmq.find
+      if self.root?
+        self.weak_view_controller.rmq.find
+      else
+        self.find
+      end
     end
 
     # @return [RMQ] A new rmq instance reducing selected views to those that match selectors provided

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 
   class RMQ
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -52,6 +52,7 @@ files:
 - bin/rmq
 - lib/ruby_motion_query.rb
 - motion/ext.rb
+- motion/ruby_motion_query/accessibility.rb
 - motion/ruby_motion_query/actions.rb
 - motion/ruby_motion_query/animations.rb
 - motion/ruby_motion_query/app.rb