AXElements 1.0.0.alpha11 → 1.0.0.beta

data/lib/accessibility/translator.rb

@@ -1,18 +1,16 @@
 require 'accessibility/version'
-require 'ax_elements/vendor/inflector'
-
-framework 'ApplicationServices'
-
-unless Object.const_defined? :KAXIdentifierAttribute
-  ##
-  # Added for backwards compatability with Snow Leopard.
-  # This attribute is standard with Lion and newer. AXElements depends
-  # on it being defined.
-  #
-  # @return [String]
-  KAXIdentifierAttribute = 'AXIdentifier'
+require 'active_support/inflector'
+require 'ax_elements/mri'
+
+ActiveSupport::Inflector.inflections do |inflect|
+  # Related to accessibility
+  inflect.acronym('UI')
+  inflect.acronym('RTF')
+  inflect.acronym('URL')
 end
 
+framework 'ApplicationServices' if on_macruby?
+
 
 ##
 # Maintain all the rules for transforming Cocoa constants into something
@@ -142,7 +140,7 @@ class Accessibility::Translator
      placeholder:          KAXPlaceholderValueAttribute,
      # workarounds for known case where AX uses "Is" for a boolean attribute
      application_running:  KAXIsApplicationRunningAttribute,
-     application_running?: KAXIsApplicationRunningAttribute
+     application_running?: KAXIsApplicationRunningAttribute,
     }
   end
 
@@ -156,7 +154,7 @@ class Accessibility::Translator
   # @return [Hash{String=>Symbol}]
   def init_rubyisms
     @rubyisms = Hash.new do |hash, key|
-      hash[key] = [Accessibility::Inflector.underscore(@unprefixes[key]).to_sym]
+      hash[key] = [ActiveSupport::Inflector.underscore(@unprefixes[key]).to_sym]
     end
     preloads.each_pair do |k,v| @rubyisms[v] << k end
   end
@@ -164,7 +162,9 @@ class Accessibility::Translator
   # @return [Hash{Symbol=>String}]
   def init_cocoaifications
     @cocoaifications = Hash.new do |hash, key|
-      hash[key] = "AX#{Accessibility::Inflector.camelize(key.chomp QUESTION_MARK)}"
+      str_key = key.to_s
+      str_key.chomp! QUESTION_MARK
+      hash[key] = "AX#{ActiveSupport::Inflector.camelize(str_key)}"
     end
     preloads.each_pair do |k, v| @cocoaifications[k] = v end
   end
@@ -172,14 +172,14 @@ class Accessibility::Translator
   # @return [Hash{String=>String}]
   def init_classifications
     @classifications = Hash.new do |hash, key|
-      hash[key] = Accessibility::Inflector.classify(key)
+      hash[key] = ActiveSupport::Inflector.classify(key)
     end
   end
 
   # @return [Hash{String=>String}]
   def init_singularizations
     @singularizations = Hash.new do |hash, key|
-      hash[key] = Accessibility::Inflector.singularize(key)
+      hash[key] = ActiveSupport::Inflector.singularize(key)
     end
   end
 

data/lib/accessibility/version.rb

@@ -4,7 +4,7 @@
 # The main AXElements namespace.
 module Accessibility
   # @return [String]
-  VERSION   = '1.0.0.alpha11'
+  VERSION   = '1.0.0.beta'
 
   # @return [String]
   CODE_NAME = 'ルナトーン'

data/lib/ax/application.rb

@@ -19,7 +19,7 @@ class AX::Application < AX::Element
     # @return [Boolean]
     def launch bundle
       NSWorkspace.sharedWorkspace.launchAppWithBundleIdentifier bundle,
-                                                       options: NSWorkspaceLaunchAsync,
+                                                       options: NSWorkspace::NSWorkspaceLaunchAsync,
                                 additionalEventParamDescriptor: nil,
                                               launchIdentifier: nil
     end
@@ -121,7 +121,7 @@ class AX::Application < AX::Element
           app.first
 
          ) || (
-           spin_run_loop
+           spin
            NSWorkspace.sharedWorkspace.runningApplications.find { |app|
              app.localizedName == arg
            }
@@ -129,7 +129,7 @@ class AX::Application < AX::Element
          ) || (
            count ||= 0
            if AX::Application.launch arg
-             sleep 1
+             spin 1
              count += 1
              raise "#{arg} failed to launch in time" if count == 10
            else
@@ -172,7 +172,7 @@ class AX::Application < AX::Element
   # to the dynamic `#focused?` method, but might make more sense to use
   # in some cases.
   def active?
-    spin_run_loop
+    spin
     @app.active?
   end
   alias_method :focused,  :active?
@@ -181,14 +181,14 @@ class AX::Application < AX::Element
   ##
   # Ask the app whether or not it is hidden.
   def hidden?
-    spin_run_loop
+    spin
     @app.hidden?
   end
 
   ##
   # Ask the app whether or not it is still running.
   def terminated?
-    spin_run_loop
+    spin
     @app.terminated?
   end
 
@@ -292,17 +292,17 @@ class AX::Application < AX::Element
     case name
     when :terminate
       return true if terminated?
-      @app.terminate; sleep 0.2; terminated?
+      @app.terminate; spin 0.25; terminated?
     when :force_terminate
       return true if terminated?
-      @app.forceTerminate; sleep 0.2; terminated?
+      @app.forceTerminate; spin 0.25; terminated?
     when :hide
       return true if hidden?
-      @app.hide; sleep 0.2; hidden?
+      @app.hide; spin 0.25; hidden?
     when :unhide
       return true if active?
-      @app.activateWithOptions(NSApplicationActivateIgnoringOtherApps)
-      sleep 0.2; active?
+      @app.activateWithOptions(NSRunningApplication::NSApplicationActivateIgnoringOtherApps)
+      spin 0.25; active?
     else
       super
     end
@@ -432,11 +432,6 @@ class AX::Application < AX::Element
 
   private
 
-  # @return [nil]
-  def spin_run_loop
-    NSRunLoop.currentRunLoop.runUntilDate Time.now
-  end
-
   # @return [NSBundle]
   def bundle
     @bundle ||= NSBundle.bundleWithURL @app.bundleURL

data/lib/ax/element.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+require 'active_support/core_ext/object/blank'
 require 'accessibility/core'
 require 'accessibility/factory'
 require 'accessibility/translator'
@@ -54,7 +55,7 @@ class AX::Element
   #
   # @param attr [#to_sym]
   def attribute attr
-    @ref.attribute TRANSLATOR.cocoaify(attr)
+    @ref.attribute(TRANSLATOR.cocoaify(attr)).to_ruby
   end
 
   ##
@@ -65,7 +66,7 @@ class AX::Element
   #
   # @return [String]
   def description
-    attribute :description
+    attribute(:description).to_ruby
   end
 
   ##
@@ -73,12 +74,12 @@ class AX::Element
   #
   # @return [Array<AX::Element>]
   def children
-    @ref.children
+    @ref.children.to_ruby
   end
 
   ##
   # Get a list of elements, starting with the receiver and riding
-  # the hierarchy up to the top level object (i.e. the {AX::Application}).
+  # the hierarchy up to the top level object (i.e. the {AX::Application})
   #
   # @example
   #
@@ -87,15 +88,16 @@ class AX::Element
   #     # => [#<AX::ApplicationDockItem...>, #<AX::List...>, #<AX::Application...>]
   #
   # @return [Array<AX::Element>]
-  def ancestry *elements
-    elements = [self] if elements.empty?
+  def ancestry elements = self
+    elements = Array(elements)
     element  = elements.last
     if element.attributes.include? :parent
-      ancestry(elements << element.parent)
+      ancestry(elements << element.attribute(:parent))
     else
       elements
     end
   end
+  alias_method :lineage, :ancestry
 
   ##
   # Get the process identifier for the application that the element
@@ -186,7 +188,7 @@ class AX::Element
   # @param param [Object]
   def parameterized_attribute attr, param
     param = param.relative_to(@ref.value.size) if value.kind_of? Range
-    @ref.parameterized_attribute TRANSLATOR.cocoaify(attr), param
+    @ref.parameterized_attribute(TRANSLATOR.cocoaify(attr), param).to_ruby
   end
 
 
@@ -456,11 +458,17 @@ class AX::Element
     @ref.invalid?
   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, include_objc_super = false
-    super.concat(attributes).concat(parameterized_attributes)
+  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
   end
 
   ##
@@ -485,24 +493,3 @@ class AX::Element
   TRANSLATOR = Accessibility::Translator.instance
 
 end
-
-
-# Extensions so checking `#blank?` on search result "just works".
-class NSArray
-  # (see NilClass#blank?)
-  alias_method :blank?, :empty?
-end
-
-# Extensions so checking `#blank?` on search result "just works".
-class NilClass
-  ##
-  # Whether or not the object is "blank". The concept of blankness
-  # borrowed from `Active Support` and is true if the object is falsey
-  # or `#empty?`.
-  #
-  # This method is used by implicit searching in AXElements to
-  # determine if searches yielded responses.
-  def blank?
-    true
-  end
-end

data/lib/ax/systemwide.rb

@@ -13,7 +13,7 @@ class AX::SystemWide < AX::Element
 
   class << self
     ##
-    # Find and return the group that represents the dock
+    # Find and return the group that represents the desktop
     #
     # @return [AX::Group]
     def desktop
@@ -41,7 +41,7 @@ class AX::SystemWide < AX::Element
   ##
   # Overridden since there is only one way to get the element ref.
   def initialize
-    super AXUIElementCreateSystemWide()
+    super Accessibility::Element.system_wide
   end
 
   ##

data/lib/ax_elements.rb

@@ -1,3 +1,7 @@
+require 'ax_elements/active_support_selections'
+require 'accessibility/bridge'
+require 'ax_elements/mri' unless on_macruby?
+
 # Mix the language methods into the TopLevel
 require 'accessibility/dsl'
 include Accessibility::DSL
@@ -5,10 +9,12 @@ include Accessibility::DSL
 require 'accessibility/system_info'
 
 ##
+# @deprecated Please use {AX::Application.dock} instead
+#
 # The Mac OS X dock application.
 #
 # @return [AX::Application]
-AX::DOCK = AX::Application.new('com.apple.dock')
+AX::DOCK = AX::Application.dock
 
 # Load explicitly defined elements that are optional
 require 'ax/button'

data/lib/ax_elements/active_support_selections.rb

@@ -0,0 +1,10 @@
+# this is just a list of core extensions from Active Support
+# that I would like to have loaded by default
+
+require 'active_support/core_ext/numeric'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date/conversions'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/conversions'

data/lib/ax_elements/mri.rb

@@ -0,0 +1,57 @@
+unless on_macruby?
+
+  KAXChildrenAttribute         = 'AXChildren'
+  KAXRoleAttribute             = 'AXRole'
+  KAXSubroleAttribute          = 'AXSubrole'
+  KAXIdentifierAttribute       = 'AXIdentifier'
+  KAXWindowCreatedNotification = 'AXWindowCreated'
+  KAXMainWindowAttribute       = 'AXMainWindow'
+  KAXFocusedAttribute          = 'AXFocused'
+  KAXValueChangedNotification  = 'AXValueChanged'
+  KAXTitleAttribute            = 'AXTitle'
+  KAXURLAttribute              = 'AXURL'
+  KAXTitleUIElementAttribute   = 'AXTitleUIElement'
+  KAXPlaceholderValueAttribute = 'AXPlaceholderValue'
+  KAXWindowRole                = 'AXWindow'
+  KAXCloseButtonSubrole        = 'AXCloseButton'
+  KAXTrashDockItemSubrole      = 'AXTrashDockItem'
+  KAXRTFForRangeParameterizedAttribute    = 'AXRTFForRange'
+  KAXIsApplicationRunningAttribute        = 'AXIsApplicationRunning'
+  KAXStringForRangeParameterizedAttribute = 'AXStringForRange'
+
+  unless defined? NSString
+    NSString = String
+  end
+
+  unless defined? NSDictionary
+    NSDictionary = Hash
+  end
+
+  unless defined? NSArray
+    NSArray = Array
+  end
+
+  unless defined? NSDate
+    NSDate = Time
+  end
+
+  class Symbol
+
+    def chomp suffix
+      to_s.chomp suffix
+    end
+
+  end
+
+end
+
+unless defined? KAXIdentifierAttribute
+  ##
+  # Added for backwards compatability with Snow Leopard.
+  # This attribute is standard with Lion and newer. AXElements depends
+  # on it being defined.
+  #
+  # @return [String]
+  KAXIdentifierAttribute = 'AXIdentifier'
+end
+

data/lib/ax_elements/nsarray_compat.rb

@@ -1,5 +1,6 @@
 require 'ax/element'
 require 'accessibility/translator'
+require 'active_support/core_ext/array/access'
 
 ##
 # An old hack on arrays that allows you to map a single method across
@@ -11,18 +12,6 @@ require 'accessibility/translator'
 # on this and so I will just keep it around for backwards compatability.
 module Accessibility::NSArrayCompat
 
-  ##
-  # Equivalent to `#at(1)`
-  def second
-    at(1)
-  end
-
-  ##
-  # Equivalent to `#at(2)`
-  def third
-    at(2)
-  end
-
   ##
   # @note Debatably bad idea. Maintained for backwards compatibility.
   #
@@ -40,11 +29,11 @@ module Accessibility::NSArrayCompat
   #   outline.rows.text_fields.values # all at once
   #
   def method_missing method, *args
-    smethod = TRANSLATOR.singularize(method.chomp('?'))
+    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.kind_of?(AX::Element) then super
+      elsif  x.respond_to? method    then x.send method,  *args
+      else                                x.send smethod, *args
       end
     end
   end
@@ -58,8 +47,99 @@ module Accessibility::NSArrayCompat
 
 end
 
+unless defined? NSArray
+  NSArray = Array
+end
 
-# AXElements extensions for `NSArray`.
+##
+# AXElements extensions for `NSArray`
 class NSArray
   include Accessibility::NSArrayCompat
+
+  if on_macruby?
+
+    ##
+    # Returns the tail of the array from `position`
+    #
+    # @example
+    #
+    #   [1, 2, 3, 4].from(0)   # => [1, 2, 3, 4]
+    #   [1, 2, 3, 4].from(2)   # => [3, 4]
+    #   [1, 2, 3, 4].from(10)  # => []
+    #   [].from(0)             # => []
+    #
+    # @param position [Fixnum]
+    # @return [Array]
+    def from position
+      self[position, length] || []
+    end
+
+    ##
+    # Returns the beginning of the array up to `position`
+    #
+    #   [1, 2, 3, 4].to(0)   # => [1]
+    #   [1, 2, 3, 4].to(2)   # => [1, 2, 3]
+    #   [1, 2, 3, 4].to(10)  # => [1, 2, 3, 4]
+    #   [].to(0)             # => []
+    #
+    # @param count [Fixnum]
+    # @return [Array]
+    def to count
+      take count + 1
+    end
+
+    ##
+    # Equal to `self[1]`
+    def second
+      self[1]
+    end
+
+    ##
+    # Equal to `self[2]`
+    def third
+      self[2]
+    end
+
+    ##
+    # Equal to `self[3]`
+    def fourth
+      self[3]
+    end
+
+    ##
+    # Equal to `self[4]`
+    def fifth
+      self[4]
+    end
+
+    ##
+    # Equal to `self[41]`
+    #
+    # Also known as accessing "the reddit".
+    def forty_two
+      self[41]
+    end
+
+  else
+
+    ##
+    # Create a new array with the same contents as the given array
+    #
+    # @param ary [Array]
+    def self.arrayWithArray ary
+      ary.dup
+    end
+
+    ##
+    # Create and return a new empty array
+    #
+    # @return [Array]
+    def self.array
+      []
+    end
+
+  end
+
+  alias_method :the_reddit, :forty_two
+
 end