capybara-json 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.3
+* ENHANCEMENT
+    * creae :httpclient_json driver
+
 ## 0.0.2
 * ENHANCEMENT
     * support capybara < 1.0

data/README.md

@@ -18,13 +18,17 @@ testing web application
     body   #=> parsed json response
     source #=> raw response body
 
+    Capybara.current_driver = :httpclient_json
+
+    post 'http://example.jp/', { "this is" => "json" }
+    body   #=> parsed json response
+    source #=> raw response body
+
 ## ROADMAP
 
 * 0.0.1
     * create :rack_test_json driver which supports normal json response (2xx, 3xx)
 * 0.0.3
-    * create :httpclient driver for remote testing
-* 0.0.4
     * create :httpclient_json driver with the same interface with :rack_test_json in normal json response
 * 0.1.0
     * ensure :rack_test_json and :httpclient_json has the same interface in error response (4xx, 5xx)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/capybara-json.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   [ [ 'capybara' ],
+    [ 'httpclient' ],
     [ 'multi_json' ],
   ].each do |gem, version|
     s.add_runtime_dependency gem, version

data/lib/capybara/httpclient_json/driver.rb

@@ -0,0 +1,76 @@
+require 'httpclient'
+
+class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
+  attr_reader :app, :current_url, :rack_server, :response, :cookies
+
+  def client
+    unless @client
+      @client = HTTPClient.new
+      @client.follow_redirect_count  = 5 + 1 # allows 5 redirection
+      @client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    @client
+  end
+
+  def initialize(app)
+    @app = app
+    @rack_server = Capybara::Server.new(@app)
+    @rack_server.boot if Capybara.run_server
+  end
+
+  def status_code
+    response.code
+  end
+
+  def source
+    response.body
+  end
+
+  def body
+    MultiJson.decode(source) || {}
+  end
+
+  def response_headers
+    response.headers
+  end
+
+  def get(url, params = {}, headers = {})
+    process :get, url, params, headers, true # follow_redirect
+  end
+  alias visit get
+
+  def post(url, json, headers = {})
+    json = MultiJson.encode(json) unless json.is_a?(String)
+    headers['Content-Type'] = "application/json; charset=#{json.encoding.to_s.downcase}"
+    process :post, url, json, headers, true # follow_redirect
+  end
+
+  def put(url, json, headers = {})
+    json = MultiJson.encode(json) unless json.is_a?(String)
+    headers['Content-Type'] = "application/json; charset=#{json.encoding.to_s.downcase}"
+    process :put, url, json, headers
+  end
+
+  def delete(url, params = {}, headers = {})
+    process :delete, url, params, headers
+  end
+  
+  def reset!
+    @client = nil
+  end
+
+  protected
+  def process(method, path, params = {}, headers = {}, options = {})
+    @current_url = @rack_server.url(path)
+
+    begin
+      @response = client.__send__(method, @current_url, params, headers, options)
+    rescue HTTPClient::BadResponseError => e
+      raise Capybara::InfiniteRedirectError
+    end
+  end
+  
+  def url_for(path)
+    path
+  end
+end

data/lib/capybara/json.rb

@@ -1,6 +1,8 @@
 require 'capybara'
 require 'capybara/dsl'
 
+require 'multi_json'
+
 module Capybara
   module Json
     def self.to_include
@@ -32,8 +34,16 @@ module Capybara
   module RackTestJson
     autoload :Driver, 'capybara/rack_test_json/driver'
   end
+
+  module HTTPClientJson
+    autoload :Driver, 'capybara/httpclient_json/driver'
+  end
 end
 
 Capybara.register_driver :rack_test_json do |app|
   Capybara::RackTestJson::Driver.new(app)
 end
+
+Capybara.register_driver :httpclient_json do  |app|
+  Capybara::HTTPClientJson::Driver.new(app)
+end

data/lib/capybara/rack_test_json/driver.rb

@@ -1,5 +1,3 @@
-require 'multi_json'
-
 to_inherit = Capybara.const_defined?("RackTest") ? Capybara::RackTest::Driver : Capybara::Driver::RackTest
 
 class Capybara::RackTestJson::Driver < to_inherit

data/spec/capybara/httpclient_json/driver_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+klass = Capybara::HTTPClientJson::Driver
+
+describe klass do
+  before { @driver = described_class.new(JsonTestApp) }
+
+  it_should_behave_like 'driver'
+  it_should_behave_like 'driver with header support'
+  it_should_behave_like 'driver with status code support'
+  it_should_behave_like 'driver with cookies support'
+  it_should_behave_like 'driver with infinite redirect detection'
+
+  it_should_behave_like 'driver to post json'
+  it_should_behave_like 'driver to put json'
+end

data/spec/capybara/json_spec.rb

@@ -1,43 +1,45 @@
 require 'spec_helper'
 
-describe "to require 'capybara/json'" do
-  it 'should register driver' do
-    Capybara.drivers.should have_key(:rack_test_json)
-  end
-end
-
-describe Capybara::Json do
-  include described_class
-
-  before(:all) do
-    Capybara.app = JsonTestApp
-    Capybara.current_driver = :rack_test_json
-  end
-
-  after(:all) do
-    Capybara.app = nil
-    Capybara.current_driver = Capybara.default_driver
-  end
-
-  %w[ get delete ].each do |method|
-    it "register #{method}" do
-      __send__(method, '/')
-      body.should == { 'Hello world!' => 'Hello world!' }
+[ :rack_test_json, :httpclient_json ].each do |driver|
+  describe "to require 'capybara/json'" do
+    it "should register driver #{driver}" do
+      Capybara.drivers.should have_key(driver)
     end
   end
 
