vapir-firefox 1.7.2 → 1.8.0

data/lib/vapir-firefox/page_container.rb

@@ -5,32 +5,56 @@ module Vapir
   module Firefox::PageContainer
     include Vapir::PageContainer
     include Firefox::Container
-    #def content_window_object
-    #  document_object.parentWindow
-    #end
+
     def text
       document_element.textContent
     end
     
-    # returns nil or raises an error if the given javascript errors. 
-    #
-    # todo/fix: this should return the last evaluated value, like ie's? 
-    def execute_script(javascript)
-      jssh_socket.value_json("(function()
-      { with(#{content_window_object.ref})
-        { #{javascript} }
-        return null;
-      })()")
-      #sandbox=jssh_socket.Components.utils.Sandbox(content_window_object)
-      #sandbox.window=content_window_object
-      #sandbox.document=content_window_object.document
-      #return jssh_socket.Components.utils.evalInSandbox(javascript, sandbox)
+    # evaluates a given javascript string in the context of the browser's content window. anything 
+    # that is a top-level variable on the window will be seen as a top-level variable in the
+    # evaluated script.
+    #
+    # returns the last evaluated expression. 
+    #
+    # raises an error if the given javascript errors. 
+    #
+    # you may specify a hash of other variables that will be available in your script. for example:
+    #
+    #  >> browser.execute_script("element.tagName + ' ' + foo", :element => browser.buttons.first.element_object, :foo => "baz")
+    #  => "BUTTON baz"
+    #
+    # note, however, that if the name of the variable that you use is the same as a variable on the 
+    # window, the window's variable is what will be in scope. for example:
+    #
+    #   >> browser.execute_script("typeof document", :document => "a string")
+    #   => "object"
+    #
+    # the type is 'object' (not 'string') because window.document is what is seen in the scope.
+    #
+    # this function is most useful if you need to execute javascript that is only allowed to run in
+    # the context of the content window. one example of this is Flash objects - if you try to access 
+    # their methods from the top-level context, you get an exception:
+    #
+    #  >> browser.element(:tag_name => 'embed').element_object.PercentLoaded()
+    #  JsshError::Error: NPMethod called on non-NPObject wrapped JSObject!
+    #
+    # but, this method executes script in the context of the content window, so the following works:
+    #
+    #  >> browser.execute_script('element.PercentLoaded()', :element => browser.element(:tag_name => 'embed').element_object)
+    #  => 100
+    def execute_script(javascript, other_variables={})
+      sandbox=jssh_socket.Components.utils.Sandbox(content_window_object)
+      sandbox.window=content_window_object.window
+      other_variables.each do |name, var|
+        sandbox[name]=var
+      end
+      return jssh_socket.Components.utils.evalInSandbox('with(window) { '+javascript+' }', sandbox)
     end
 
     # Returns the html of the document
     def outer_html
-      jssh_socket.object("(function(document)
-      { var temp_el=document.createElement('div');
+      jssh_socket.call_function(:document => document_object) do %Q(
+        var temp_el=document.createElement('div');
         for(var i in document.childNodes)
         { try
           { temp_el.appendChild(document.childNodes[i].cloneNode(true));
@@ -39,7 +63,8 @@ module Vapir
           {}
         }
         return temp_el.innerHTML;
-      })").call(document_object)
+      )
+      end
     end
     alias html outer_html
   end

data/lib/vapir-firefox/version.rb

@@ -1,5 +1,5 @@
 module Vapir
   class Firefox
-    VERSION = '1.7.2'
+    VERSION = '1.8.0'
   end
 end

data/lib/vapir-firefox/window.rb

@@ -11,7 +11,7 @@ module Vapir
     # returns an instance of WinWindow representing this window. 
     # (MS Windows only)
     def win_window
-      require 'vapir-common/win_window'
+      Vapir.require_winwindow
       @win_window||=begin
         orig_browser_window_title=browser_window_object.document.title
         browser_window_object.document.title=orig_browser_window_title+(rand(36**16).to_s(36))
@@ -32,7 +32,7 @@ module Vapir
     end
     # sets this window as the foreground window (MS Windows only)
     def bring_to_front
-      win_window.set_foreground!
+      win_window.really_set_foreground!
     end
   end
 end

data/lib/vapir-firefox.rb

@@ -6,10 +6,7 @@ module Vapir
   Firefox = Class.new(Vapir::Browser)
 end
 
-require 'vapir-firefox/firefox'
+require 'vapir-firefox/config'
+require 'vapir-firefox/browser'
 require 'vapir-firefox/elements'
 require 'vapir-firefox/version'
-
-# this only has an effect if firewatir is required before anyone invokes 
-# Browser.new. Thus it has no effect when Browser.new itself autoloads this library.
-Vapir::Browser.default = 'firefox'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vapir-firefox
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 2
-  version: 1.7.2
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Ethan
@@ -15,53 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vapir-common
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
-        - 7
-        - 2
-        version: 1.7.2
+        - 8
+        - 0
+        version: 1.8.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 description: "    Vapir-Firefox is a library to programatically drive the Firefox\n    browser over the JSSH Firefox extension, exposing a simple-to-use \n    and powerful API to make automated testing a simple and joyous affair. \n    Forked from the Watir library. \n"
 email: vapir@googlegroups.com
 executables: []
@@ -78,7 +59,8 @@ files:
 - lib/vapir/firefox.rb
 - lib/vapir/ff.rb
 - lib/vapir-firefox/version.rb
-- lib/vapir-firefox/firefox.rb
+- lib/vapir-firefox/config.rb
+- lib/vapir-firefox/browser.rb
 - lib/vapir-firefox/container.rb
 - lib/vapir-firefox/page_container.rb
 - lib/vapir-firefox/window.rb
@@ -101,6 +83,7 @@ files:
 - lib/vapir-firefox/elements/table_row.rb
 - lib/vapir-firefox/elements/text_field.rb
 - lib/vapir-firefox/elements.rb
+- lib/vapir-firefox/clear_tracks.rb
 - lib/vapir-firefox/jssh_socket.rb
 - lib/vapir-firefox/prototype.functional.js
 has_rdoc: true
@@ -118,27 +101,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - Firefox browser with JSSH extension installed
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for automating the Firefox browser in Ruby