selenium-webdriver 2.21.2 → 2.22.0.rc1

data/CHANGES

@@ -1,3 +1,8 @@
+2.22.0 (???)
+============
+
+* Fix conflict with ActiveSupport's Object#load (#3819)
+
 2.21.2 (2012-04-18)
 ===================
 

data/lib/selenium/webdriver.rb

@@ -8,6 +8,8 @@ require 'selenium/webdriver/common'
 
 module Selenium
   module WebDriver
+    extend JsonHelper
+
     Point     = Struct.new(:x, :y)
     Dimension = Struct.new(:width, :height)
     Location  = Struct.new(:latitude, :longitude, :altitude)
@@ -63,29 +65,5 @@ module Selenium
       WebDriver::Driver.for(*args)
     end
 
-    if MultiJson.respond_to?(:dump)
-      # @api private
-      def self.json_dump(obj)
-        MultiJson.dump(obj)
-      end
-    else
-      # @api private
-      def self.json_dump(obj)
-        MultiJson.encode(obj)
-      end
-    end
-
-    if MultiJson.respond_to?(:load)
-      # @api private
-      def self.json_load(obj)
-        MultiJson.load(obj)
-      end
-    else
-      # @api private
-      def self.json_load(obj)
-        MultiJson.decode(obj)
-      end
-    end
-
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common.rb

@@ -35,5 +35,6 @@ require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
 require 'selenium/webdriver/common/profile_helper'
+require 'selenium/webdriver/common/json_helper'
 require 'selenium/webdriver/common/driver'
 require 'selenium/webdriver/common/element'

data/lib/selenium/webdriver/common/json_helper.rb

@@ -0,0 +1,34 @@
+module Selenium
+  module WebDriver
+    module JsonHelper
+
+      # ActiveSupport may define Object#load, so we can't use MultiJson.respond_to? here
+      sm = MultiJson.singleton_methods.map { |e| e.to_sym }
+
+      if sm.include? :load
+        # @api private
+        def json_load(obj)
+          MultiJson.load(obj)
+        end
+      else
+        # @api private
+        def json_load(obj)
+          MultiJson.decode(obj)
+        end
+      end
+
+      if sm.include? :dump
+        # @api private
+        def json_dump(obj)
+          MultiJson.dump(obj)
+        end
+      else
+        # @api private
+        def json_dump(obj)
+          MultiJson.encode(obj)
+        end
+      end
+
+    end
+  end
+end

data/lib/selenium/webdriver/firefox/bridge.rb

@@ -41,9 +41,9 @@ module Selenium
 
         def quit
           super
-          @launcher.quit
-
           nil
+        ensure
+          @launcher.quit
         end
 
         private

data/lib/selenium/webdriver/safari/bridge.rb

@@ -50,18 +50,21 @@ module Selenium
 
           params.merge!(command_hash) if command_hash
 
-          @server.send :id         => @command_id.to_s,
-                       :name       => command,
-                       :parameters => params
+          @server.send(
+            :origin  => "webdriver",
+            :type    => "command",
+            :command => { :id => @command_id.to_s, :name => command, :parameters => params}
+          )
 
-          response = @server.receive
+          raw = @server.receive
+          response = raw.fetch('response')
 
           status_code = response['status']
           if status_code != 0
             raise Error.for_code(status_code), response['value']['message']
           end
 
-          if response['id'] != @command_id.to_s
+          if raw['id'] != @command_id.to_s
             raise Error::WebDriverError, "response id does not match command id"
           end
 

data/lib/selenium/webdriver/safari/server.rb

@@ -82,8 +82,8 @@ Server: safaridriver-ruby
 // SafariDriver extension.
 window.onload = function() {
   window.postMessage({
-    'message': 'connect',
-    'source': 'webdriver',
+    'type': 'connect',
+    'origin': 'webdriver',
     'url': '%s'
   }, '*');
 };

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.21.2
+  prerelease: 7
+  version: 2.22.0.rc1
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 +01:00
+date: 2012-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -159,6 +159,7 @@ files:
   - lib/selenium/webdriver/common/element.rb
   - lib/selenium/webdriver/common/error.rb
   - lib/selenium/webdriver/common/file_reaper.rb
+  - lib/selenium/webdriver/common/json_helper.rb
   - lib/selenium/webdriver/common/keyboard.rb
   - lib/selenium/webdriver/common/keys.rb
   - lib/selenium/webdriver/common/mouse.rb
@@ -248,9 +249,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: