watirsplash 0.2.7 → 0.2.8

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 0.2.8 / 2010-10-06
+
+ * use Watir 1.6.6 and RSpec 1.3.0 from now on
+
 === 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

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/watirsplash/watir.rb

@@ -8,113 +8,12 @@ end
 # patches for Watir
 module Watir
   class IE #:nodoc:all
-    READYSTATE_INTERACTIVE = 3
-
     include WaitHelper
-
-    # This is Watir's overriden wait method, which is used in many places for deciding
-    # if browser is ready or not. We have to patch one line in it to work properly
-    # when file save as dialog has been displayed. For some reason READYSTATE (4)
-    # property value will be READYSTATE_INTERACTIVE (3) after file has been downloaded
-    # and not 4, thus wait will stay blocking.
-    # read more about IE READYSTATE property:
-    # http://msdn.microsoft.com/en-us/library/aa768362(VS.85).aspx
-    #
-    # Block execution until the page has loaded.
-    # Raises Timeout::Error if page is not loaded within 5 minutes.
-    # =nodoc
-    # Note: This code needs to be prepared for the ie object to be closed at
-    # any moment!
-    def wait(no_sleep=false)
-      @xml_parser_doc = nil
-      @down_load_time = 0.0
-      a_moment = 0.2 # seconds
-      start_load_time = Time.now
-      timeout = 5*60
-      timeout_error = Timeout::Error.new("Failed to load page within #{timeout} seconds!")
-      begin
-        while @ie.busy
-          sleep a_moment
-          raise timeout_error if Time.now - start_load_time >= timeout
-        end
-        # this is the line which has been changed to accept also state 3
-        until @ie.readyState == READYSTATE_INTERACTIVE ||
-                @ie.readyState == READYSTATE_COMPLETE do
-          sleep a_moment
-          raise timeout_error if Time.now - start_load_time >= timeout
-        end
-        sleep a_moment
-        until @ie.document do
-          sleep a_moment
-          raise timeout_error if Time.now - start_load_time >= timeout
-        end
-
-        documents_to_wait_for = [@ie.document]
-
-      rescue WIN32OLERuntimeError # IE window must have been closed
-        @down_load_time = Time.now - start_load_time
-        sleep @pause_after_wait unless no_sleep
-        return @down_load_time
-      end
-
-      while doc = documents_to_wait_for.shift
-        begin
-          until doc.readyState == "complete" do
-            sleep a_moment
-            raise timeout_error if Time.now - start_load_time >= timeout
-          end
-          @url_list << doc.location.href unless @url_list.include?(doc.location.href)
-          doc.frames.length.times do |n|
-            begin
-              documents_to_wait_for << doc.frames[n.to_s].document
-            rescue WIN32OLERuntimeError, NoMethodError
-            end
-          end
-        rescue WIN32OLERuntimeError
-        end
-      end
-
-      @down_load_time = Time.now - start_load_time
-      run_error_checks
-      sleep @pause_after_wait unless no_sleep
-      @down_load_time
-    end
-
-    # Closes the browser even if #wait throws an exception.
-    # It happens mostly when #run_error_checks throws some exception.
-    def close
-      return unless exists?
-      @closing = true
-      @ie.stop
-      wait rescue nil
-      chwnd = @ie.hwnd.to_i
-      @ie.quit
-      while Win32API.new("user32", "IsWindow", 'L', 'L').Call(chwnd) == 1
-        sleep 0.3
-      end
-    end
   end
 
   class Element #:nodoc:all
     include ElementExtensions
 
-    def_wrap_guard :currentstyle
-
-    # returns current style instead of inline style
-    # http://msdn.microsoft.com/en-us/library/ms535231(VS.85).aspx
-    def style
-      currentstyle
-    end
-
-    def click_no_wait
-      assert_enabled
-
-      highlight(:set)
-      element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
-      @page_container.click_no_wait(element)
-      highlight(:clear)
-    end
-
     # saves a file with the browser
     #
     # clicking the button opens a browser's save as dialog and saves the file document.pdf
@@ -146,82 +45,4 @@ module Watir
     end
   end
 
-  module PageContainer #:nodoc:all
-    def click_no_wait(element)
-      ruby_code = "require 'rubygems';" <<
-              "require '#{File.expand_path(File.dirname(__FILE__))}/watir_core';" <<
-              "#{element}.click!"
-      system(spawned_click_no_wait_command(ruby_code))
-    end
-
-    def spawned_click_no_wait_command(command)
-      unless $VERBOSE
-        "start rubyw -e #{command.inspect}"
-      else
-        puts "#click_no_wait command:"
-        command = "ruby -e #{command.inspect}"
-        puts command
-        command
-      end
-    end
-
-    private :spawned_click_no_wait_command
-  end
-
-  class Table < Element
-
-    # This method returns multi-dimensional array of the cell texts in table.
-    #
-    # Works with tr, th, td elements, colspan, rowspan and nested tables.
-    # Takes an optional parameter *max_depth*, which is by default 1
-    def to_a(max_depth=1)
-      assert_exists
-      y = []
-      @o.rows.each do |row|
-        y << TableRow.new(@container, :ole_object, row).to_a(max_depth)
-      end
-      y
-    end
-  end
-
-  class TableRow < Element
-
-    # This method returns (multi-dimensional) array of the cell texts in table's row.
-    #
-    # Works with th, td elements, colspan, rowspan and nested tables.
-    # Takes an optional parameter *max_depth*, which is by default 1
-    def to_a(max_depth=1)
-      assert_exists
-      y = []
-      @o.cells.each do |cell|
-        inner_tables = cell.getElementsByTagName("TABLE")
-        inner_tables.each do |inner_table|
-          # make sure that the inner table is directly child for this cell
-          if inner_table?(cell, inner_table)
-            max_depth -= 1
-            y << Table.new(@container, :ole_object, inner_table).to_a(max_depth) if max_depth >= 1
-          end
-        end
-
-        if inner_tables.length == 0
-          y << cell.innerText.strip
-        end
-      end
-      y
-    end
-
-    private
-    # returns true if inner_table is direct child
-    # table for cell and there's not any table-s in between
-    def inner_table?(cell, inner_table)
-      parent_element = inner_table.parentElement
-      if parent_element.uniqueID == cell.uniqueID
-        return true
-      elsif parent_element.tagName == "TABLE"
-        return false
-      else
-        return inner_table?(cell, parent_element)
-      end
-    end
-  end
 end

data/lib/watirsplash.rb

@@ -1,6 +1,8 @@
 require "rubygems"
 require "require_all"
+gem "rspec", "=1.3.0"
 require "spec"
+gem "watir", "=1.6.6"
 require "watir"
 require "pathname"
 require_rel "watirsplash/wait_helper"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +03:00
+date: 2010-10-06 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,7 +164,6 @@ files:
 - lib/watirsplash/util.rb
 - lib/watirsplash/wait_helper.rb
 - lib/watirsplash/watir.rb
-- lib/watirsplash/watir_core.rb
 - spec/spec.opts
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb
@@ -188,7 +187,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.7! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.8! 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 +226,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.7
+summary: watirsplash 0.2.8
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb

data/lib/watirsplash/watir_core.rb

@@ -1,79 +0,0 @@
-# these require statements are needed for Watir
-# to work with minimum functionality
-#
-# this is needed for #click_no_wait to perform faster
-module Watir
-  # dummy modules for patching
-  module Win32
-  end
-
-  module Utils
-  end
-end
-
-
-require 'watir/win32ole'
-require 'logger'
-require 'watir/exceptions'
-require 'watir/matches'
-
-require 'watir/core_ext'
-require 'watir/logger'
-require 'watir/container'
-require 'watir/locator'
-require 'watir/page-container'
-require 'watir/ie-class'
-require 'watir/element'
-require 'watir/element_collections'
-require 'watir/form'
-require 'watir/non_control_elements'
-require 'watir/input_elements'
-require 'watir/table'
-require 'watir/image'
-require 'watir/link'
-begin
-  require 'watir/html_element'
-rescue LoadError
-  # this exists currently only on github
-end
-
-require 'watir/waiter'
-
-# watir/module
-module Watir
-  include Watir::Exception
-
-# Directory containing the watir.rb file
-  @@dir = File.expand_path(File.dirname(__FILE__))
-
-  ATTACHER = Waiter.new
-# Like regular Ruby "until", except that a TimeOutException is raised
-# if the timeout is exceeded. Timeout is IE.attach_timeout.
-  def self.until_with_timeout # block
-    ATTACHER.timeout = IE.attach_timeout
-    ATTACHER.wait_until { yield }
-  end
-
-  @@autoit = nil
-
-  def self.autoit
-    unless @@autoit
-      begin
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      rescue WIN32OLERuntimeError
-        _register('AutoItX3.dll')
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      end
-    end
-    @@autoit
-  end
-
-  def self._register(dll)
-    system("regsvr32.exe /s "    + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-
-  def self._unregister(dll)
-    system("regsvr32.exe /s /u " + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-
-end