-  %w[ post put ].each do |method|
-    it "register #{method}" do
-      __send__(method, '/', {})
-      body.should == { 'Hello world!' => 'Hello world!' }
+  describe Capybara::Json do
+    include described_class
+    
+    before(:all) do
+      Capybara.app = JsonTestApp
+      Capybara.current_driver = driver
     end
-
-    it "#{method} send json" do
-      json = { "some" => "args" }
-      __send__(method, '/env', json)
-
-      body['content_type'].should =~ %r"application/json"
-      body['rack.input'].should == MultiJson.encode(json)
+    
+    after(:all) do
+      Capybara.app = nil
+      Capybara.current_driver = Capybara.default_driver
+    end
+    
+    %w[ get delete ].each do |method|
+      it "register #{method}" do
+        __send__(method, '/')
+        body.should == { 'Hello world!' => 'Hello world!' }
+      end
+    end
+    
+    %w[ post put ].each do |method|
+      it "register #{method}" do
+        __send__(method, '/', {})
+        body.should == { 'Hello world!' => 'Hello world!' }
+      end
+      
+      it "#{method} send json" do
+        json = { "some" => "args" }
+        __send__(method, '/env', json)
+        
+        body['content_type'].should =~ %r"application/json"
+        body['rack.input'].should == MultiJson.encode(json)
+      end
     end
   end
 end

data/spec/capybara/rack_test_json/driver_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-# this code is written in capybara's spec/spec_helper
-alias :running :lambda
-
 klass = Capybara::RackTestJson::Driver
 
 describe klass do

data/spec/support/driver_examples.rb

@@ -1,5 +1,8 @@
 require 'capybara/spec/driver'
 
+# this code is written in capybara's spec/spec_helper
+alias :running :lambda
+
 [ 'driver', 'driver with header support' ].each do |shared|
   RSpec.world.shared_example_groups.delete(shared)
 end
@@ -49,7 +52,7 @@ end
       json = { :some => :args }
       
       @driver.__send__(method, '/env', json)
-      @driver.body['content_length'].should == MultiJson.encode(json).length
+      @driver.body['content_length'].to_i.should == MultiJson.encode(json).length
     end
     
     it 'should post body' do

data/spec/support/json_test_app.rb

@@ -1,5 +1,22 @@
 require 'capybara/spec/test_app'
 
+# for capybara < 1.0
+module Capybara
+  class Server
+    class Identify
+      def call(env)
+        if env["PATH_INFO"] == "/__identify__"
+          #[200, {}, @app.object_id.to_s]
+          [200, {}, [ @app.object_id.to_s] ]
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end  
+end
+
+
 class JsonTestApp < TestApp
   def invoke
     res = catch(:halt) { yield }
@@ -33,7 +50,7 @@ class JsonTestApp < TestApp
         hash[key.sub('HTTP_', '')] = value
         hash
       end
-      
+
       envs.merge('params' => params, 'headers' => headers, 'rack.input' => env['rack.input'].string)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &74974930 !ruby/object:Gem::Requirement
+  requirement: &78122340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74974930
+  version_requirements: *78122340
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &78121930 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *78121930
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &74974650 !ruby/object:Gem::Requirement
+  requirement: &78121580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74974650
+  version_requirements: *78121580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74974100 !ruby/object:Gem::Requirement
+  requirement: &78121140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.8.0.rc
   type: :development
   prerelease: false
-  version_requirements: *74974100
+  version_requirements: *78121140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &74956960 !ruby/object:Gem::Requirement
+  requirement: &78120910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74956960
+  version_requirements: *78120910
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &74956500 !ruby/object:Gem::Requirement
+  requirement: &78120570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74956500
+  version_requirements: *78120570
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &74956200 !ruby/object:Gem::Requirement
+  requirement: &78120320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74956200
+  version_requirements: *78120320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &74955670 !ruby/object:Gem::Requirement
+  requirement: &78120060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74955670
+  version_requirements: *78120060
 description: for testing json-api with capybara
 email:
 - okitakunio@gmail.com
@@ -108,8 +119,10 @@ files:
 - VERSION
 - capybara-json.gemspec
 - lib/capybara-json.rb
+- lib/capybara/httpclient_json/driver.rb
 - lib/capybara/json.rb
 - lib/capybara/rack_test_json/driver.rb
+- spec/capybara/httpclient_json/driver_spec.rb
 - spec/capybara/json_spec.rb
 - spec/capybara/rack_test_json/driver_spec.rb
 - spec/spec.watchr
@@ -141,6 +154,7 @@ signing_key:
 specification_version: 3
 summary: for testing json-api with capybara
 test_files:
+- spec/capybara/httpclient_json/driver_spec.rb
 - spec/capybara/json_spec.rb
 - spec/capybara/rack_test_json/driver_spec.rb
 - spec/spec.watchr