watirsplash 0.2.6 → 0.2.7

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 0.2.7 / 2010-09-27
+
+ * added explicit dependencies for Watir 1.6.5 and RSpec 1.3.0 so upcoming versions wouldn't break things accidentally
+
 === Version 0.2.6 / 2010-09-12
 
  * moved a lot of documentation from the README to the wiki at http://github.com/jarmo/watirsplash/wiki

data/Rakefile

@@ -27,8 +27,8 @@ Execute "watirsplash generate" under your project's directory to generate defaul
 
 #{"*"*25}}
 
-    gem.add_dependency("watir", ">=1.6.5")
-    gem.add_dependency("rspec", ">=1.3.0")
+    gem.add_dependency("watir", "=1.6.5")
+    gem.add_dependency("rspec", "=1.3.0")
     gem.add_dependency("diff-lcs")
     gem.add_dependency("require_all")
     gem.add_dependency("rmagick")

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/watirsplash/auto_it_helper.rb

@@ -9,27 +9,40 @@ module AutoIt
     end
 
     @@autoit = Watir.autoit
-    attr_reader :title
-
-    def initialize(window_title)
-      @title = window_title
+    attr_reader :locator
+
+    def initialize(window_locator)
+      @locator =
+              case window_locator
+                when Regexp
+                  "[REGEXPTITLE:#{window_locator}]"
+                when Fixnum
+                  "[HANDLE:#{window_locator.to_s(16).rjust(8, "0")}]"
+                else
+                  window_locator
+              end
+      @title = window_locator
     end
 
     # makes window active
     # * returns true if activation was successful and false otherwise
     def activate
-      @@autoit.WinWait(@title, "", 1) == 1 &&
-              @@autoit.WinActivate(@title) != 0 &&
-              @@autoit.WinActive(@title) != 0
+      @@autoit.WinWait(@locator, "", 1) == 1 &&
+              @@autoit.WinActivate(@locator) != 0 &&
+              @@autoit.WinActive(@locator) != 0
+    end
+
+    def text
+      @@autoit.WinGetText(@locator)
     end
 
     def exists?
-      @@autoit.WinExists(@title) == 1
+      @@autoit.WinExists(@locator) == 1
     end
 
     def close
-      @@autoit.WinClose(@title)
-      @@autoit.WinKill(@title)
+      @@autoit.WinClose(@locator)
+      @@autoit.WinKill(@locator)
     end
 
     def button(name)
@@ -60,8 +73,8 @@ module AutoIt
       clicked = false
       wait_until do
         @window.activate &&
-                Window.autoit.ControlFocus(@window.title, "", @name) == 1 &&
-                Window.autoit.ControlClick(@window.title, "", @name) == 1 &&
+                Window.autoit.ControlFocus(@window.locator, "", @name) == 1 &&
+                Window.autoit.ControlClick(@window.locator, "", @name) == 1 &&
                 clicked = true # is clicked at least once
 
         clicked && !exists?
@@ -69,7 +82,7 @@ module AutoIt
     end
 
     def exists?
-      not Window.autoit.ControlGetHandle(@window.title, "", @name).empty?
+      not Window.autoit.ControlGetHandle(@window.locator, "", @name).empty?
     end
   end
 
@@ -87,18 +100,22 @@ module AutoIt
     def set(text)
       wait_until do
         @window.activate &&
-                Window.autoit.ControlFocus(@window.title, "", @name) == 1 &&
-                Window.autoit.ControlSetText(@window.title, "", @name, text) == 1 &&
+                Window.autoit.ControlFocus(@window.locator, "", @name) == 1 &&
+                Window.autoit.ControlSetText(@window.locator, "", @name, text) == 1 &&
                 value == text
       end
     end
 
+    def clear
+      set ""
+    end
+
     def value
-      Window.autoit.ControlGetText(@window.title, "", @name)
+      Window.autoit.ControlGetText(@window.locator, "", @name)
     end
 
     def exists?
-      not Window.autoit.ControlGetHandle(@window.title, "", @name).empty?
+      not Window.autoit.ControlGetHandle(@window.locator, "", @name).empty?
     end
   end
 end

data/lib/watirsplash/watir.rb

@@ -140,7 +140,7 @@ module Watir
       raise "#{file_path} has to exist to set!" unless File.exists?(file_path)
       assert_exists
       self.click_no_wait
-      window = AutoIt::Window.new("[REGEXPTITLE:Choose (file|File to Upload)]")
+      window = AutoIt::Window.new(/choose file( to upload)?/i)
       window.text_field("Edit1").set(File.native_path(file_path))
       window.button("&Open").click
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +03:00
+date: 2010-09-27 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -188,7 +188,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.6! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.7! Don't forget to take a look at README and History files!
   
   Execute "watirsplash generate" under your project's directory to generate default project structure.
   
@@ -227,7 +227,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.6
+summary: watirsplash 0.2.7
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb