selenium-webdriver 2.21.1 → 2.21.2.rc1

data/CHANGES

@@ -1,3 +1,13 @@
+2.21.2 (2012-04-18)
+===================
+
+* Check MultiJson.respond_to?, depend on ~> 1.0
+
+2.21.1 (2012-04-16)
+===================
+
+* Set multi_json dependency to < 1.3 to avoid deprecation warnings.
+
 2.21.0 (2012-04-11)
 ===================
 

data/lib/selenium/webdriver.rb

@@ -63,5 +63,29 @@ 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/chrome/profile.rb

@@ -61,7 +61,7 @@ module Selenium
           prefs_file = prefs_file_for(dir)
 
           FileUtils.mkdir_p File.dirname(prefs_file)
-          File.open(prefs_file, "w") { |file| file << MultiJson.encode(prefs)  }
+          File.open(prefs_file, "w") { |file| file << WebDriver.json_dump(prefs)  }
         end
 
         def prefs
@@ -70,7 +70,7 @@ module Selenium
 
         def read_model_prefs
           return {} unless @model
-          MultiJson.decode File.read(prefs_file_for(@model))
+          WebDriver.json_load File.read(prefs_file_for(@model))
         end
 
         def prefs_file_for(dir)

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

@@ -28,12 +28,12 @@ module Selenium
 
       #
       # Click this element. If this causes a new page to load, this method will
-      # attempt to block until the page has loaded.  At this point, you should 
-      # discard all references to this element and any further operations 
+      # attempt to block until the page has loaded.  At this point, you should
+      # discard all references to this element and any further operations
       # performed on this element will raise a StaleElementReferenceError
       # unless you know that the element and the page will still be present. If
-      # click() causes a new page to be loaded via an event or is done by 
-      # sending a native event then the method will *not* wait for it to be 
+      # click() causes a new page to be loaded via an event or is done by
+      # sending a native event then the method will *not* wait for it to be
       # loaded and the caller should verify that a new page has been loaded.
       #
       # There are some preconditions for an element to be clicked.  The element
@@ -49,13 +49,13 @@ module Selenium
       # @raise [StaleElementReferenceError] if the element no longer exists as
       #  defined
       #
-      
+
       def click
         bridge.clickElement @id
       end
 
       #
-      # Get the tag name of the element. 
+      # Get the tag name of the element.
       #
       # @example Get the tagname of an INPUT element(returns "input")
       #
@@ -256,7 +256,7 @@ module Selenium
       #
 
       def to_json(*args)
-        MultiJson.encode as_json
+        WebDriver.json_dump as_json
       end
 
       #

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

@@ -19,7 +19,7 @@ module Selenium
       end
 
       def to_json(*args)
-        MultiJson.encode as_json
+        WebDriver.json_dump as_json
       end
 
       private
@@ -46,7 +46,7 @@ module Selenium
 
       module ClassMethods
         def from_json(json)
-          data = MultiJson.decode(json).fetch('zip')
+          data = WebDriver.json_load(json).fetch('zip')
 
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082

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

@@ -96,7 +96,7 @@ module Selenium
       end
 
       def to_json(*args)
-        MultiJson.encode as_json
+        WebDriver.json_dump as_json
       end
 
       class << self

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

@@ -27,7 +27,7 @@ module Selenium
           end
 
           def default_preferences
-            @default_preferences ||= MultiJson.decode(
+            @default_preferences ||= WebDriver.json_load(
               File.read(File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/prefs.json"))
             ).freeze
           end
@@ -241,7 +241,7 @@ module Selenium
               key, value = $1.strip, $2.strip
 
               # wrap the value in an array to make it a valid JSON string.
-              prefs[key] = MultiJson.decode("[#{value}]").first
+              prefs[key] = WebDriver.json_load("[#{value}]").first
             end
           end
 
@@ -251,7 +251,7 @@ module Selenium
         def write_prefs(prefs, path)
           File.open(path, "w") { |file|
             prefs.each do |key, value|
-              file.puts %{user_pref("#{key}", #{MultiJson.encode value});}
+              file.puts %{user_pref("#{key}", #{WebDriver.json_dump value});}
             end
           }
         end

data/lib/selenium/webdriver/remote/capabilities.rb

@@ -223,7 +223,7 @@ module Selenium
         end
 
         def to_json(*args)
-          MultiJson.encode as_json
+          WebDriver.json_dump as_json
         end
 
         def ==(other)

data/lib/selenium/webdriver/remote/http/common.rb

@@ -24,7 +24,7 @@ module Selenium
             headers['Cache-Control'] = "no-cache" if verb == :get
 
             if command_hash
-              payload                   = MultiJson.encode(command_hash)
+              payload                   = WebDriver.json_dump(command_hash)
               headers["Content-Type"]   = "#{CONTENT_TYPE}; charset=utf-8"
               headers["Content-Length"] = payload.bytesize.to_s if [:post, :put].include?(verb)
 
@@ -56,7 +56,7 @@ module Selenium
 
             if content_type.include? CONTENT_TYPE
               raise Error::WebDriverError, "empty body: #{content_type.inspect} (#{code})\n#{body}" if body.empty?
-              Response.new(code, MultiJson.decode(body))
+              Response.new(code, WebDriver.json_load(body))
             elsif code == 204
               Response.new(code)
             else

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

@@ -19,7 +19,7 @@ module Selenium
         end
 
         def send(command)
-          json = MultiJson.encode(command)
+          json = WebDriver.json_dump(command)
           puts ">>> #{json}" if $DEBUG
 
           frame = LibWebSocket::Frame.new(json).to_s
@@ -49,7 +49,7 @@ module Selenium
 
           puts "<<< #{msg}" if $DEBUG
 
-          MultiJson.decode msg
+          WebDriver.json_load msg
         end
 
         def ws_uri
@@ -135,4 +135,4 @@ window.onload = function() {
 
     end
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.21.1
+  prerelease: 7
+  version: 2.21.2.rc1
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 +01:00
+date: 2012-04-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - <
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "1.3"
+            version: "1.0"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -248,9 +248,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: