capybara-typhoeus 0.2.12 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d47a174ccfacb40f34d85580cc59edeb5504498
+  data.tar.gz: 4c68438940a7ced8999b840e73a31badc8bc8ce3
+SHA512:
+  metadata.gz: 0ba0d5e3e65479ef80b00bde6be3ee9cd1c6330352412f723e708fd248b961a14cac7db6dd05e848d165161752cdd469ac2ebd3a972f53271318671a0d9587c4
+  data.tar.gz: fb8a7ab2d5cd59c3454ebf3abb13b09140c3d6ea65e37ca3445c2ffb0b2adfce6df123e99a3137b0f74fdfd0224570c9fdf86057bd2bb1f6631dba5cb9cd57cc

data/lib/capybara/typhoeus.rb

@@ -1,11 +1,23 @@
 require "capybara"
+require "typhoeus"
 
 module Capybara
-  module Driver
-    autoload :Typhoeus, 'capybara/driver/typhoeus_driver'
+  module Typhoeus
+    autoload :Driver, "capybara/typhoeus/driver"
+    autoload :Browser, "capybara/typhoeus/browser"
+    autoload :Session, "capybara/typhoeus/session"
+  end
+
+  def current_session
+    key = "#{current_driver}:#{session_name}:#{app.object_id}"
+    session_pool[key] ||= if current_driver==:typhoeus
+      ::Capybara::Typhoeus::Session.new current_driver, app
+    else
+      ::Capybara::Session.new current_driver, app
+    end
   end
 end
 
 Capybara.register_driver :typhoeus do |app|
-  Capybara::Driver::Typhoeus.new(app)
+  Capybara::Typhoeus::Driver.new app
 end

data/lib/capybara/typhoeus/browser.rb

@@ -0,0 +1,105 @@
+module Typhoeus
+  class Response
+    def redirect?
+      [301, 302, 303, 307].include? code
+    end
+
+    def [](key)
+      headers[key]
+    end
+  end
+end
+
+class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
+
+  attr_reader :last_response, :client
+
+  def initialize(driver)
+    @client = Typhoeus::Hydra.new
+    super
+  end
+
+  def reset_cache!
+    @xml = nil
+    @json = nil
+    super
+  end
+
+  def current_url
+    last_response ? last_response.effective_url : ""
+  end
+
+  def dom
+    @dom ||= begin
+      content_type = if last_response
+        last_response.headers["Content-Type"].to_s[/\A[^;]+/]
+      else
+        ""
+      end
+      if content_type.include? "/xml"
+        xml
+      else
+        Nokogiri::HTML html
+      end
+    end
+  end
+
+  def html
+    last_response ? last_response.body : ""
+  end
+
+  def xml
+    @xml ||= Nokogiri::XML html
+  end
+
+  def json
+    @json ||= Yajl::Parser.parse html
+  end
+
+  [:get, :post, :put, :delete, :head, :patch, :request].each do |method|
+    define_method(method) do |url, params={}, headers={}, &block|
+      uri = URI.parse url
+      opts = driver.with_options
+      opts[:method] = method
+      opts[:headers] = driver.with_headers.merge(
+        headers.merge("Content-Type" => driver.as, "Accept" => driver.as)
+      )
+      referer = opts[:headers].delete "HTTP_REFERER"
+      opts[:headers]["Referer"] = referer if referer
+      opts[:headers]["Cookie"] ||= cookie_jar.for uri
+      driver.options.each do |key, value|
+        next if Capybara::RackTest::Driver::DEFAULT_OPTIONS.has_key? key
+        opts[key] = value
+      end
+      if driver.auth?
+        opts[:httpauth] = :basic
+        opts[:userpwd] = "#{driver.login}:#{driver.password}"
+      end
+      if params.is_a? Hash
+        opts[:params] = driver.with_params.merge(params)
+      else
+        opts[:params] = driver.with_params
+        opts[:body] = params
+      end
+      request = Typhoeus::Request.new uri.to_s, opts
+      client.queue request
+      client.run
+      @last_response = request.response
+      if last_response.timed_out?
+        $stderr.puts "#{method.to_s.upcase} #{uri.to_s}: time out" if $DEBUG
+      elsif last_response.code==0
+        $stderr.puts "#{method.to_s.upcase} #{uri.to_s}: #{last_response.return_message}" if $DEBUG
+      else
+        cookie_jar.merge last_response.headers["Set-Cookie"], uri
+      end
+      last_response
+    end
+  end
+
+private
+
+  def cookie_jar
+    @cookie_jar ||= Rack::Test::CookieJar.new [], current_host
+  end
+
+end

data/lib/capybara/typhoeus/cucumber.rb

@@ -1,6 +1,6 @@
-require 'capybara/typhoeus'
+require "capybara/typhoeus"
 
-Before('@typhoeus') do
+Before "@typhoeus" do
   Capybara.current_driver = :typhoeus
   page.driver.reset_with!
-end
+end

data/lib/capybara/typhoeus/driver.rb

@@ -0,0 +1,83 @@
+class Capybara::Typhoeus::Driver < Capybara::RackTest::Driver
+
+  attr_writer :as, :with_headers, :with_params, :with_options
+  attr_reader :login, :password
+
+  def initialize(app, options = {})
+    raise ArgumentError, "typhoeus requires a rack application, but none was given" unless app
+    super app, {timeout: 3, forbid_reuse: true}.merge(options)
+  end
+
+  def browser
+    @browser ||= Capybara::Typhoeus::Browser.new self
+  end
+
+  def needs_server?
+    true
+  end
+
+  [:get, :post, :put, :delete, :head, :patch, :request].each do |method|
+    define_method(method) do |url, params={}, headers={}, &block|
+      browser.reset_host!
+      browser.process method, url, params, headers, &block
+    end
+  end
+
+  def reset!
+    @login = nil
+    @password = nil
+    super
+  end
+
+  def timed_out?
+    response.timed_out?
+  end
+
+  def reset_with!
+    @with_headers = {}
+    @with_params = {}
+    @with_options = {}
+    @as = nil
+  end
+
+  def as
+    @as ||= "application/json"
+  end
+
+  def with_headers
+    @with_headers ||= {}
+  end
+
+  def with_params
+    @with_params ||= {}
+  end
+
+  def with_options
+    @with_options ||= {}
+  end
+
+  def authenticate_with(login, password)
+    @login, @password = login, password
+  end
+
+  def auth?
+    login && password
+  end
+
+  def status_code
+    response.code
+  end
+
+  def body
+    browser.html
+  end
+
+  def xml
+    browser.json
+  end
+
+  def json
+    browser.json
+  end
+
+end

data/lib/capybara/typhoeus/session.rb

@@ -0,0 +1,33 @@
+class Capybara::Typhoeus::Session < Capybara::Session
+
+  [:get, :post, :put, :delete, :head, :patch, :request].each do |method|
+    define_method(method) do |url, params={}, headers={}, &block|
+      @touched = true
+
+      if url !~ /^http/ and Capybara.app_host
+        url = Capybara.app_host + url.to_s
+      end
+
+      if @server
+        url = "http://#{@server.host}:#{@server.port}" + url.to_s unless url =~ /^http/
+
+        if Capybara.always_include_port
+          uri = URI.parse url
+          uri.port = @server.port if uri.port == uri.default_port
+          url = uri.to_s
+        end
+      end
+
+      driver.send method, url, params, headers, &block
+    end
+  end
+
+  def authenticate_with(login, password)
+    driver.authenticate_with login, password
+  end
+
+  def timed_out?
+    driver.timed_out?
+  end
+
+end

data/spec/session/typhoeus_spec.rb

@@ -1,82 +1,72 @@
-require 'spec_helper'
+require "spec_helper"
 
-module TestSessions
-  Typhoeus = Capybara::Session.new :typhoeus, TestApp
+Capybara.register_driver :typhoeus_with_custom_timeout do |app|
+  Capybara::Typhoeus::Driver.new app, timeout: 1
 end
 
-describe Capybara::Session do
-  context 'with typhoeus driver' do
-    before(:all) do
-      @session = TestSessions::Typhoeus
-    end
-
-    after do
-      @session.reset_session!
-    end
+describe Capybara::Typhoeus::Session do
 
-    def extract_results(session)
-      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text
-    end
+  Capybara::SpecHelper.run_specs described_class.new(:typhoeus, TestApp), "Typhoeus", skip: [
+    :js,
+    :screenshot,
+    :frames,
+    :windows,
+    :server,
+    :hover
+  ]
 
-    describe '#driver' do
-      it "should be a typhoeus driver" do
-        @session.driver.should be_an_instance_of Capybara::Driver::Typhoeus
+  context "with typhoeus driver" do
+    context "basic authentication" do
+      subject do
+        app = Sinatra.new do
+          use Rack::Auth::Basic do |username, password|
+            username=="admin" && password=="secret"
+          end
+          get("/"){ "Success!" }
+        end
+        described_class.new :typhoeus, app
       end
-    end
 
-    describe '#mode' do
-      it "should remember the mode" do
-        @session.mode.should == :typhoeus
+      it "allow access with right credentials" do
+        subject.authenticate_with "admin", "secret"
+        subject.get "/"
+        subject.status_code.should be 200
+        subject.source.should == "Success!"
       end
-    end
 
