frameworks-capybara 0.2.16 → 0.2.17

data/Gemfile.lock

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

data/lib/frameworks/cucumber.rb

@@ -49,7 +49,7 @@ module Frameworks
       end
 
       proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
-      @proxy_host = proxy.scan(/http:\/\/(.*):80/)[0][0] if proxy
+      @proxy_host = proxy.scan(/http:\/\/(.*):80/)[0][0] if proxy && !proxy.empty?
     end
 
     def validate_online(src)
@@ -89,6 +89,27 @@ module Frameworks
       @static_sandbox = "#{scheme}://static.sandbox.dev"
     end
 
+    def setup_mechanize(agent, http_proxy=nil)
+      http_proxy = http_proxy || ENV['HTTP_PROXY'] || ENV['http_proxy']
+
+      if ENV['FW_CERT_LOCATION']
+        agent.cert, agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] 
+      end
+
+      agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
+      agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
+
+      #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
+      agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+
+    def new_mechanize(http_proxy=nil)
+      require 'mechanize'
+      agent = Mechanize.new
+      setup_mechanize(agent, http_proxy)
+      agent
+    end
+
   end #EnvHelper
 end #Frameworks
 
@@ -100,22 +121,7 @@ World(Frameworks::EnvHelper)
 Before do
   #This is ugly but unavoidable since Capybara::RackTest::Driver.reset_host! does @browser = nil and wipes all brower level settings
   #it was either this or a monkey patch - need to think about pushing a softer reset change to capybara-mechanize to override this
-  http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
-  if page.driver.class == Capybara::Mechanize::Driver
-
-    if ENV['FW_CERT_LOCATION']
-      page.driver.browser.agent.cert, page.driver.browser.agent.key = 
-        ENV['FW_CERT_LOCATION'],
-        ENV['FW_CERT_LOCATION'] 
-    end
-
-    page.driver.browser.agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
-
-    page.driver.browser.agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/).to_s,80) if http_proxy
-
-    #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
-    page.driver.browser.agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
+  setup_mechanize(page.driver.browser.agent) if page.driver.class == Capybara::Mechanize::Driver
 
   generate_base_urls
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.16'
+  VERSION = '0.2.17'
 end

data/spec/frameworks_cucumber_spec.rb

@@ -136,5 +136,23 @@ describe Frameworks::EnvHelper do
       validate_online(xhtml)
     end
 =end
+  end
+
+    describe "independent mechanize agent" do
+    include Frameworks::EnvHelper
+
+    it "should allow you to create an independent, configured mechanize object" do
+      ENV['HTTP_PROXY'] = 'http://mycache.co.uk:80'
+      agent = new_mechanize
+      agent.should be_a_kind_of Mechanize
+      agent.proxy_addr.should == 'mycache.co.uk'
+    end
+
+    it "the proxy should be separately configurable" do
+      agent = new_mechanize(http_proxy='http://mycache.co.uk:80')
+      agent.should be_a_kind_of Mechanize
+      agent.proxy_addr.should == 'mycache.co.uk'
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 2
-  - 16
-  version: 0.2.16
+  - 17
+  version: 0.2.17
 platform: ruby
 authors: 
 - matt robbins
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 +01:00
+date: 2012-07-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: capybara
   version_requirements: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: capybara
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +46,11 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  name: capybara-mechanize
   version_requirements: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: capybara-mechanize
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
   version_requirements: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: json
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +74,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: headless
   version_requirements: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: headless
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,11 +88,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: capybara-celerity
   version_requirements: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: capybara-celerity
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,11 +102,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: w3c_validators
   version_requirements: *id006
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: w3c_validators
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -119,11 +118,11 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  name: cucumber
   version_requirements: *id007
   prerelease: false
+  name: cucumber
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -133,11 +132,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
   version_requirements: *id008
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  name: rake
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -149,9 +148,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: rspec
   version_requirements: *id009
   prerelease: false
+  name: rspec
+  type: :development
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: 
 - mcrobbins@gmail.com