rautomation 0.7.1 → 0.7.2

data/History.rdoc

@@ -1,3 +1,14 @@
+== 0.7.2 / 2012-03-18
+
+=== Win32 adapter
+
+  * add mouse API with Window#mouse method
+  * add Mouse#move, #position, #click, #press and #release methods
+
+=== AutoIt adapter
+  
+  * support the same mouse API as Win32 adapter
+
 == 0.7.1 / 2012-02-26
 
 === Win32 adapter

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/rautomation/adapter/autoit.rb

@@ -3,3 +3,4 @@ require File.dirname(__FILE__) + "/autoit/locators"
 require File.dirname(__FILE__) + "/autoit/button"
 require File.dirname(__FILE__) + "/autoit/text_field"
 require File.dirname(__FILE__) + "/autoit/window"
+require File.dirname(__FILE__) + "/autoit/mouse"

data/lib/rautomation/adapter/autoit/mouse.rb

@@ -0,0 +1,38 @@
+module RAutomation
+  module Adapter
+    module Autoit
+      class Mouse
+        def initialize(window)
+          @window = window
+          @autoit = window.class.autoit
+        end
+
+        def move(coords={})
+          @last_position = coords = (@last_position || position).merge(coords)
+
+          until position[:x] == coords[:x] && position[:y] == coords[:y]
+            @window.activate
+            @autoit.MouseMove(coords[:x], coords[:y])
+          end
+        end
+
+        def position
+          {:x => @autoit.MouseGetPosX, :y => @autoit.MouseGetPosY}
+        end
+
+        def click(button = "left")
+          @autoit.MouseClick(button)
+        end
+
+        def press(button = "left")
+          @autoit.MouseDown(button)
+        end
+
+        def release(button = "left")
+          @autoit.MouseUp(button)
+        end
+
+      end
+    end
+  end
+end

data/lib/rautomation/adapter/autoit/window.rb

@@ -160,6 +160,11 @@ module RAutomation
           @@autoit.WinKill(locator_hwnd)
         end
 
+        def mouse
+          @container.wait_until_present
+          Mouse.new(self)
+        end
+
         # @see Button#initialize
         # @see RAutomation::Window#button
         def button(locator={})
@@ -180,27 +185,6 @@ module RAutomation
           @@autoit.send(name, *args)
         end
 
-        # AutoIt adapter specific API methods
-        def move_mouse(x_coord, y_coord)
-          @@autoit.MouseMove(x_coord, y_coord)
-        end
-
-        def mouse_position
-          [@@autoit.MouseGetPosX, @@autoit.MouseGetPosY]
-        end
-
-        def click_mouse(button = "left")
-          @@autoit.MouseClick(button)
-        end
-
-        def press_mouse(button = "left")
-          @@autoit.MouseDown(button)
-        end
-
-        def release_mouse(button = "left")
-          @@autoit.MouseUp(button)
-        end
-
         # @private
         def locator_hwnd
           "[HANDLE:#{hwnd.to_i.to_s(16)}]"

data/lib/rautomation/adapter/win_32.rb

@@ -19,3 +19,4 @@ require File.dirname(__FILE__) + "/win_32/select_list"
 require File.dirname(__FILE__) + "/win_32/table"
 require File.dirname(__FILE__) + "/win_32/label"
 require File.dirname(__FILE__) + "/win_32/list_box"
+require File.dirname(__FILE__) + "/win_32/mouse"

data/lib/rautomation/adapter/win_32/constants.rb

@@ -62,6 +62,11 @@ module RAutomation
         LB_SETCURSEL = 0x186
         LB_GETSEL = 0x187
 
+        # SendInput
+        INPUT_MOUSE = 0
+        MOUSEEVENTF_LEFTDOWN = 0x2
+        MOUSEEVENTF_LEFTUP = 0x4
+
       end
     end
   end

data/lib/rautomation/adapter/win_32/functions.rb

@@ -64,6 +64,12 @@ module RAutomation
                         [:long, :uint], :long
         attach_function :get_last_error, :GetLastError,
                         [], :long
+        attach_function :send_input, :SendInput,
+                        [:uint, :pointer, :int], :int
+        attach_function :_get_cursor_pos, :GetCursorPos,
+                        [:pointer], :bool
+        attach_function :set_cursor_pos, :SetCursorPos,
+                        [:int, :int], :int
 
         # kernel32
         attach_function :current_thread_id, :GetCurrentThreadId,
@@ -106,6 +112,13 @@ module RAutomation
             _move_window(hwnd, x, y, width, height, true)
           end
 
