selenium-client 1.2.2 → 1.2.3

data/README.markdown

@@ -36,7 +36,20 @@ Features
 Plain API
 =========
  
- Selenium client is just a plain Ruby API, so you can use it wherever you can use Ruby. For instance
+ Selenium client is just a plain Ruby API, so you can use it wherever you can use Ruby. 
+ 
+ To used the new API just require the client driver:
+ 
+    require "rubygems"
+    require "selenium/client"
+
+ For a fully backward compatible API you can start with:
+ 
+    require "rubygems"
+    gem "selenium-client"
+    require "selenium"
+ 
+ For instance
  to write a little Ruby script using selenium-client you could write something like:
 
     #!/usr/bin/env ruby
@@ -45,8 +58,7 @@ Plain API
     #
     require "test/unit"
     require "rubygems"
-    gem "selenium-client"
-    require "selenium"
+    require "selenium/client"
 
     begin
       @browser = Selenium::Client::Driver.new("localhost", 4444, "*firefox", "http://www.google.com", 10000);
@@ -142,7 +154,10 @@ Start/Stop a Selenium Remote Control Server
   To leverage all selenium-client capabilities I recommend downloading a recent nightly build of
   a standalone packaging of Selenium Remote Control (great for kick-ass Safari and Firefox 3 support anyway).
   You will find the mightly build at [OpenQA.org](http://archiva.openqa.org/repository/snapshots/org/openqa/selenium/selenium-remote-control/1.0-SNAPSHOT/)
-  
+ 
+ You typically "freeze" the Selenium Remote Control jar in your `vendor` 
+ directory.
+ 
     require 'selenium/rake/tasks' 
     
     Selenium::Rake::RemoteControlStartTask.new do |rc|
@@ -189,4 +204,4 @@ Grid](http://selenium-grid.openqa.org))
 
 
  
- 
+ 

data/lib/selenium.rb

@@ -1,42 +1,11 @@
-# Copyright 2006 ThoughtWorks, Inc
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
+# Legacy helper providing backward compatibility
 
 # -----------------
 # Original code by Aslak Hellesoy and Darren Hobbs
 # This file has been automatically generated via XSL
 # -----------------
 
-require 'net/http'
-require 'uri'
-require 'cgi'
-require "digest/md5"
-require "fileutils"
-require File.expand_path(File.dirname(__FILE__) + '/tcp_socket_extension')
-require File.expand_path(File.dirname(__FILE__) + '/nautilus/shell')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/command_error')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/protocol_error')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/protocol')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/generated_driver')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/extensions')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/idiomatic')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/base')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/driver')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/client/selenium_helper')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/remote_control/remote_control')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/rake/remote_control_start_task')
-require File.expand_path(File.dirname(__FILE__) + '/selenium/rake/remote_control_stop_task')
+require File.expand_path(File.dirname(__FILE__) + '/selenium/client')
 
 # Backward compatibility
 

data/lib/selenium/client.rb

@@ -0,0 +1,23 @@
+#
+# Helper requiring the basic selenium-client API (no RSpec goodness)
+#
+
+require 'net/http'
+require 'uri'
+require 'cgi'
+require "digest/md5"
+require "fileutils"
+require File.expand_path(File.dirname(__FILE__) + '/../tcp_socket_extension')
+require File.expand_path(File.dirname(__FILE__) + '/../nautilus/shell')
+require File.expand_path(File.dirname(__FILE__) + '/command_error')
+require File.expand_path(File.dirname(__FILE__) + '/protocol_error')
+require File.expand_path(File.dirname(__FILE__) + '/client/protocol')
+require File.expand_path(File.dirname(__FILE__) + '/client/generated_driver')
+require File.expand_path(File.dirname(__FILE__) + '/client/extensions')
+require File.expand_path(File.dirname(__FILE__) + '/client/idiomatic')
+require File.expand_path(File.dirname(__FILE__) + '/client/base')
+require File.expand_path(File.dirname(__FILE__) + '/client/driver')
+require File.expand_path(File.dirname(__FILE__) + '/client/selenium_helper')
+require File.expand_path(File.dirname(__FILE__) + '/remote_control/remote_control')
+require File.expand_path(File.dirname(__FILE__) + '/rake/remote_control_start_task')
+require File.expand_path(File.dirname(__FILE__) + '/rake/remote_control_stop_task')

data/lib/selenium/client/protocol.rb

@@ -10,7 +10,7 @@ module Selenium
       def remote_control_command(verb, args=[])
         timeout(default_timeout_in_seconds) do
           status, response = http_post(http_request_for(verb, args))
-          raise SeleniumCommandError, response unless status == "OK"          
+          raise Selenium::CommandError, response unless status == "OK"          
           response
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-client
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - OpenQA
@@ -30,6 +30,7 @@ files:
 - lib/selenium/client/idiomatic.rb
 - lib/selenium/client/protocol.rb
 - lib/selenium/client/selenium_helper.rb
+- lib/selenium/client.rb
 - lib/selenium/command_error.rb
 - lib/selenium/protocol_error.rb
 - lib/selenium/rake/remote_control_start_task.rb