capybara-json 0.1.2 → 0.2.0

data/.rbenv-gemsets

@@ -0,0 +1 @@
+capybara-json

data/README.md

@@ -1,13 +1,12 @@
-# capybara-json [![Build Status](https://secure.travis-ci.org/okitan/capybara-json.png)](http://travis-ci.org/okitan/capybara-json)
+# capybara-json [![Build Status](https://secure.travis-ci.org/okitan/capybara-json.png?branch=master)](http://travis-ci.org/okitan/capybara-json)
 
 testing ruby: 1.9.2, 1.9.3 and ruby-head;  Capybara: < 1.0 and > 1.0
 
 ## About capybara-json
 
-capybara-json provides the same interface to testing JSON API (both local and remote) 
+capybara-json provides the same interface to testing JSON API (both local and remote)
 
 Capybara is an acceptance test framework, and it has no interest with client error(4xx response).
-testing web application 
 
 ## USAGE
     require 'capybara/json'
@@ -29,4 +28,3 @@ testing web application
     get  '/errors/400'
     status_code #=> 400
     get! '/errors' #=> raise Capybara::Json::Error
-

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/capybara-json.gemspec

@@ -15,19 +15,19 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  [ [ 'capybara' ],
-    [ 'httpclient' ],
-    [ 'multi_json' ],
-  ].each do |gem, version|
-    s.add_runtime_dependency gem, version
-  end
+  s.add_runtime_dependency "capybara"
+  s.add_runtime_dependency "httpclient"
+  s.add_runtime_dependency "multi_json"
 
-  [ [ 'rspec', '~> 2.8.0.rc' ],
-    [ 'sinatra' ],
-    [ 'yajl-ruby' ],
-    [ 'autowatchr' ],
-    [ 'rake' ],
-  ].each do |gem, version|
-    s.add_development_dependency gem, version
-  end
+  # for testing
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "sinatra"
+  s.add_development_dependency "thin"
+  s.add_development_dependency "yajl-ruby"
+  s.add_development_dependency "autowatchr"
+
+  # for debug
+  s.add_development_dependency "pry"
+  s.add_development_dependency "tapp"
 end

data/lib/capybara/httpclient_json/driver.rb

@@ -1,6 +1,6 @@
 require 'httpclient'
 
-class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
+class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
   attr_reader :app, :current_url, :rack_server, :response, :cookies
 
   def client
@@ -8,6 +8,13 @@ class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
       @client = HTTPClient.new
       @client.follow_redirect_count  = 5 + 1 # allows 5 redirection
       @client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      # hack for redirect
+      def @client.redirect_uri_callback_to_keep_new_uri(uri, res)
+        new_uri = default_redirect_uri_callback(uri, res)
+        @new_uri = new_uri
+      end
+      @client.redirect_uri_callback = @client.method(:redirect_uri_callback_to_keep_new_uri)
     end
     @client
   end
@@ -70,7 +77,7 @@ class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
       end
       }
   end
-  
+
   def reset!
     @client = nil
   end
@@ -81,6 +88,12 @@ class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
 
     begin
       @response = client.__send__(method, @current_url, params, headers, options)
+
+      # hack for redirect
+      if new_uri = client.instance_variable_get(:@new_uri)
+        @current_url = new_uri.to_s
+        client.instance_variable_set(:@new_uri, nil)
+      end
     rescue HTTPClient::BadResponseError => e
       if e.message == "retry count exceeded"
         raise Capybara::InfiniteRedirectError

data/lib/capybara/json/driver/base.rb

@@ -0,0 +1,13 @@
+module Capybara::Json::Driver
+  class Base
+    %w[ get post put delete get! post! put! delete!
+        reset!
+        current_url
+        source body status_headers status_code
+    ].each do |method|
+      define_method(method) do
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/capybara/json.rb

@@ -31,10 +31,15 @@ module Capybara
     end
 
     autoload :Error, 'capybara/json/error'
+
+    module Driver
+      autoload :Base, "capybara/json/driver/base"
+    end
   end
 
   module RackTestJson
     autoload :Driver, 'capybara/rack_test_json/driver'
+    autoload :Client, "capybara/rack_test_json/client"
   end
 
   module HTTPClientJson

data/lib/capybara/rack_test_json/client.rb

@@ -0,0 +1,37 @@
+require 'rack/test'
+
+module Capybara::RackTestJson
+  class Client
+    include Rack::Test::Methods
+
+    attr_accessor :app
+
+    def initialize(app)
+      @app = app
+    end
+
+    %w[ get post put delete ].each do |method|
+      module_eval %{
+        def #{method}(uri, params = {}, env = {}, &block)
+          env.merge(:method => "#{method.upcase}", :params => params)
+          request_with_follow_redirect(uri, env, &block)
+        end
+      }
+    end
+
+    def request_with_follow_redirect(uri, env)
+      request(uri, env)
+      (5+1).times do
+        if last_response.redirect?
+          request(last_response["Location"], env.merge(:method => "GET"))
+        else
+          return
+        end
+      end
+
+      # 6 times redirect cause InfiniteRedirectError
+      raise Capybara::InfiniteRedirectError,
+      "redirected more than 5 times, check for infinite redirects."
+    end
+  end
+end

data/lib/capybara/rack_test_json/driver.rb

@@ -1,14 +1,24 @@
-to_inherit = Capybara.const_defined?("RackTest") ? Capybara::RackTest::Driver : Capybara::Driver::RackTest
+class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
+  def initialize(app)
+    @app = app
+  end
 
-class Capybara::RackTestJson::Driver < to_inherit
-  def body
-    MultiJson.decode(source) || {}
+  def client
+    @client ||= Capybara::RackTestJson::Client.new(@app)
+  end
+
+  def last_request
+    client.last_request
+  end
+
+  def last_response
+    client.last_response
   end
 
   %w[ get delete ].each do |method|
     class_eval %{
       def #{method}(path, params = {}, env = {})
-        super(path, params, env_for_rack(env))
+        client.#{method}(path, params, env_for_rack(env))
       end
 
       def #{method}!(path, params = {}, env = {})
@@ -16,6 +26,7 @@ class Capybara::RackTestJson::Driver < to_inherit
       end
     }
   end
+  alias visit get
 
   %w[ post put ].each do |method|
     class_eval %{
@@ -24,11 +35,11 @@ class Capybara::RackTestJson::Driver < to_inherit
 
         request_env = {
           'CONTENT_LENGTH' => json.size,
-          'CONTENT_TYPE'   => "application/json; charset=\#{json.encoding.to_s.downcase}", 
+          'CONTENT_TYPE'   => "application/json; charset=\#{json.encoding.to_s.downcase}",
           'rack.input'     => StringIO.new(json)
         }.merge(env_for_rack(env))
-        
-        super(path, {}, request_env)
+
+        client.#{method}(path, {}, request_env)
       end
 
       def #{method}!(path, json, env = {})
@@ -37,6 +48,30 @@ class Capybara::RackTestJson::Driver < to_inherit
     }
   end
 
+  def current_url
+    last_request.url
+  end
+
+  def source
+    last_response.body
+  end
+
+  def body
+    MultiJson.decode(source) || {}
+  end
+
+  def response_headers
+    last_response.headers
+  end
+
+  def status_code
+    last_response.status
+  end
+
+  def reset!
+    @client = nil
+  end
+
   protected
   def env_for_rack(env)
     env.inject({}) do |rack_env, (key, value)|
@@ -50,6 +85,6 @@ class Capybara::RackTestJson::Driver < to_inherit
 
   def handle_error(&block)
     yield
-    raise(Capybara::Json::Error, response) if status_code >= 400
+    raise(Capybara::Json::Error, last_response) if status_code >= 400
   end
 end

data/spec/capybara/httpclient_json/driver_spec.rb

@@ -10,6 +10,7 @@ describe klass do
   it_should_behave_like 'driver with custom 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 redirect support"
   it_should_behave_like 'driver with infinite redirect detection'
 
   it_should_behave_like 'driver to post json'