+          def get_cursor_pos
+            ptr = FFI::MemoryPointer.new(:long, 2)
+            _get_cursor_pos(ptr)
+            x, y = ptr.read_array_of_long(2)
+            return {:x => x, :y => y}
+          end
+
           def window_rect(hwnd)
             x = FFI::MemoryPointer.new(:long, 4)
             _get_window_rect(hwnd, x)

data/lib/rautomation/adapter/win_32/mouse.rb

@@ -0,0 +1,59 @@
+module RAutomation
+  module Adapter
+    module Win32
+      class Mouse
+        def initialize(window)
+          @window = window
+        end
+
+        def move(coords={})
+          @last_position = coords = (@last_position || position).merge(coords)
+
+          until position[:x] == coords[:x] && position[:y] == coords[:y]
+            @window.activate
+            Functions.set_cursor_pos coords[:x], coords[:y]
+          end
+        end
+
+        def position
+          Functions.get_cursor_pos
+        end
+
+        def click
+          send_input down_event, up_event
+        end
+
+        def press
+          send_input down_event
+        end
+
+        def release
+          send_input up_event
+        end
+
+        private
+
+        def send_input *inputs
+          @window.activate
+          Functions.send_input inputs.size, inputs.join, inputs[0].size
+        end
+
+        def down_event
+          input Constants::MOUSEEVENTF_LEFTDOWN
+        end
+
+        def up_event
+          input Constants::MOUSEEVENTF_LEFTUP
+        end
+
+        def input flag
+          mouse_input = Array.new(7, 0)
+          mouse_input[0] = Constants::INPUT_MOUSE
+          mouse_input[4] = flag
+          mouse_input.pack "L*"
+        end
+
+      end
+    end
+  end
+end

data/lib/rautomation/adapter/win_32/window.rb

@@ -177,6 +177,11 @@ module RAutomation
           Functions.close_window(hwnd)
         end
 
+        def mouse
+          @container.wait_until_present
+          Mouse.new(self)
+        end
+
         # @see Button#initialize
         # @see RAutomation::Window#button
         def button(locator)

data/spec/adapter/autoit/mouse_spec.rb

@@ -0,0 +1,53 @@
+require "spec_helper"
+
+describe "AutoIt::Mouse", :if => SpecHelper.adapter == :autoit do
+
+  it "#click" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+
+    popup = RAutomation::Window.new(:title => "About")
+    popup.should_not be_present
+
+    window.maximize
+    mouse = window.mouse
+    mouse.move :x => 60, :y => 45
+    mouse.click
+
+    RAutomation::WaitHelper.wait_until {popup.present?}
+  end
+
+  it "#position" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+    mouse = window.mouse
+
+    mouse.move :x => 13, :y => 16
+    mouse.position.should == {:x => 13, :y => 16}
+  end
+
+  it "#press/#release" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+    window.maximize
+
+    text_field = window.text_field(:index => 1)
+    text_field.set("start string")
+    text_field.value.should == "start string"
+
+    mouse = window.mouse
+    mouse.move :x => 146, :y => 103
+    mouse.press
+    mouse.move :x => 194
+    mouse.release
+    window.send_keys "^c"
+
+    text_field.set("new string")
+    text_field.value.should == "new string"
+
+    mouse.move :x => 146
+    mouse.press
+    mouse.move :x => 194
+    mouse.release
+    window.send_keys "^v"
+
+    text_field.value.should == "start string"
+  end
+end

data/spec/adapter/autoit/window_spec.rb

@@ -1,60 +1,6 @@
 require "spec_helper"
 
 describe "AutoIt::Window", :if => SpecHelper.adapter == :autoit do
-
-  it "mouse clicking" do
-    window = RAutomation::Window.new(:title => "MainFormWindow")
-
-    popup = RAutomation::Window.new(:title => "About")
-    popup.exist?.should == false
-
-    window.maximize
-    window.move_mouse(60, 45)
-    window.click_mouse
-
-    sleep 0.1
-
-    popup = RAutomation::Window.new(:title => "About")
-    popup.exist?.should == true
-  end
-
-  it "mouse position" do
-    window = RAutomation::Window.new(:title => "MainFormWindow")
-
-    window.move_mouse(1, 1)
-    window.mouse_position.should_not == [100, 100]
-
-    window.move_mouse(100, 100)
-    window.mouse_position.should == [100, 100]
-  end
-
-  it "mouse press/release" do
-    window = RAutomation::Window.new(:title => "MainFormWindow")
-    window.maximize
-
-    text_field = window.text_field(:name => "textField")
-    text_field.set("start string")
-    text_field.value.should == "start string"
-
-    window.move_mouse(146, 103)
-    window.press_mouse
-    window.move_mouse(194, 103)
-    window.release_mouse
-
-    window.send_keys("^c")
-
-    text_field.set("new string")
-    text_field.value.should == "new string"
-
-    window.move_mouse(146, 103)
-    window.press_mouse
-    window.move_mouse(194, 103)
-    window.release_mouse
-    window.send_keys("^v")
-
-    text_field.value.should == "start string"
-  end
-
   it "#method_missing" do
     window = RAutomation::Window.new(:title => "MainFormWindow")
 

