bbc-capybara-mechanize 0.4.1 → 0.4.2

data/lib/capybara/mechanize/browser.rb

@@ -14,9 +14,14 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     @agent.redirect_ok = false
     @agent.user_agent = default_user_agent
     if !driver.options.empty?
-      if driver.options[:certificate] && driver.options[:certificate][:key] && driver.options[:certificate][:cer]
-        @agent.cert = driver.options[:certificate][:cer]
-        @agent.key = driver.options[:certificate][:key]
+      if driver.options[:certificate]
+        if !driver.options[:certificate].is_a? Hash
+          @agent.cert = driver.options[:certificate].certificate
+          @agent.key = driver.options[:certificate].key
+        elsif driver.options[:certificate][:key] && driver.options[:certificate][:cer]
+          @agent.cert = driver.options[:certificate][:cer]
+          @agent.key = driver.options[:certificate][:key]
+        end
       end
       if driver.options[:user_agent]
         @agent.user_agent = driver.options[:user_agent]

data/lib/capybara/mechanize/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Mechanize
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/spec/session/mechanize_spec.rb

@@ -94,4 +94,5 @@ describe Capybara::Session do
     end
     
   end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bbc-capybara-mechanize
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Jeroen van Dijk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -24,16 +24,16 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 25
         segments: 
+        - 2
+        - 5
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.5.1
   prerelease: false
-  requirement: *id001
-  name: mechanize
   type: :runtime
+  name: mechanize
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,9 +47,9 @@ dependencies:
         - 2
         version: 1.1.2
   prerelease: false
-  requirement: *id002
-  name: capybara
   type: :runtime
+  name: capybara
+  requirement: *id002
 description: RackTest driver for Capybara, but with remote request support thanks to mechanize
 email: jeroen@jeevidee.nl
 executables: []
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RackTest driver for Capybara with remote request support