data/spec/capybara/rack_test_json/driver_spec.rb

@@ -10,6 +10,7 @@ describe klass do
   it_should_behave_like 'driver with custom 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 redirect support"
   it_should_behave_like 'driver with infinite redirect detection'
 
   it_should_behave_like 'driver to post json'

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 ROOT = File.dirname(__FILE__)
 $: << File.expand_path('../lib', ROOT)
 
+require "pry"
+
 require 'capybara/json'
 Dir[File.expand_path("support/**/*.rb", ROOT)].each {|f| require f }
 

data/spec/support/driver_examples.rb

@@ -47,6 +47,12 @@ shared_examples_for 'driver with custom header support' do
   end
 end
 
+shared_examples_for "driver with redirect support" do
+  it "should update current_url" do
+    @driver.get "/redirect"
+    URI.parse(@driver.current_url).path.should == "/landed"
+  end
+end
 
 %w[ post put ].each do |method|
   shared_examples_for "driver to #{method} json" do
@@ -54,17 +60,17 @@ end
       @driver.__send__(method, '/env', {})
       @driver.body['content_type'].should =~ %r"^application/json"
     end
-    
+
     it 'should set content length' do
       json = { :some => :args }
-      
+
       @driver.__send__(method, '/env', json)
       @driver.body['content_length'].to_i.should == MultiJson.encode(json).length
     end
-    
+
     it 'should post body' do
       json = { :some => :args }
-      
+
       @driver.__send__(method, '/env', json)
       @driver.body['rack.input'].should == MultiJson.encode(json)
     end

data/spec/support/json_test_app.rb

@@ -13,7 +13,7 @@ module Capybara
         end
       end
     end
-  end  
+  end
 end
 
 
@@ -27,7 +27,7 @@ class JsonTestApp < TestApp
       status(res.shift)
       body(res.pop)
       headers(*res)
-    elsif res.respond_to? :each 
+    elsif res.respond_to? :each
       content_type :json
       body res
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81687960 !ruby/object:Gem::Requirement
+  requirement: &70155556441460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81687960
+  version_requirements: *70155556441460
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &81687570 !ruby/object:Gem::Requirement
+  requirement: &70155556457240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81687570
+  version_requirements: *70155556457240
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &81686880 !ruby/object:Gem::Requirement
+  requirement: &70155556456800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81686880
+  version_requirements: *70155556456800
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70155556456360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70155556456360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81685970 !ruby/object:Gem::Requirement
+  requirement: &70155556455820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0.rc
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *81685970
+  version_requirements: *70155556455820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &81685370 !ruby/object:Gem::Requirement
+  requirement: &70155556455400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70155556455400
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70155556454860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81685370
+  version_requirements: *70155556454860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &81684950 !ruby/object:Gem::Requirement
+  requirement: &70155556454000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81684950
+  version_requirements: *70155556454000
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &81684710 !ruby/object:Gem::Requirement
+  requirement: &70155556452980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81684710
+  version_requirements: *70155556452980
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &81684470 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &70155556452080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70155556452080
+- !ruby/object:Gem::Dependency
+  name: tapp
+  requirement: &70155556451560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81684470
+  version_requirements: *70155556451560
 description: for testing json-api with capybara
 email:
 - okitakunio@gmail.com
@@ -107,6 +140,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-gemsets
 - .rspec
 - .rvmrc
 - .rvmrc.capybara.lt.1.0
@@ -121,7 +155,9 @@ files:
 - lib/capybara-json.rb
 - lib/capybara/httpclient_json/driver.rb
 - lib/capybara/json.rb
+- lib/capybara/json/driver/base.rb
 - lib/capybara/json/error.rb
+- lib/capybara/rack_test_json/client.rb
 - lib/capybara/rack_test_json/driver.rb
 - spec/capybara/httpclient_json/driver_spec.rb
 - spec/capybara/json_spec.rb
@@ -150,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capybara-json
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: for testing json-api with capybara