capybara-webkit-remote 0.0.3 → 0.0.4

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "capybara-webkit", ">= 0.11.0"
+gem "capybara-webkit", ">= 0.12.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/capybara-webkit-remote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capybara-webkit-remote"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]
-  s.date = "2012-05-24"
+  s.date = "2012-05-29"
   s.description = "capybara-webkit-remote allows the capybara driver to point to a browser that's running in a remote host using the TCP socket protocol that capybara-webkit already uses."
   s.email = "jp@jibe.com"
   s.extra_rdoc_files = [
@@ -39,20 +39,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capybara-webkit>, [">= 0.11.0"])
+      s.add_runtime_dependency(%q<capybara-webkit>, [">= 0.12.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
-      s.add_dependency(%q<capybara-webkit>, [">= 0.11.0"])
+      s.add_dependency(%q<capybara-webkit>, [">= 0.12.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
-    s.add_dependency(%q<capybara-webkit>, [">= 0.11.0"])
+    s.add_dependency(%q<capybara-webkit>, [">= 0.12.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/lib/capybara/driver/webkit/remote_browser.rb

@@ -1,35 +1,42 @@
 class Capybara::Driver::Webkit
-  class RemoteBrowser < Capybara::Driver::Webkit::Browser
-    attr :remote_host, :remote_port
-    
+  class RemoteConnection < Capybara::Driver::Webkit::Connection
     def self.open_sockets; @@_sockets ||= [ ]; end
-    
     at_exit do
-      socks = Capybara::Driver::Webkit::RemoteBrowser.open_sockets()
+      socks = Capybara::Driver::Webkit::RemoteConnection.open_sockets()
       while(socks.length > 0)
         s = socks.shift()
         s.close() rescue nil
       end
     end
-    
-    def initialize(hostname, port, options = { })
-      @remote_host = hostname
-      @remote_port = port
+    def initialize(remote_host, remote_port, options)
+      @remote_host = remote_host
+      @remote_port = remote_port
       super(options)
-      Capybara::Driver::Webkit::RemoteBrowser.open_sockets << @socket
+      Capybara::Driver::Webkit::RemoteConnection.open_sockets << @socket
     end
-    
-    def disconnect!
+    def close
       @socket.close rescue nil
-      Capybara::Driver::Webkit::RemoteBrowser.open_sockets.delete(@socket)
+      Capybara::Driver::Webkit::RemoteConnection.open_sockets.delete(@socket)
       true
     end
-    
     def start_server ; end
-    
     def attempt_connect
-      @socket = @socket_class.open(remote_host, remote_port)
+      @socket = @socket_class.open(@remote_host, @remote_port)
       rescue Errno::ECONNREFUSED
     end
+  end
+  
+  class RemoteBrowser < Capybara::Driver::Webkit::Browser
+    attr :remote_host, :remote_port
+    
+    def initialize(hostname, port, options = { })
+      @connection = Capybara::Driver::Webkit::RemoteConnection.new(hostname, port, options)
+      super(@connection)
+    end
+    
+    def disconnect!
+      @connection.close rescue nil
+      true
+    end
   end 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &11500160 !ruby/object:Gem::Requirement
+  requirement: &7571500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *11500160
+  version_requirements: *7571500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11498980 !ruby/object:Gem::Requirement
+  requirement: &7569820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11498980
+  version_requirements: *7569820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11512380 !ruby/object:Gem::Requirement
+  requirement: &7579480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *11512380
+  version_requirements: *7579480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11506740 !ruby/object:Gem::Requirement
+  requirement: &7577040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11506740
+  version_requirements: *7577040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11504820 !ruby/object:Gem::Requirement
+  requirement: &7596820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *11504820
+  version_requirements: *7596820
 description: capybara-webkit-remote allows the capybara driver to point to a browser
   that's running in a remote host using the TCP socket protocol that capybara-webkit
   already uses.
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -731608790162829361
+      hash: -2146885072889021850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: