accessibility_core 0.3.3 → 0.3.4

data/History.markdown

@@ -1,7 +1,17 @@
+# 0.3.4 - More adjustments for AXElements
+
+  * Add `NSContainsRect()` for MRI
+  * Add `CGRect#contains?` as equivalent of `NSContainsRect()`
+  * Change `Object#spin` to use `NSRunLoop` instead of `CFRunLoop`
+    (they are not as equivalent as the docs led me to believe)
+  * Change `Object#spin` to take a default argument of 0 seconds
+
+
 # 0.3.3 - The real 0.3.2 release
 
   * Release the real 0.3.2 gem, none of this non-regenerating gem bull
 
+
 # 0.3.2 - Adjustments for AXElements
 
   * Fix `Element#children` raising when AXAPI returns failure error code

data/ext/accessibility/bridge/bridge.c

@@ -5,7 +5,9 @@
 void
 spin(double seconds)
 {
-  CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, false);
+  NSDate* interval = [NSDate dateWithTimeIntervalSinceNow:seconds];
+  [[NSRunLoop currentRunLoop] runUntilDate:interval];
+  [interval release];
 }
 
 
@@ -555,9 +557,13 @@ to_ax(VALUE obj)
 
 static
 VALUE
-rb_spin(VALUE self, VALUE seconds)
+rb_spin(int argc, VALUE* argv, VALUE self)
 {
-  spin(NUM2DBL(seconds));
+  if (argc == 0)
+    spin(0);
+  else
+    spin(NUM2DBL(argv[0]));
+
   return self;
 }
 
@@ -588,6 +594,6 @@ Init_bridge()
   rb_mURI           = rb_const_get(rb_cObject, rb_intern("URI"));
   rb_cURI           = rb_const_get(rb_mURI, rb_intern("Generic"));
 
-  rb_define_method(rb_cObject, "spin", rb_spin, 1); // semi-private method
+  rb_define_method(rb_cObject, "spin", rb_spin, -1); // semi-private method
 #endif
 }

data/lib/accessibility/bridge/common.rb

@@ -26,6 +26,28 @@ class CGRect
   def to_rect
     self
   end
+
+  ##
+  # Whether or not the receiver completely encloses the `inner` rect
+  #
+  # On MacRuby this is equivalent to calling `NSContainsRect()`.
+  #
+  # @param inner [CGRect,#to_rect]
+  # @return [Boolean]
+  def contains? inner
+    ox = origin.x; oy = origin.y; ow = size.width; oh = size.height
+
+    inner = inner.to_rect
+    ix    = inner.origin.x;   iy = inner.origin.y
+    iw    = inner.size.width; ih = inner.size.height
+
+    if iw.zero? || ih.zero?
+      false
+    else
+      (ox <= ix)               && (oy <= iy)               &&
+      ((ox + ow) >= (ix + iw)) && ((oy + oh) >= (iy + ih))
+    end
+  end
 end
 
 ##

data/lib/accessibility/bridge/macruby.rb

@@ -50,6 +50,19 @@ class NSObject
   def to_ruby
     self
   end
+
+  ##
+  # @api semi-private
+  #
+  # Spin the run loop for the given number of seconds
+  #
+  # The script will effectively be paused while the run loop
+  # is "spinning".
+  #
+  # @param seconds [Number]
+  def spin seconds = 0
+    NSRunLoop.currentRunLoop.runUntilDate Time.now + seconds
+  end
 end
 
 ##
@@ -187,20 +200,3 @@ class NSArray
     map do |obj| obj.to_ruby end
   end
 end
-
-##
-# `accessibility-core` extensions to `Object`
-class Object
-
-  ##
-  # Spin the run loop for the given number of seconds
-  #
-  # The script will effectively be paused while the run loop
-  # is "spinning".
-  #
-  # @param seconds [Number]
-  def spin seconds
-    CFRunLoopRunInMode(KCFRunLoopDefaultMode, seconds, false)
-  end
-
-end

data/lib/accessibility/bridge/mri.rb

@@ -127,6 +127,16 @@ class Object
   def to_ruby
     self
   end
+
+  ##
+  # Whether or not the `outer` rect completely encloses the `inner` rect
+  #
+  # @param outer [CGRect,#to_rect]
+  # @param inner [CGRect,#to_rect]
+  # @return [Boolean]
+  def NSContainsRect outer, inner
+    outer.to_rect.contains? inner
+  end
 end
 
 ##
@@ -138,4 +148,6 @@ class Array
   end
 end
 
+
 require 'accessibility/bridge/common'
+require 'accessibility/bridge/bridge.bundle'

data/lib/accessibility/core/macruby.rb

@@ -746,7 +746,7 @@ module Accessibility::Element
     KAXErrorCannotComplete                    => [
       RuntimeError,
       lambda { |*args|
-        NSRunLoop.currentRunLoop.runUntilDate Time.now # spin the run loop once
+        spin # spin the run loop once
         pid = args[0].pid
         app = NSRunningApplication.runningApplicationWithProcessIdentifier pid
         if app

data/lib/accessibility/core/version.rb

@@ -6,6 +6,6 @@ module Accessibility
   # Namespace for `accessibility_core` specific classes
   module Core
     # return [String]
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/test/helper.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH << 'lib'
+
 require 'minitest/autorun'
 require 'minitest/pride'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accessibility_core
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -679855353235967514
+      hash: -3361611520076368904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -679855353235967514
+      hash: -3361611520076368904
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24