AXElements 7.0.0.pre2 → 7.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd138bd1918015d501ac413ebccac2cf9e1b0488
-  data.tar.gz: 01ac16fafa2aa7326c19509e6dbeea9705d009c9
+  metadata.gz: 5dbc6cd5044cfd1d0d997fa1af18f723d298480b
+  data.tar.gz: 300b119742fa97600c3b2c79445e208f0321eba7
 SHA512:
-  metadata.gz: db4c58ece919a38c609be6913a63b037af8279ccb93a7eb515e1ded2062ea1a23ee9aac7f4ccc6c802e07e95fa9cb62af894edf27408a82f764e2acf46b4fe6a
-  data.tar.gz: b7a0bbfa490e132fce6eecc08e48f788ce561093560d5865b17e99f5d2a62cfa6a31731f6fe2ff10b0b9e3bfc84ac28ad2ea9d425f89ecf619e819b5a1adedaf
+  metadata.gz: b0773965241f98983ff4cd7941257b358e7d332d87e4a650ec9bfe8da716226201ff59ba02b46c365a0abaab4ae2ca694c1f75b3c479292759fbe872afab98ec
+  data.tar.gz: f1c8b184420efdc69da096d01a3c2027abf7ec589cfb5f36764ac343a76abefea8be1e993b1267e26dda5969a422a1b0a4adfe4b0688a3c4da8557f15bc87ceb

data/History.markdown

@@ -2,6 +2,7 @@
 
   * Compatibility with Yosemite (OS X 10.10)
   * Remove MacRuby support
+  * Allow other Array#method\_missing handlers to function (GH-9)
   * Update ActiveSupport dependency and
     - ActiveSupport 4.2.x is now required and all core extensions are loaded
 

data/README.markdown

@@ -172,11 +172,8 @@ you simply need to run the `test` task:
 
 __NOTE__: There may be some tests are dependent on Accessibility
 features that are new in OS X Lion which will cause test failures on
-OS X Snow Leopard. If you have any issues then you should look at the
-output to find hints at what went wrong and/or log a bug. AXElements
-will support Snow Leopard for as long as MacRuby does, but I do not
-have easy access to a Snow Leopard machine to verify that things still
-work.
+OS X Snow Leopard. AXElements requires OS X versions with system Ruby
+at version 2.0.0 or newer.
 
 ### Benchmarks
 

data/lib/accessibility/factory.rb

@@ -100,115 +100,40 @@ class << AX
 end
 
 
-if on_macruby?
+##
+# `AXElements` extensions to the `Accessibility::Element` class
+class Accessibility::Element
 
   ##
-  # Extensions to {Accessibility::Element} for the higher level abstractions
+  # Override the default `#to_ruby` so that proper classes are
+  # chosen for each object.
   #
-  # These extensions only make sense in the context of the high level API
-  # but needs to be applied on the lower level class, so the code has been
-  # placed in its own file.
-  module Accessibility::Element
-
-    ##
-    # @todo Should we handle cases where a subrole has a value of
-    #       'Unknown'? What is the performance impact?
-    #
-    # Wrap the low level wrapper with the appropriate high level wrapper.
-    # This involves determining the proper class in the {AX} namespace,
-    # possibly creating it on demand, and then instantiating the class to
-    # wrap the low level object.
-    #
-    # Some code paths have been unrolled for efficiency. Don't hate player,
-    # hate the game.
-    #
-    # @return [AX::Element]
-    def to_ruby
-      type = AXValueGetType(self)
-      if type.zero?
-        to_element
-      else
-        to_box type
-      end
-    end
-
-
-    private
-
-    ##
-    # @private
-    #
-    # Reference to the singleton instance of the translator.
-    #
-    # @return [Accessibility::Translator]
-    TRANSLATOR = Accessibility::Translator.instance
-
-    def to_box type
-      ptr = Pointer.new ValueWrapper::BOX_TYPES[type]
-      AXValueGetValue(self, type, ptr)
-      ptr.value.to_ruby
-    end
-
-    def to_element
-      if roll = self.role
-        roll = TRANSLATOR.unprefix roll
-        if attributes.include? KAXSubroleAttribute
-          subroll = self.subrole
-          # Some objects claim to have a subrole but return nil
-          if subroll
-            AX.class_for2(TRANSLATOR.unprefix(subroll), roll).new self
-          else
-            AX.class_for(roll).new self
-          end
+  # @return [AX::Element]
+  def to_ruby
+    if roll = self.role
+      roll = TRANSLATOR.unprefix roll
+      if attributes.include? KAXSubroleAttribute
+        subroll = self.subrole
+        # Some objects claim to have a subrole but return nil
+        if subroll
+          AX.class_for2(TRANSLATOR.unprefix(subroll), roll).new self
         else
           AX.class_for(roll).new self
         end
-      else # failsafe in case object dies before we get the role
-        AX::Element.new self
+      else
+        AX.class_for(roll).new self
       end
+    else # failsafe in case object dies before we get the role
+      AX::Element.new self
     end
-
   end
 
-
-else
-
-
   ##
-  # `AXElements` extensions to the `Accessibility::Element` class
-  class Accessibility::Element
-
-    ##
-    # Override the default `#to_ruby` so that proper classes are
-    # chosen for each object.
-    #
-    # @return [AX::Element]
-    def to_ruby
-      if roll = self.role
-        roll = TRANSLATOR.unprefix roll
-        if attributes.include? KAXSubroleAttribute
-          subroll = self.subrole
-          # Some objects claim to have a subrole but return nil
-          if subroll
-            AX.class_for2(TRANSLATOR.unprefix(subroll), roll).new self
-          else
-            AX.class_for(roll).new self
-          end
-        else
-          AX.class_for(roll).new self
-        end
-      else # failsafe in case object dies before we get the role
-        AX::Element.new self
-      end
-    end
-
-    ##
-    # @private
-    #
-    # Reference to the singleton instance of the translator.
-    #
-    # @return [Accessibility::Translator]
-    TRANSLATOR = Accessibility::Translator.instance
-  end
-
+  # @private
+  #
+  # Reference to the singleton instance of the translator.
+  #
+  # @return [Accessibility::Translator]
+  TRANSLATOR = Accessibility::Translator.instance
 end
+

data/lib/accessibility/translator.rb

@@ -10,9 +10,6 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym('AMPM')
 end
 
-framework 'ApplicationServices' if on_macruby?
-
-
 ##
 # Maintain all the rules for transforming Cocoa constants into something
 # a little more Rubyish and taking the Rubyish symbols and translating
@@ -126,7 +123,7 @@ class Accessibility::Translator
   # @param name [#to_s]
   # @return [String]
   def guess_notification name
-    name  = name.to_s.gsub /(?:^|_)(.)/ do $1.upcase! || $1 end
+    name  = name.to_s.gsub(/(?:^|_)(.)/) do $1.upcase! || $1 end
     const = "KAX#{name}Notification"
     Object.const_defined?(const) ? Object.const_get(const) : name
   end

data/lib/accessibility/version.rb

@@ -4,7 +4,7 @@
 # The main AXElements namespace.
 module Accessibility
   # @return [String]
-  VERSION   = '7.0.0.pre2'
+  VERSION   = '7.0.0.pre3'
 
   # @return [String]
   CODE_NAME = case RUBY_ENGINE

data/lib/ax/element.rb

@@ -481,17 +481,11 @@ class AX::Element
     @ref.invalid?
   end
 
-  if on_macruby?
-    ##
-    # Like {#respond_to?}, this is overriden to include attribute methods.
-    # Though, it does include dynamic predicate methods at the moment.
-    def methods include_super = true, include_objc_super = false
-      super.concat(attributes).concat(parameterized_attributes)
-    end
-  else
-    def methods include_super = true
-      super.concat(attributes).concat(parameterized_attributes)
-    end
+  ##
+  # Like {#respond_to?}, this is overriden to include attribute methods.
+  # Though, it does include dynamic predicate methods at the moment.
+  def methods include_super = true
+    super.concat(attributes).concat(parameterized_attributes)
   end
 
   ##

data/lib/ax_elements.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'accessibility/bridge'
 require 'ax_elements/mri'

data/lib/ax_elements/nsarray_compat.rb

@@ -29,11 +29,13 @@ module Accessibility::ArrayCompatibility
   #   outline.rows.text_fields.values # all at once
   #
   def method_missing method, *args
+    super unless first.kind_of?(AX::Element) ||
+      (empty? && method != :to_hash) # hack for GH-9
+
     smethod = TRANSLATOR.singularize(method.to_s.chomp('?'))
     map do |x|
-      if    !x.kind_of?(AX::Element) then super
-      elsif  x.respond_to? method    then x.send method,  *args
-      else                                x.send smethod, *args
+      if  x.respond_to? method    then x.send method,  *args
+      else                             x.send smethod, *args
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: AXElements
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre2
+  version: 7.0.0.pre3
 platform: ruby
 authors:
 - Mark Rada
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: UI Automation for OS X