data/spec/adapter/win_32/mouse_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe "Win32::Mouse", :if => SpecHelper.adapter == :win_32 do
+
+  it "#click" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+
+    popup = RAutomation::Window.new(:title => "About")
+    popup.should_not be_present
+
+    window.maximize
+    mouse = window.mouse
+    mouse.move :x => 60, :y => 45
+    mouse.click
+
+    RAutomation::WaitHelper.wait_until {popup.present?}
+  end
+
+  it "#position" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+    mouse = window.mouse
+
+    mouse.move :x => 13, :y => 16
+    mouse.position.should == {:x => 13, :y => 16}
+  end
+
+  it "#press/#release" do
+    window = RAutomation::Window.new(:title => "MainFormWindow")
+    window.maximize
+
+    text_field = window.text_field(:index => 1)
+    text_field.set("start string")
+    text_field.value.should == "start string"
+
+    mouse = window.mouse
+    mouse.move :x => 146, :y => 103
+    mouse.press
+    mouse.move :x => 194
+    mouse.release
+    window.send_keys [:control, "c"]
+
+    text_field.set("new string")
+    text_field.value.should == "new string"
+
+    mouse.move :x => 146
+    mouse.press
+    mouse.move :x => 194
+    mouse.release
+    window.send_keys [:control, "v"]
+
+    text_field.value.should == "start string"
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rautomation
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25954488 !ruby/object:Gem::Requirement
+  requirement: &25277112 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *25954488
+  version_requirements: *25277112
 description: ! "RAutomation is a small and easy to use library for helping out to
   automate windows and their controls\nfor automated testing.\n\nRAutomation provides:\n*
   Easy to use and user-friendly API (inspired by Watir http://www.watir.com)\n* Cross-platform
@@ -112,6 +112,7 @@ files:
 - lib/rautomation/adapter/autoit.rb
 - lib/rautomation/adapter/autoit/button.rb
 - lib/rautomation/adapter/autoit/locators.rb
+- lib/rautomation/adapter/autoit/mouse.rb
 - lib/rautomation/adapter/autoit/text_field.rb
 - lib/rautomation/adapter/autoit/window.rb
 - lib/rautomation/adapter/helper.rb
@@ -144,6 +145,7 @@ files:
 - lib/rautomation/adapter/win_32/label.rb
 - lib/rautomation/adapter/win_32/list_box.rb
 - lib/rautomation/adapter/win_32/locators.rb
+- lib/rautomation/adapter/win_32/mouse.rb
 - lib/rautomation/adapter/win_32/radio.rb
 - lib/rautomation/adapter/win_32/select_list.rb
 - lib/rautomation/adapter/win_32/table.rb
@@ -155,6 +157,7 @@ files:
 - lib/rautomation/wait_helper.rb
 - lib/rautomation/window.rb
 - rautomation.gemspec
+- spec/adapter/autoit/mouse_spec.rb
 - spec/adapter/autoit/window_spec.rb
 - spec/adapter/ms_uia/button_spec.rb
 - spec/adapter/ms_uia/checkbox_spec.rb
@@ -172,6 +175,7 @@ files:
 - spec/adapter/win_32/checkbox_spec.rb
 - spec/adapter/win_32/label_spec.rb
 - spec/adapter/win_32/listbox_spec.rb
+- spec/adapter/win_32/mouse_spec.rb
 - spec/adapter/win_32/radio_spec.rb
 - spec/adapter/win_32/select_list_spec.rb
 - spec/adapter/win_32/table_spec.rb
@@ -209,6 +213,7 @@ signing_key:
 specification_version: 3
 summary: Automate windows and their controls through user-friendly API with Ruby
 test_files:
+- spec/adapter/autoit/mouse_spec.rb
 - spec/adapter/autoit/window_spec.rb
 - spec/adapter/ms_uia/button_spec.rb
 - spec/adapter/ms_uia/checkbox_spec.rb
@@ -226,6 +231,7 @@ test_files:
 - spec/adapter/win_32/checkbox_spec.rb
 - spec/adapter/win_32/label_spec.rb
 - spec/adapter/win_32/listbox_spec.rb
+- spec/adapter/win_32/mouse_spec.rb
 - spec/adapter/win_32/radio_spec.rb
 - spec/adapter/win_32/select_list_spec.rb
 - spec/adapter/win_32/table_spec.rb