-    describe '#app' do
-      it "should remember the application" do
-        @session.app.should == TestApp
+      it "deny access with wrong credentials" do
+        subject.authenticate_with "admin", "admin"
+        subject.get "/"
+        subject.status_code.should be 401
       end
     end
 
-    describe '#visit' do
-      it "should fetch a response from the driver" do
-        @session.visit('/')
-        @session.body.should include('Hello world!')
-        @session.visit('/foo')
-        @session.body.should include('Another World')
-      end
-    end
+    context "timeout" do
+      context "default" do
+        subject{ described_class.new :typhoeus, TestApp }
+
+        it "is 3 seconds" do
+          subject.driver.options[:timeout].should == 3
+        end
 
-    describe '#body' do
-      it "should return the unmodified page body" do
-        @session.visit('/')
-        @session.body.should include('Hello world!')
+        it "is used during request" do
+          subject.get "/slow_response"
+          subject.should_not be_timed_out
+        end
       end
-    end
 
-    describe '#source' do
-      it "should return the unmodified page source" do
-        @session.visit('/')
-        @session.source.should include('Hello world!')
+      context "accepts custom timeout" do
+        subject{ described_class.new :typhoeus_with_custom_timeout, TestApp }
+
+        it "is stored in options" do
+          subject.driver.options[:timeout].should == 1
+        end
+
+        it "is used during request" do
+          subject.get "/slow_response"
+          subject.should be_timed_out
+        end
       end
     end
-
-    it_should_behave_like "all"
-    it_should_behave_like "first"
-    it_should_behave_like "find_button"
-    it_should_behave_like "find_field"
-    it_should_behave_like "find_link"
-    it_should_behave_like "find_by_id"
-    it_should_behave_like "has_content"
-    it_should_behave_like "has_css"
-    it_should_behave_like "has_selector"
-    it_should_behave_like "has_xpath"
-    it_should_behave_like "has_link"
-    it_should_behave_like "has_button"
-    it_should_behave_like "has_field"
-    it_should_behave_like "has_select"
-    it_should_behave_like "has_table"
-    it_should_behave_like "current_url"
-    it_should_behave_like "session without javascript support"
-    it_should_behave_like "session with headers support"
-    it_should_behave_like "session with status code support"
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,28 @@
-require 'bundler/setup'
-require 'capybara'
-require 'capybara/typhoeus'
-require 'capybara/spec/test_app'
-require 'capybara/spec/driver'
-require 'capybara/spec/session'
+require "bundler/setup"
+require "capybara/typhoeus"
+require "capybara/spec/spec_helper"
 
-alias :running :lambda
-
-Capybara.default_wait_time = 0 # less timeout so tests run faster
+module Capybara
+  module SpecHelper
+    class << self
+      alias_method :run_specs_without_skip, :run_specs
+      def run_specs(session, name, options={})
+        skip = [
+          "#attach_file",
+          "#check",
+          "#click_button",
+          "#click_link",
+          "#select",
+          "#uncheck",
+          "#unselect",
+        ]
+        @specs.reject!{|spec| skip.include? spec.first}
+        run_specs_without_skip session, name, options
+      end
+    end
+  end
+end
 
 RSpec.configure do |config|
-  config.after do
-    Capybara.default_selector = :xpath
-  end
+  Capybara::SpecHelper.configure config
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -14,131 +13,119 @@ date: 2011-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
-    none: false
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
-    none: false
-  prerelease: false
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.3
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.3
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rack
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: sinatra
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 description: Typhoeus driver for Capybara, allowing testing of REST APIs
 email: joseph.halter@thetalentbox.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/capybara/driver/typhoeus_driver.rb
+- lib/capybara/typhoeus/browser.rb
 - lib/capybara/typhoeus/cucumber.rb
+- lib/capybara/typhoeus/driver.rb
+- lib/capybara/typhoeus/session.rb
 - lib/capybara/typhoeus.rb
-- spec/driver/typhoeus_driver_spec.rb
 - spec/session/typhoeus_spec.rb
 - spec/spec_helper.rb
 - README.md
 homepage: https://github.com/TalentBox/capybara-typhoeus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -146,23 +133,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 1272068252246424913
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Typhoeus driver for Capybara
 test_files: []

data/lib/capybara/driver/typhoeus_driver.rb

@@ -1,196 +0,0 @@
-require "typhoeus"
-
-class Capybara::Driver::Typhoeus < Capybara::Driver::Base
-  class Node < Capybara::RackTest::Node
-    def click
-      driver.process(:get, self[:href].to_s) if self[:href] && self[:href] != ""
-    end
-  end
-
-  attr_writer :as, :with_headers, :with_params, :with_options
-  attr_reader :app, :rack_server, :options, :response, :login, :password
-
-  def client
-    @client ||= Typhoeus::Hydra.new
-  end
-
-  def initialize(app, options={})
-    @app = app
-    @options = {
-      :timeout => 3, # 3 seconds
-      :forbid_reuse => true,
-    }.merge options
-    @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot if Capybara.run_server
-  end
-
-  def visit(url, params = {})
-    reset_cache
-    process :get, url, params
-  end
-
-  def get(url, params = {}, headers = {})
-    reset_cache
-    process :get, url, params, headers
-  end
-
-  def post(url, params = {}, headers = {})
-    reset_cache
-    process :post, url, params, headers
-  end
-
-  def put(url, params = {}, headers = {})
-    reset_cache
-    process :put, url, params, headers
-  end
-
-  def delete(url, params = {}, headers = {})
-    reset_cache
-    process :delete, url, params, headers
-  end
-
-  def head(url, params = {}, headers = {})
-    reset_cache
-    process :head, url, params, headers
-  end
-
-  def patch(url, params = {}, headers = {})
-    reset_cache
-    process :patch, url, params, headers
-  end
-
-  def request(url, params = {}, headers = {})
-    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
-  end
-
-  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
-  end
-
-  def status_code
-    response.code
-  end
-
-  def current_url
-    @current_uri.to_s
-  end
-
-  def reset!
-    @client = nil
-    @response = nil
-    @current_uri = nil
-    @login = nil
-    @password = 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
-
-  def with_params
-    @with_params ||= {}
-  end
-
-  def with_options
-    @with_options ||= {}
-  end
-
-  def authenticate_with(login, password)
-    @login, @password = login, password
-  end
-
-  def auth?
-    login && password
-  end
-
-  def process(method, path, params = {}, headers = {})
-    @current_uri = url path
-    opts = {
-      :method => method,
-      :headers => with_headers.merge(headers.merge("Content-Type" => as, "Accept" => as)),
-    }.merge(options)
-    opts.merge!({
-      :userpwd => "#{login}:#{password}",
-      :httpauth => :basic,
-    }) if auth?
-    if params.is_a?(Hash)
-      opts[:params] = with_params.merge(params)
-    else
-      opts[:params] = with_params
-      opts[:body] = params
-    end
-    request = Typhoeus::Request.new @current_uri, with_options.merge(opts)
-    client.queue request
-    client.run
-    @response = request.response
-    if @response.timed_out?
-      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: time out" if $DEBUG
-    elsif @response.code==0
-      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: #{@response.curl_error_message}" if $DEBUG
-    end
-    @response
-  end
-
-  def url(path)
-    rack_server.url(path)
-  end
-
-  def dom
-    content_type = response_headers["Content-Type"]
-    case content_type.to_s[/\A[^;]+/]
-    when "application/xml", "text/xml"
-      xml
-    when "text/html"
-      html
-    else
-      raise "Content-Type: #{content_type} is not handling xpath search"
-    end
-  end
-
-private
-
-  def reset_cache
-    @xml = nil
-    @html = nil
-    @json = nil
-  end
-
-end

data/spec/driver/typhoeus_driver_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe Capybara::Driver::Typhoeus do
-  before do
-    @driver = described_class.new TestApp
-  end
-
-  context "in remote mode" do
-    it_should_behave_like "driver"
-    it_should_behave_like "driver with header support"
-    it_should_behave_like "driver with status code support"
-    # neither supports cookies nor follows redirect automatically
-  end
-
-  context "basic authentication" do
-    subject do
-      app = Sinatra.new do
-        use Rack::Auth::Basic do |username, password|
-          username=="admin" && password=="secret"
-        end
-        get("/"){ "Success!" }
-      end
-      described_class.new app
-    end
-
-    it "allow access with right credentials" do
-      subject.authenticate_with "admin", "secret"
-      subject.get "/"
-      subject.status_code.should be 200
-      subject.source.should == "Success!"
-    end
-
-    it "deny access with wrong credentials" do
-      subject.authenticate_with "admin", "admin"
-      subject.get "/"
-      subject.status_code.should be 401
-    end
-  end
-
-  context "timeout" do
-    context "default" do
-      subject do
-        driver = described_class.new TestApp
-      end
-
-      it "is 3 seconds" do
-        subject.options[:timeout].should == 3
-      end
-
-      it "is used during request" do
-        response = subject.get "/slow_response"
-        response.should_not be_timed_out
-      end
-    end
-
-    context "accepts custom timeout" do
-      subject do
-        driver = described_class.new TestApp, timeout: 1
-      end
-
-      it "is stored in options" do
-        subject.options[:timeout].should == 1
-      end
-
-      it "is used during request" do
-        response = subject.get "/slow_response"
-        response.should be_timed_out
-      end
-    end
-  end
-
-end