watirsplash 0.2.0 → 0.2.1

data/History.rdoc

@@ -1,3 +1,10 @@
+=== Version 0.2.1 / 2010-05-27
+
+ * added compatibility with Win32::Screenshot 0.0.4
+ * wait_until behaves exactly the same as with Watir - throws Exception upon timeout
+ * removed wait_until! - use wait_until instead
+ * added wait_until? which returns true if condition was true and doesn't throw Exception upon timeout
+
 === Version 0.2.0 / 2010-05-03
 
  PS! This version has some backwards incompatible changes!

data/Rakefile

@@ -34,7 +34,7 @@ Execute "watirsplash generate" under your project's directory to generate defaul
     gem.add_dependency("rmagick")
     gem.add_dependency("syntax")
     gem.add_dependency("win32console")
-    gem.add_dependency("win32screenshot")
+    gem.add_dependency("win32screenshot", ">=0.0.4")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/watirsplash.rb

@@ -2,8 +2,6 @@ require "rubygems"
 require "require_all"
 require "spec"
 require "watir"
-require "win32screenshot"
-require_rel "watirsplash/win32screenshot"
 require_rel "watirsplash/waiter"
 require_rel "watirsplash/spec_helper"
 require_rel "watirsplash/spec"

data/lib/watirsplash/autoit.rb

@@ -23,7 +23,7 @@ class AutoItHelper
     # activates window automatically and makes sure that the field's
     # value got changed
     def set_field(window_title, field_name, field_value)
-      wait_until! do
+      wait_until do
         activate_window(window_title) &&
                 @@autoit.ControlFocus(window_title, "", field_name) == 1 &&
                 @@autoit.ControlSetText(window_title, "", field_name, field_value) == 1 &&
@@ -35,11 +35,11 @@ class AutoItHelper
     # activates window automatically and makes sure that the click
     # was successful
     def click_button(window_title, button_name)
-      wait_until! do
+      wait_until do
         activate_window(window_title) &&
                 @@autoit.ControlFocus(window_title, "", button_name) == 1 &&
                 @@autoit.ControlClick(window_title, "", button_name) == 1 &&
-                wait_until(3) {@@autoit.WinExists(window_title) == 0}
+                wait_until?(3) {@@autoit.WinExists(window_title) == 0}
       end
     end
 

data/lib/watirsplash/html_formatter.rb

@@ -1,5 +1,5 @@
 require 'spec/runner/formatter/html_formatter'
-require 'win32screenshot'
+require 'win32/screenshot'
 require 'rmagick'
 require 'pathname'
 require 'fileutils'
@@ -71,11 +71,12 @@ module WatirSplash
     def save_screenshot(description="Screenshot", hwnd=@browser.hwnd) # :nodoc:
       begin
         @browser.bring_to_front
-        width, height, blob = Win32::Screenshot.capture_hwnd(hwnd)
-        file_name = file_path("screenshot.png", description)
-        img = Magick::ImageList.new
-        img.from_blob(blob)
-        img.write(file_name)
+        Win32::Screenshot.hwnd(hwnd) do |width, height, blob|
+          file_name = file_path("screenshot.png", description)
+          img = Magick::ImageList.new
+          img.from_blob(blob)
+          img.write(file_name)
+        end
       rescue => e
         $stderr.puts "saving of screenshot failed: #{e.message}"
         $stderr.puts e.backtrace

data/lib/watirsplash/spec_helper.rb

@@ -31,7 +31,7 @@ module WatirSplash
       file_path = native_file_path(file_path(file_name))
       AutoItHelper.set_edit(file_path)
       AutoItHelper.click_save("Save As")
-      wait_until! {File.exists?(file_path)}
+      wait_until {File.exists?(file_path)}
       file_path
     end
 

data/lib/watirsplash/waiter.rb

@@ -1,24 +1,24 @@
 module WatirSplash
   module Waiter
-    # waits until some condition is true and
+    # waits until specified condition is true and
     # throws Watir::Exception::TimeOutException upon timeout
     #
     # examples:
-    #   wait_until! {text_field(:name => 'x').exists?} # waits until text field exists
-    #   wait_until!(5) {...} # waits maximum of 5 seconds condition to be true
-    def wait_until! *arg
+    #   wait_until {text_field(:name => 'x').exists?} # waits until text field exists
+    #   wait_until(5) {...} # waits maximum of 5 seconds for the condition to be true
+    def wait_until *arg
       Watir::Waiter.wait_until(*arg) {yield}
     end
 
-    # waits until some condition is true and
+    # waits until specified condition is true and
     # returns false if timeout occurred, true otherwise
     #
     # examples:
-    #   wait_until {text_field(:name => 'x').exists?} # waits until text field exists
-    #   wait_until(5) {...} # waits maximum of 5 seconds condition to be true
-    def wait_until *arg
+    #   wait_until? {text_field(:name => 'x').exists?} # waits until text field exists
+    #   wait_until?(5) {...} # waits maximum of 5 seconds for the condition to be true
+    def wait_until? *arg
       begin
-        wait_until!(*arg) {yield}
+        wait_until(*arg) {yield}
       rescue Watir::Exception::TimeOutException
         return false
       end

data/spec/spec_helper_spec.rb

@@ -18,18 +18,18 @@ describe WatirSplash::SpecHelper do
   end
 
   it "has wait_until" do
-    result = wait_until {sleep 0.1; true}
+    lambda {wait_until(0.5) {sleep 0.1; true}}.should_not raise_exception
+    lambda {wait_until(0.5) {sleep 0.1; false}}.should raise_exception(Watir::Exception::TimeOutException)
+  end
+
+  it "has wait_until?" do
+    result = wait_until? {sleep 0.1; true}
     result.should be_true
 
-    result = wait_until(0.5) {sleep 0.1; false}
+    result = wait_until?(0.5) {sleep 0.1; false}
     result.should be_false
   end
 
-  it "has wait_until!" do
-    lambda {wait_until!(0.5) {sleep 0.1; true}}.should_not raise_exception
-    lambda {wait_until!(0.5) {sleep 0.1; false}}.should raise_exception(Watir::Exception::TimeOutException)
-  end
-
   it "has file_path methods formatter" do
     file_name = "blah.temp"
     ext = File.extname(file_name)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 +03:00
+date: 2010-05-27 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   type: :runtime
   version_requirements: *id008
 description: WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!
@@ -143,7 +145,6 @@ files:
 - lib/watirsplash/util.rb
 - lib/watirsplash/waiter.rb
 - lib/watirsplash/watir.rb
-- lib/watirsplash/win32screenshot.rb
 - spec/spec.opts
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb
@@ -166,7 +167,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.0! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.1! 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.
   
@@ -201,7 +202,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.0
+summary: watirsplash 0.2.1
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb

data/lib/watirsplash/win32screenshot.rb

@@ -1,52 +0,0 @@
-module Win32
-  module Screenshot
-
-    # added patches by Tony Popiel for fixing the problem
-    # of failing to take a screenshot of every size of the window
-    # http://rubyforge.org/tracker/index.php?func=detail&aid=26216&group_id=2683&atid=10359
-    module_function
-
-    def capture(hScreenDC, x1, y1, x2, y2)
-      w = x2-x1
-      h = y2-y1
-
-      # Reserve some memory
-      hmemDC = createCompatibleDC(hScreenDC)
-      hmemBM = createCompatibleBitmap(hScreenDC, w, h)
-      selectObject(hmemDC, hmemBM)
-      bitBlt(hmemDC, 0, 0, w, h, hScreenDC, 0, 0, SRCCOPY)
-      # changed line
-      # hpxldata = globalAlloc(GMEM_FIXED, w * h * 3)
-      hpxldata = globalAlloc(GMEM_FIXED, ((w*h*3)+(w%4)*h))
-      lpvpxldata = globalLock(hpxldata)
-
-      # Bitmap header
-      # http://www.fortunecity.com/skyscraper/windows/364/bmpffrmt.html
-      bmInfo = [40, w, h, 1, 24, 0, 0, 0, 0, 0, 0, 0].pack('LLLSSLLLLLL').to_ptr
-
-      getDIBits(hmemDC, hmemBM, 0, h, lpvpxldata, bmInfo, DIB_RGB_COLORS)
-
-      bmFileHeader = [
-              19778,
-              # changed line
-              # (w * h * 3) + 40 + 14,
-              (w * h * 3) + (w%4)*h + 40 + 14,
-              0,
-              0,
-              54
-      ].pack('SLSSL').to_ptr
-
-      # changed line
-      # data = bmFileHeader.to_s(14) + bmInfo.to_s(40) + lpvpxldata.to_s(w * h * 3)
-      data = bmFileHeader.to_s(14) + bmInfo.to_s(40) + lpvpxldata.to_s((w*h*3)+(w%4)*h)
-
-      globalUnlock(hpxldata)
-      globalFree(hpxldata)
-      deleteObject(hmemBM)
-      deleteDC(hmemDC)
-      releaseDC(0, hScreenDC)
-
-      return [w, h, data]
-    end
-  end
-end