frameworks-capybara 0.2.8 → 0.2.9

data/.travis.yml

@@ -5,7 +5,5 @@ rvm:
 - 1.9.3
 - jruby-18mode # JRuby in 1.8 mode
 - jruby-19mode # JRuby in 1.9 mode
-- rbx-18mode
-- rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
 # # script: bundle exec rspec spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.8)
+    frameworks-capybara (0.2.9)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)

data/lib/frameworks/capybara.rb

@@ -4,6 +4,7 @@ require 'monkey-patches/capybara-patches'
 require 'monkey-patches/capybara-mechanize-patches'
 require 'monkey-patches/mechanize-patches'
 require 'monkey-patches/send-keys'
+require 'monkey-patches/net-http-persistent-patches'
 require 'selenium-webdriver'
 require 'capybara/mechanize/cucumber' 
 require 'capybara/celerity'

data/lib/monkey-patches/net-http-persistent-patches.rb

@@ -0,0 +1,72 @@
+#Adding no_proxy_host logic for Mechanize2 which uses this
+#gem for it's HTTP client logic
+#TODO: Grab from envirnment variable optionally, or provide list
+class Net::HTTP::Persistent
+
+  ##
+  # Creates a new connection for +uri+
+  def connection_for uri
+    Thread.current[@generation_key]     ||= Hash.new { |h,k| h[k] = {} }
+    Thread.current[@ssl_generation_key] ||= Hash.new { |h,k| h[k] = {} }
+    Thread.current[@request_key]        ||= Hash.new 0
+    Thread.current[@timeout_key]        ||= Hash.new EPOCH
+
+    use_ssl = uri.scheme.downcase == 'https'
+
+    if use_ssl then
+      ssl_generation = @ssl_generation
+
+      ssl_cleanup ssl_generation
+
+      connections = Thread.current[@ssl_generation_key][ssl_generation]
+    else
+      generation = @generation
+
+      cleanup generation
+
+      connections = Thread.current[@generation_key][generation]
+    end
+
+    net_http_args = [uri.host, uri.port]
+    connection_id = net_http_args.join ':'
+    #
+    #Frameworks patch (and condition)
+    if @proxy_uri and !uri.host.include? 'sandbox' then
+      connection_id << @proxy_connection_id
+      net_http_args.concat @proxy_args
+    end
+
+    connection = connections[connection_id]
+
+    unless connection = connections[connection_id] then
+      connections[connection_id] = http_class.new(*net_http_args)
+      connection = connections[connection_id]
+      ssl connection if use_ssl
+    else
+      reset connection if expired? connection
+    end
+
+    unless connection.started? then
+      connection.set_debug_output @debug_output if @debug_output
+      connection.open_timeout = @open_timeout if @open_timeout
+      connection.read_timeout = @read_timeout if @read_timeout
+
+      connection.start
+
+      socket = connection.instance_variable_get :@socket
+
+      if socket then # for fakeweb
+        @socket_options.each do |option|
+          socket.io.setsockopt(*option)
+        end
+      end
+    end
+
+    connection
+  rescue Errno::ECONNREFUSED
+    raise Error, "connection refused: #{connection.address}:#{connection.port}"
+  rescue Errno::EHOSTDOWN
+    raise Error, "host down: #{connection.address}:#{connection.port}"
+  end
+end
+

data/lib/monkey-patches/webdriver-patches.rb

@@ -33,3 +33,29 @@ module Selenium
     end
   end
 end
+
+#Workaround for http://code.google.com/p/selenium/issues/detail?id=4007
+module Selenium
+  module WebDriver
+    module Remote
+      module Http
+        class Default
+          def new_http_client
+            if @proxy
+              unless @proxy.respond_to?(:http) && url = @proxy.http
+                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
+              end
+
+              proxy = URI.parse(url)
+
+              clazz = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
+              clazz.new(server_url.host, server_url.port)
+            else
+              Net::HTTP.new server_url.host, server_url.port
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - matt robbins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 +01:00
+date: 2012-06-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,6 +165,7 @@ files:
 - lib/monkey-patches/capybara-patches.rb
 - lib/monkey-patches/cucumber-patches.rb
 - lib/monkey-patches/mechanize-patches.rb
+- lib/monkey-patches/net-http-persistent-patches.rb
 - lib/monkey-patches/send-keys.rb
 - lib/monkey-patches/webdriver-patches.rb
 - lib/tasks/frameworks-tasks.rb