AXElements 1.0.0.alpha6 → 1.0.0.alpha7

data/.yardopts

@@ -8,3 +8,6 @@
 --hide-void-return
 lib/**/*.rb
 ext/**/*{.m,.c}
+-
+History.markdown
+

data/History.markdown

@@ -0,0 +1,6 @@
+# 1.0.0 
+
+  * Remove `Accessibility.application_with_bundle_identifier`; use `AX::Application.new` instead
+  * Remove `Accessibility.application_with_name; use `AX::Application.new` instead
+  * Remove `DSL#subtree_for`; use `Element#inspect_subtree` instead
+

data/README.markdown

@@ -127,8 +127,8 @@ as some of the technical the technical underpinnings of AXElements.
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Marketcircle/AXElements)
 
 AXElements has reached a point where the main focus is stability,
-features, and documentation. It will be out of this world, so we're
-code naming the next version "Lunatone".
+documentation, and additional conveniences. It will be out of this
+world, so we're code naming the next version "Lunatone".
 
 ![The Moon](https://github.com/Marketcircle/AXElements/raw/gh-pages/images/next_version.png)
 

data/ext/accessibility/key_coder/extconf.rb

@@ -10,7 +10,7 @@ else
     clang = `which clang`.chomp
     if clang.empty?
       $stdout.puts "Clang not installed. Cannot build C extension"
-      exit 1
+      raise "Clang not installed. Cannot build C extension"
     else
       RbConfig::MAKEFILE_CONFIG["CC"]  = clang
       RbConfig::MAKEFILE_CONFIG["CXX"] = clang

data/lib/accessibility/core.rb

@@ -112,7 +112,7 @@ module Accessibility::Element
     when 0
       ptr.value.to_ruby
     when KAXErrorNoValue, KAXErrorInvalidUIElement
-      name == KAXChildrenAttribute ? [] : nil
+      nil
     else
       handle_error code, name
     end

data/lib/accessibility/dsl.rb

@@ -550,6 +550,7 @@ module Accessibility::DSL
     move_mouse_to obj, wait: 0 if obj
     Mouse.click_down
     yield if block_given?
+  ensure
     Mouse.click_up
     sleep wait
   end
@@ -628,24 +629,6 @@ module Accessibility::DSL
     Accessibility::Highlighter.new obj.bounds, opts
   end
 
-  ##
-  # @deprecated Use {AX::Element#inspect_subtree} instead.
-  #
-  # Get the dump of the subtree of children and descendants for the given
-  # element. Each generation down the tree will be indented another level,
-  # and each element will be inspected.
-  #
-  # @example
-  #
-  #   puts subtree app
-  #
-  # @param element [AX::Element]
-  # @return [String]
-  def subtree element
-    element.inspect_subtree
-  end
-  alias_method :subtree_for, :subtree
-
   ##
   # @note You will need to have GraphViz command line tools installed
   #       in order for this to work.

data/lib/accessibility/{pp_inspector.rb → pretty_printer.rb}

@@ -10,7 +10,7 @@
 #  - `#attribute` returns the value of a given attribute
 #  - `#size_of` returns the size for an attribute
 #
-module Accessibility::PPInspector
+module Accessibility::PrettyPrinter
 
   ##
   # Create an identifier for the receiver by using various attributes

data/lib/accessibility/qualifier.rb

@@ -29,7 +29,7 @@ class Accessibility::Qualifier
     @klass    = TRANSLATOR.classify(klass)
     @criteria = criteria
     @block    = Proc.new if block_given?
-    compile criteria
+    compile!
   end
 
   ##
@@ -63,8 +63,8 @@ class Accessibility::Qualifier
   # {#qualifies?}.
   #
   # @param criteria [Hash]
-  def compile criteria
-    @filters = criteria.map do |key, value|
+  def compile!
+    @filters = @criteria.map do |key, value|
       if value.kind_of? Hash
         [:subsearch, key, value]
       elsif key.kind_of? Array

data/lib/accessibility/translator.rb

@@ -72,7 +72,9 @@ class Accessibility::Translator
   # @param keys [Array<String>]
   # @return [Array<Symbol>]
   def rubyize keys
-    keys.map { |x| @rubyisms[x] }
+    keys = keys.map { |x| @rubyisms[x] }
+    keys.flatten!
+    keys
   end
 
   ##
@@ -133,6 +135,17 @@ class Accessibility::Translator
 
   private
 
+  def preloads
+    {
+     # basic preloads
+     id:                   KAXIdentifierAttribute,
+     placeholder:          KAXPlaceholderValueAttribute,
+     # workarounds for known case where AX uses "Is" for a boolean attribute
+     application_running:  KAXIsApplicationRunningAttribute,
+     application_running?: KAXIsApplicationRunningAttribute
+    }
+  end
+
   # @return [Hash{String=>String}]
   def init_unprefixes
     @unprefixes = Hash.new do |hash, key|
@@ -143,8 +156,9 @@ 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] = [Accessibility::Inflector.underscore(@unprefixes[key]).to_sym]
     end
+    preloads.each_pair do |k,v| @rubyisms[v] << k end
   end
 
   # @return [Hash{Symbol=>String}]
@@ -152,12 +166,7 @@ class Accessibility::Translator
     @cocoaifications = Hash.new do |hash, key|
       hash[key] = "AX#{Accessibility::Inflector.camelize(key.chomp QUESTION_MARK)}"
     end
-    # preload the table
-    @cocoaifications[:id]          = KAXIdentifierAttribute
-    @cocoaifications[:placeholder] = KAXPlaceholderValueAttribute
-    # workaround the one known case where AX uses "Is" for a boolean attribute
-    @cocoaifications[:application_running]  = # let the value all fall through
-    @cocoaifications[:application_running?] = KAXIsApplicationRunningAttribute
+    preloads.each_pair do |k, v| @cocoaifications[k] = v end
   end
 
   # @return [Hash{String=>String}]

data/lib/accessibility/version.rb

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

data/lib/ax/element.rb

@@ -6,7 +6,7 @@ require 'accessibility/translator'
 require 'accessibility/enumerators'
 require 'accessibility/qualifier'
 require 'accessibility/errors'
-require 'accessibility/pp_inspector'
+require 'accessibility/pretty_printer'
 
 
 ##
@@ -19,7 +19,7 @@ require 'accessibility/pp_inspector'
 # This abstract base class provides generic functionality that all
 # accessibility objects require.
 class AX::Element
-  include Accessibility::PPInspector
+  include Accessibility::PrettyPrinter
 
   # @param ref [AXUIElementRef]
   def initialize ref

data/lib/mouse.rb

@@ -224,7 +224,7 @@ module Mouse
   # Executes a mouse movement animation. It can be a simple cursor
   # move or a drag depending on what is passed to `type`.
   def animate type, button, from, to, duration
-    current = current_position
+    current = from
     xstep   = (to.x - current.x) / (FPS * duration)
     ystep   = (to.y - current.y) / (FPS * duration)
     start   = NSDate.date

data/test/sanity/accessibility/{test_pp_inspector.rb → test_pretty_printer.rb}

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-class TestAccessibilityPPInspector < MiniTest::Unit::TestCase
-  include Accessibility::PPInspector
+class TestAccessibilityPrettyPrinter < MiniTest::Unit::TestCase
+  include Accessibility::PrettyPrinter
 
-  # expected API for PPInspector module
+  # expected API for PrettyPrinter module
   attr_reader :attributes
   def attribute attr; @attribute; end
   def size_of   attr; @size_of;   end

data/test/test_core.rb

@@ -63,8 +63,8 @@ class TestAccessibilityElement < MiniTest::Unit::TestCase
 
     assert_nil window.attribute(KAXGrowAreaAttribute), 'KAXErrorNoValue == nil'
 
-    assert_nil   invalid_ref.attribute(KAXRoleAttribute), 'Dead element == nil'
-    assert_empty invalid_ref.attribute(KAXChildrenAttribute)
+    assert_nil invalid_ref.attribute(KAXRoleAttribute), 'Dead element == nil'
+    assert_nil invalid_ref.attribute(KAXChildrenAttribute)
 
     assert_raises(ArgumentError) { app.attribute('MADE_UP_ATTR') }
   end

metadata

@@ -2,14 +2,14 @@
 name: AXElements
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.0.0.alpha6
+  version: 1.0.0.alpha7
 platform: ruby
 authors:
 - Mark Rada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00 Z
+date: 2012-12-05 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,21 +44,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "1.17"
+        version: 0.14.1
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "1.17"
+        version: 0.14.1
 description: 'AXElements is a UI automation DSL built on top of the Mac OS X Accessibility
 
   Framework that allows code to be written in a very natural and declarative
@@ -79,7 +79,7 @@ files:
 - lib/accessibility/factory.rb
 - lib/accessibility/graph.rb
 - lib/accessibility/highlighter.rb
-- lib/accessibility/pp_inspector.rb
+- lib/accessibility/pretty_printer.rb
 - lib/accessibility/qualifier.rb
 - lib/accessibility/screen_recorder.rb
 - lib/accessibility/statistics.rb
@@ -118,6 +118,7 @@ files:
 - rakelib/test.rake
 - Rakefile
 - README.markdown
+- History.markdown
 - .yardopts
 - test/integration/accessibility/test_core.rb
 - test/integration/accessibility/test_dsl.rb
@@ -136,7 +137,7 @@ files:
 - test/sanity/accessibility/test_errors.rb
 - test/sanity/accessibility/test_factory.rb
 - test/sanity/accessibility/test_highlighter.rb
-- test/sanity/accessibility/test_pp_inspector.rb
+- test/sanity/accessibility/test_pretty_printer.rb
 - test/sanity/accessibility/test_qualifier.rb
 - test/sanity/accessibility/test_statistics.rb
 - test/sanity/accessibility/test_string.rb
@@ -196,7 +197,7 @@ test_files:
 - test/sanity/accessibility/test_errors.rb
 - test/sanity/accessibility/test_factory.rb
 - test/sanity/accessibility/test_highlighter.rb
-- test/sanity/accessibility/test_pp_inspector.rb
+- test/sanity/accessibility/test_pretty_printer.rb
 - test/sanity/accessibility/test_qualifier.rb
 - test/sanity/accessibility/test_statistics.rb
 - test/sanity/accessibility/test_string.rb