AXElements 1.0.0.beta2 → 1.0.0.beta3

data/History.markdown

@@ -22,8 +22,11 @@
   * Ported `core.rb` to C and moved code to [accessibility\_core](https://github.com/AXElements/accessibility_core)
   * Ported `screen_recorder.rb` to C and moved code to [screen\_recorder](https://github.com/AXElements/screen_recorder)
 
+  * Changed `DSL#right_click` to accept a block; block is yielded to between click down and click up events
+
   * Deprecate `AX::DOCK` constant, use `AX::Application.dock` instead
   * 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
 
+  * Fixed fetching parameterized attributes through `Element#method_missing`

data/lib/accessibility/dsl.rb

@@ -303,7 +303,7 @@ module Accessibility::DSL
   # @example
   #
   #   click window.pop_up do
-  #     scroll_menu_to pop_up.menu_item(title: "Expensive Cake")
+  #     scroll_menu_to pop_up.menu.item(title: "Expensive Cake")
   #   end
   #
   # @param element [AX::Element]
@@ -560,15 +560,24 @@ module Accessibility::DSL
   end
 
   ##
-  # Perform a right (aka secondary) click action.
+  # Perform a right (a.k.a. secondary) click action.
   #
   # If an argument is provided then the mouse will move to that point
   # first; the argument must respond to `#to_point`.
   #
+  # If a block is given, it will be yielded to between the click down
+  # and click up event. This behaviour is the same as passing a block
+  # to {DSL#click}.
+  #
+  # @yield Optionally take a block that is executed between click down
+  #        and click up events.
   # @param obj [#to_point]
   def right_click obj = nil, wait = 0.2
     move_mouse_to obj, wait: 0 if obj
-    Mouse.right_click
+    Mouse.right_click_down
+    yield if block_given?
+  ensure
+    Mouse.right_click_up
     sleep wait
   end
   alias_method :secondary_click, :right_click

data/lib/accessibility/version.rb

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

data/lib/ax/element.rb

@@ -339,7 +339,7 @@ class AX::Element
       return attribute(method)
 
     elsif @ref.parameterized_attributes.include? key
-      return paramaterized_attribute(method, args.first)
+      return parameterized_attribute(method, args.first)
 
     elsif @ref.attributes.include? KAXChildrenAttribute
       if (result = search(method, *args, &block)).blank?

data/lib/ax/scroll_area.rb

@@ -22,12 +22,13 @@ class AX::ScrollArea < AX::Element
   def scroll_to element
     return if NSContainsRect(self.bounds, element.bounds)
     Mouse.move_to self.to_point
-    # calculate direction to scroll
+
+    # calculate direction and velocity for scrolling
     direction = element.position.y > self.position.y ? -5 : 5
-    until NSContainsRect(self.bounds, element.bounds)
-      Mouse.scroll direction
-    end
-    sleep 0.1
+
+    Mouse.scroll direction until NSContainsRect(self.bounds, element.bounds)
+
+    spin 0.1
   end
 
 end

data/test/integration/accessibility/test_dsl.rb

@@ -201,6 +201,18 @@ class TestAccessibilityDSL < MiniTest::Unit::TestCase
     app.main_window.set :position, orig_window_position if orig_window_position
   end
 
+  def test_right_click_with_block
+    area = app.main_window.web_area
+
+    got_called = false
+    dsl.right_click area do
+      got_called = true
+    end
+    assert got_called
+  ensure
+    dsl.click area
+  end
+
   def test_triple_click
     dummy_text = 'Lorem ipsum dolor.' * 15
     text_area.set :value, dummy_text

data/test/integration/ax/test_element.rb

@@ -43,6 +43,13 @@ class TestAXElement < MiniTest::Unit::TestCase
     box.set :value, '' if box
   end
 
+  def test_parameterized_attribute_through_method_missing
+    field = app.window.static_text
+    expected = field.parameterized_attribute :string_for_range, 0..2
+    actual   = field.string_for_range 0..2
+    assert_equal expected, actual
+  end
+
   def test_invalid
     refute app.invalid?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: AXElements
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mouse
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: screen_recorder
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.10
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement