vapir-ie 1.7.0.rc1 → 1.7.0

data/lib/vapir-ie/element.rb

@@ -341,18 +341,19 @@ module Vapir
 
       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;}")
       rescue WIN32OLERuntimeError
-        # if the document_object no longer has a parentWindow, we don't exist. if that's not the error, it's unexpected; raise. 
-        if $!.message =~ /unknown property or method `parentWindow'/
+        # 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)'/
           return false
         else
           raise
         end
       end
-      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;}")
 
       current_node=@element_object
       while current_node

data/lib/vapir-ie/frame.rb

@@ -7,6 +7,19 @@ module Vapir
     include Frame
     include IE::PageContainer
     
+    # waiting on a Frame should carry on upwards to the browser - the sorts of operations that we wait after 
+    # (clicking a link or whatever) tend to affect other frames too; waiting on just this frame doesn't 
+    # make sense. 
+    def wait(options={}) # :nodoc:
+      if browser # prefer to wait on the browser
+        browser.wait(options)
+      elsif container # if we don't have the browser, wait on the container (presumably this exists) 
+        container.wait(options)
+      else # but if we don't have a container either, just call to PageContainer#wait (by this alias) 
+        page_container_wait(options)
+      end
+    end
+    
     def content_window_object
       element_object.contentWindow
     end

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

@@ -337,6 +337,7 @@ module Vapir
       { '0x800706ba' => 'The RPC server is unavailable',
         '0x80010108' => 'The object invoked has disconnected from its clients.',
         '0x800706be' => 'The remote procedure call failed.',
+        '0x800706b5' => 'The interface is unknown.',
       }.keys.join('|'), Regexp::IGNORECASE)
 
     # Are we attached to an open browser?

data/lib/vapir-ie/page_container.rb

@@ -124,19 +124,29 @@ module Vapir
           [WebBrowserReadyState::Interactive, WebBrowserReadyState::Complete].include?(browser_object.readyState)
         end
       end
+      # if the document object is gone, then we want to just return. 
+      # in subsequent code where we want the document object, we will call this proc 
+      # so that we don't have to deal with checking for error / returning every time. 
+      doc_or_ret = proc do
+        begin
+          document_object
+        rescue WIN32OLERuntimeError
+          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
         return unless exists?
-        document_object
+        doc_or_ret.call
       end
       urls=[]
       all_frames_complete_result=::Waiter.try_for(options[:timeout]-(Time.now-start_load_time), :interval => options[:interval], :exception => nil, :condition => proc{|result| result==true }) do
         return unless exists?
-        all_frames_complete?(document_object, urls)
+        all_frames_complete?(doc_or_ret.call, urls)
       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"
-      when Exception
+      when ::Exception
         message = "A frame on the browser encountered an error.\n"
         if all_frames_complete_result.message =~ /0x80070005/
           message += "An 'Access is denied' error might be fixed by adding the domain of the site to your 'Trusted Sites'.\n"
@@ -157,6 +167,7 @@ module Vapir
       sleep @pause_after_wait if options[:sleep]
       @down_load_time
     end
+    alias page_container_wait wait # alias this so that Frame can clobber the #wait method 
     
     private
     # this returns true if all frames are complete. 
@@ -172,7 +183,7 @@ module Vapir
           urls << document.location.href
         end
         frames=document.frames
-        return document.readyState=='complete' && (0...frames.length).all? do |i|
+        return ['complete', 'interactive'].include?(document.readyState) && (0...frames.length).all? do |i|
           frame=document.frames[i.to_s]
           frame_document=begin
             frame.document

data/lib/vapir-ie/version.rb

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vapir-ie
 version: !ruby/object:Gem::Version 
-  version: 1.7.0.rc1
+  prerelease: false
+  segments: 
+  - 1
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Ethan
@@ -9,49 +14,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 5
         version: 0.5.5
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: windows-pr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 6
         version: 0.6.6
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: vapir-common
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.0.rc1
-    version: 
+        segments: 
+        - 1
+        - 7
+        - 0
+        version: 1.7.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ffi
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
+  type: :runtime
+  version_requirements: *id005
 description: "    Vapir-IE is a library to programatically drive the Internet Explorer \n    browser using the OLE interface, exposing a simple-to-use and powerful\n    API to make automated testing a simple and joyous affair. \n    Forked from the Watir library. \n"
 email: vapir@googlegroups.com
 executables: []
@@ -110,19 +143,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
-  version: 
+      segments: 
+      - 0
+      version: "0"
 requirements: 
 - Microsoft Windows
 - Internet Explorer
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for automating the Internet Explorer browser in Ruby