capybara-typhoeus 0.2.3 → 0.2.4

data/lib/capybara/driver/typhoeus_driver.rb

@@ -13,7 +13,7 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
   def client
     @client ||= Typhoeus::Hydra.new
   end
-  
+
   def initialize(app, options={})
     @app = app
     @options = options
@@ -25,7 +25,7 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     reset_cache
     process :get, url, params
   end
-  
+
   def get(url, params = {}, headers = {})
     reset_cache
     process :get, url, params, headers
@@ -60,7 +60,7 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     reset_cache
     process :request, url, params, headers
   end
-  
+
   def submit(method, path, attributes)
     path = request.path if not path or path.empty?
     process method.to_sym, path, attributes
@@ -69,24 +69,24 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
   def find(selector)
     dom.xpath(selector).map { |node| Node.new(self, node) }
   end
-  
+
   def html
     @html ||= Nokogiri::HTML body
   end
-  
+
   def xml
     @xml ||= Nokogiri::XML body
   end
-  
+
   def json
     @json ||= Yajl::Parser.parse body
   end
-  
+
   def body
     response.body
   end
   alias_method :source, :body
-  
+
   def response_headers
     response.headers_hash
   end
@@ -94,28 +94,28 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
   def status_code
     response.code
   end
-  
+
   def current_url
     @current_uri.to_s
   end
-  
+
   def reset!
     @client = nil
     @response = nil
     @current_uri = nil
     reset_cache
   end
-  
+
   def reset_with!
     @with_headers = {}
     @with_params = {}
     @with_options = {}
   end
-  
+
   def as
     @as ||= "application/json"
   end
-  
+
   def with_headers
     @with_headers ||= {}
   end
@@ -144,8 +144,11 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     request = Typhoeus::Request.new @current_uri, with_options.merge(opts)
     client.queue request
     client.run
+    # $stdout.puts request.inspect
     @response = request.response
+    # $stdout.puts response.inspect
     if @response.timed_out?
+      `open #{@current_uri}`
       $stderr.puts "#{method.to_s.upcase} #{@current_uri}: time out"
     elsif @response.code==0
       $stderr.puts "#{method.to_s.upcase} #{@current_uri}: #{@response.curl_error_message}"
@@ -177,4 +180,4 @@ private
     @json = nil
   end
 
-end
+end

data/lib/capybara/typhoeus.rb

@@ -1,3 +1,5 @@
+require "capybara"
+
 module Capybara
   module Driver
     autoload :Typhoeus, 'capybara/driver/typhoeus_driver'
@@ -6,4 +8,4 @@ end
 
 Capybara.register_driver :typhoeus do |app|
   Capybara::Driver::Typhoeus.new(app)
-end
+end

data/spec/session/typhoeus_spec.rb

@@ -10,6 +10,14 @@ describe Capybara::Session do
       @session = TestSessions::Typhoeus
     end
 
+    after do
+      @session.reset_session!
+    end
+
+    def extract_results(session)
+      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text
+    end
+
     describe '#driver' do
       it "should be a typhoeus driver" do
         @session.driver.should be_an_instance_of Capybara::Driver::Typhoeus
@@ -22,14 +30,6 @@ describe Capybara::Session do
       end
     end
 
-    def extract_results(session)
-      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text
-    end
-
-    after do
-      @session.reset!
-    end
-
     describe '#app' do
       it "should remember the application" do
         @session.app.should == TestApp
@@ -67,7 +67,6 @@ describe Capybara::Session do
     it_should_behave_like "find_by_id"
     it_should_behave_like "has_content"
     it_should_behave_like "has_css"
-    it_should_behave_like "has_css"
     it_should_behave_like "has_selector"
     it_should_behave_like "has_xpath"
     it_should_behave_like "has_link"

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 require 'capybara'
 require 'capybara/typhoeus'
-require 'capybara/spec/extended_test_app'
+require 'capybara/spec/test_app'
 require 'capybara/spec/driver'
 require 'capybara/spec/session'
 
@@ -13,4 +13,4 @@ RSpec.configure do |config|
   config.after do
     Capybara.default_selector = :xpath
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,41 +10,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-22 00:00:00.000000000Z
+date: 2011-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70241745236780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70241745236780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70241745235680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70241745235680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70241745234580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241745234580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Typhoeus driver for Capybara, allowing testing of REST APIs
 email: joseph.halter@thetalentbox.com
 executables: []
@@ -52,7 +131,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/capybara/driver/typhoeus_driver.rb
-- lib/capybara/spec/extended_test_app.rb
 - lib/capybara/typhoeus/cucumber.rb
 - lib/capybara/typhoeus.rb
 - spec/driver/typhoeus_driver_spec.rb
@@ -72,6 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3419795448248900470
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Typhoeus driver for Capybara
 test_files: []
-has_rdoc: 

data/lib/capybara/spec/extended_test_app.rb

@@ -1,17 +0,0 @@
-require 'capybara/spec/test_app'
-
-class ExtendedTestApp < TestApp
-  set :environment, :production
-  
-  get %r{/redirect_to/(.*)} do
-    redirect params[:captures]
-  end
-  
-  get '/host' do
-    "current host is #{request.host}"
-  end
-end
-
-if __FILE__ == $0
-  Rack::Handler::Mongrel.run ExtendedTestApp, :Port => 8070
-end