vapir-ie 1.7.0 → 1.7.1.rc1

data/lib/vapir-ie/container.rb

@@ -21,6 +21,18 @@ module Vapir
     include Vapir::Container
     include Vapir::Exception
     
+    public
+    # see documentation for the common Vapir::Container#handling_existence_failure 
+    def handling_existence_failure(options={})
+      options=handle_options(options, :handle => :ignore)
+      begin
+        yield
+      rescue WIN32OLERuntimeError, RuntimeError, Vapir::Exception::ExistenceFailureException
+        raise if $!.class==RuntimeError && $!.message !~ /HRESULT/ # sometimes WIN32OLE raises a RuntimeError instead of a WIN32OLERuntimeError. only catch a RuntimeError if it's from WIN32OLE, indicated by HRESULT in the error message. 
+        handle_existence_failure($!, options)
+      end
+    end
+    public
     # Note: @container is the container of this object, i.e. the container
     # of this container.
     # In other words, for ie.table().this_thing().text_field().set,
@@ -41,10 +53,10 @@ module Vapir
       @container.logger.debug(what) if @logger
     end
     
-    def set_container container
-      @container = container 
-      @page_container = container.page_container
-    end
+#    def set_container container
+#      @container = container 
+#      @page_container = container.page_container
+#    end
         
     private
   end # module

data/lib/vapir-ie/element.rb

@@ -18,6 +18,13 @@ module Vapir
     def enabled?
       !disabled
     end
+    # Checks if this element is enabled or not. Raises ObjectDisabledException if this is disabled.
+    def assert_enabled
+      # TODO: dry? copied from common InputElement
+      if disabled
+        raise Exception::ObjectDisabledException, "#{self.inspect} is disabled"
+      end
+    end
     
     private
     def base_element_class
@@ -173,10 +180,9 @@ module Vapir
            ]
           actions.each do |action|
             # javascript stuff responding to previous events can cause self to stop existing, so check at every subsequent step
-            if exists?
+            handling_existence_failure(:handle => proc{ return result }) do
+              assert_exists :force => true
               result=action.call
-            else
-              return result
             end
           end
           wait
@@ -337,23 +343,27 @@ module Vapir
     
     private
     def element_object_exists?
-      return nil if !@element_object
+      return false if !@element_object
 
       begin
-        win=container.document_object.parentWindow
-        document_object=win.document # I don't know why container.document_object != container.document_object.parentWindow.document 
-
-        # we need a javascript function to test equality because comparing two WIN32OLEs always returns false (unless they have the same object_id, which these don't) 
-        win.execScript("__watir_javascript_equals__=function(a, b){return a==b;}")
+        doc=container.document_object || (return false)
+        win=doc.parentWindow || (return false)
+        document_object=win.document || (return false) # I don't know why container.document_object != container.document_object.parentWindow.document 
       rescue WIN32OLERuntimeError
         # if a call to these methods from the above block raised this exception, we don't exist. 
         # if that's not the error, it's unexpected; raise. 
-        if $!.message =~ /unknown property or method `(parentWindow|contentWindow|document|execScript)'/
+        if $!.message =~ /unknown property or method `(parentWindow|contentWindow|document)'/
           return false
         else
           raise
         end
       end
+      begin
+        # we need a javascript function to test equality because comparing two WIN32OLEs always returns false (unless they have the same object_id, which these don't) 
+        win.execScript("__watir_javascript_equals__=function(a, b){return a==b;}")
+      rescue WIN32OLERuntimeError
+        return false
+      end
 
       current_node=@element_object
       while current_node
@@ -375,3 +385,4 @@ module Vapir
     end
   end
 end
+  

data/lib/vapir-ie/frame.rb

@@ -28,10 +28,6 @@ module Vapir
       content_window_object.document
     end
     alias document document_object
-
-    def attach_command
-      @container.page_container.attach_command + ".frame(#{@how.inspect}, #{@what.inspect})"
-    end
     
   end
 end

data/lib/vapir-ie/ie-class.rb

@@ -865,10 +865,6 @@ module Vapir
     end
     private :element_by_absolute_xpath
     
-    def attach_command
-      "Vapir::IE.attach(:hwnd, #{hwnd})"
-    end
-    
     private
     def base_element_class
       IE::Element

data/lib/vapir-ie/modal_dialog.rb

@@ -60,7 +60,10 @@ module Vapir
     include IE::PageContainer
     @@iedialog_file = (File.expand_path(File.dirname(__FILE__) + '/..') + "/vapir-ie/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
 
-    GetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')
+    def get_unknown(*args)
+      @@get_unknown ||= Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')
+      @@get_unknown.call(*args)
+    end
     def initialize(containing_modal_dialog, options={})
       options=handle_options(options, :timeout => ModalDialog::DEFAULT_TIMEOUT, :error => true)
       @containing_modal_dialog=containing_modal_dialog
@@ -68,7 +71,7 @@ module Vapir
       intUnknown = nil
       ::Waiter.try_for(options[:timeout], :exception => (options[:error] && "Unable to attach to Modal Window after #{options[:timeout]} seconds.")) do
         intPointer = [0].pack("L") # will contain the int value of the IUnknown*
-        GetUnknown.call(@containing_modal_dialog.hwnd, intPointer)
+        get_unknown(@containing_modal_dialog.hwnd, intPointer)
         intArray = intPointer.unpack('L')
         intUnknown = intArray.first
         intUnknown > 0
@@ -80,7 +83,7 @@ module Vapir
     attr_reader :containing_modal_dialog
     attr_reader :document_object
     def locate!(options={})
-      exists? || raise(Vapir::Exception::NoMatchingWindowFoundException, "The modal dialog seems to have stopped existing.")
+      exists? || raise(Vapir::Exception::WindowGoneException, "The modal dialog seems to have stopped existing.")
     end
     
     def exists?
@@ -206,10 +209,6 @@ module Watir
       document.title
     end
 
-    def attach_command
-      "Watir::IE.find(:hwnd, #{@container.hwnd}).modal_dialog"
-    end
-      
     def wait(options={})
     end
     

data/lib/vapir-ie/page_container.rb

@@ -1,4 +1,5 @@
 require 'vapir-ie/container'
+require 'vapir-common/page_container'
 
 module Vapir
   # A PageContainer contains an HTML Document. In other words, it is a 
@@ -6,6 +7,8 @@ module Vapir
   #
   # this assumes that document_object is defined on the includer. 
   module IE::PageContainer
+    include Vapir::PageContainer
+
     # Used internally to determine when IE has finished loading a page
     # http://msdn.microsoft.com/en-us/library/system.windows.forms.webbrowserreadystate.aspx
     # http://msdn.microsoft.com/en-us/library/system.windows.forms.webbrowser.readystate.aspx
@@ -18,9 +21,6 @@ module Vapir
     end
     READYSTATE_COMPLETE = WebBrowserReadyState::Complete
        
-    def containing_object
-      document_object
-    end
     include IE::Container
     include Vapir::Exception
 
@@ -45,27 +45,15 @@ module Vapir
       false
     end 
     
-    def document_element
-      document_object.documentElement
-    end
     def content_window_object
       document_object.parentWindow
     end
     
-    def page_container
-      self
-    end
-
     # The HTML of the current page
     def html
       document_element.outerHTML
     end
     
-    # The url of the page object. 
-    def url
-      document_object.location.href
-    end
-    
     # The text of the current page
     def text
       document_element.innerText
@@ -75,10 +63,6 @@ module Vapir
       content_window_object.close
     end
 
-    def title
-      document_object.title
-    end
-
     # Execute the given JavaScript string
     def execute_script(source)
       retried=false
@@ -115,11 +99,11 @@ module Vapir
       start_load_time = Time.now
       
       if respond_to?(:browser_object)
-        ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser was still busy at the end of the specified interval") do
+        ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser was still busy after #{options[:timeout]} seconds") do
           return unless exists?
           !browser_object.busy
         end
-        ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser's readyState was still not ready for interaction at the end of the specified interval") do
+        ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser's readyState was still not ready for interaction after #{options[:timeout]} seconds") do
           return unless exists?
           [WebBrowserReadyState::Interactive, WebBrowserReadyState::Complete].include?(browser_object.readyState)
         end
@@ -134,7 +118,7 @@ module Vapir
           return
         end
       end
-      ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser's document was still not defined at the end of the specified interval") do
+      ::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => "The browser's document was still not defined after #{options[:timeout]} seconds") do
         return unless exists?
         doc_or_ret.call
       end
@@ -145,7 +129,7 @@ module Vapir
       end
       case all_frames_complete_result
       when false
-        raise "A frame on the browser did not come into readyState complete by the end of the specified interval"
+        raise "A frame on the browser did not come into readyState complete after #{options[:timeout]} seconds"
       when ::Exception
         message = "A frame on the browser encountered an error.\n"
         if all_frames_complete_result.message =~ /0x80070005/

data/lib/vapir-ie/scripts/select_file.rb

@@ -39,15 +39,16 @@ end
 
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'vapir-common', 'lib'))
 
-require 'vapir-common/win_window'
-require 'vapir-common/waiter'
-require 'vapir-common/exceptions'
-
 browser_hwnd, file_path, $error_file_name=*ARGV
 unless (2..3).include?(ARGV.size) && browser_hwnd =~ /^\d+$/ && browser_hwnd.to_i > 0
   raise ArgumentError, "This script takes two or three arguments: the hWnd that the File Selection dialog will pop up on (positive integer); the path to the file to select; and (optional) a filename to write any failure message to."
 end
 
+require 'rubygems' # win_window needs this for FFI 
+require 'vapir-common/win_window'
+require 'vapir-common/waiter'
+require 'vapir-common/exceptions'
+
 # titles of file upload window titles in supported browsers 
 # Add to this titles in other languages, too 
 UploadWindowTitles= { :IE8 => "Choose File to Upload", 

data/lib/vapir-ie/version.rb

@@ -1,5 +1,5 @@
 module Vapir
   class IE
-    VERSION = '1.7.0'
+    VERSION = '1.7.1.rc1'
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vapir-ie
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  - rc1
+  version: 1.7.1.rc1
 platform: ruby
 authors: 
 - Ethan
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +56,9 @@ dependencies:
         segments: 
         - 1
         - 7
-        - 0
-        version: 1.7.0
+        - 1
+        - rc1
+        version: 1.7.1.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -148,11 +150,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - Microsoft Windows
 - Internet Explorer