capybara-json 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.1
+* ENHANCEMENT
+ * options to switch redirect
+
+## 0.2.0
+* stop using capybara/rack_test/driver
+
 ## 0.1.2
 * BUGFIX
    * I forgot to add get! etc to Capybara::DSL
@@ -22,4 +29,4 @@
 
 ## 0.0.1
 * ENHANCEMENT
-    * create :rack_test_json driver   
+    * create :rack_test_json driver

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/capybara-json.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.authors     = ["okitan"]
   s.email       = ["okitakunio@gmail.com"]
   s.homepage    = "http://github.com/okitan/capybara-json"
-  s.summary     = %q{for testing json-api with capybara}
-  s.description = %q{for testing json-api with capybara}
+  s.summary     = %q{for testing json-api}
+  s.description = %q{for testing json-api}
 
   s.rubyforge_project = "capybara-json"
 
@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "capybara"
-  s.add_runtime_dependency "httpclient"
-  s.add_runtime_dependency "multi_json"
+  s.add_runtime_dependency "httpclient", "~> 2.2"
+  s.add_runtime_dependency "multi_json", "~> 1.3"
 
   # for testing
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "rspec", "~> 2.8"
   s.add_development_dependency "sinatra"
   s.add_development_dependency "thin"
   s.add_development_dependency "yajl-ruby"

data/lib/capybara/httpclient_json/driver.rb

@@ -1,7 +1,7 @@
 require 'httpclient'
 
 class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
-  attr_reader :app, :current_url, :rack_server, :response, :cookies
+  attr_reader :app, :options, :current_url, :response, :cookies
 
   def client
     unless @client
@@ -19,8 +19,8 @@ class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
     @client
   end
 
-  def initialize(app)
-    @app = app
+  def initialize(app, options = {})
+    @app, @options = app, { :follow_redirect => true }.merge(options)
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
   end
@@ -34,7 +34,7 @@ class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
   end
 
   def body
-    MultiJson.decode(source) || {}
+    MultiJson.load(source) || {}
   end
 
   def response_headers
@@ -42,18 +42,18 @@ class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
   end
 
   def get(url, params = {}, headers = {})
-    process :get, url, params, headers, true # follow_redirect
+    process :get, url, params, headers, options[:follow_redirect]
   end
   alias visit get
 
   def post(url, json, headers = {})
-    json = MultiJson.encode(json) unless json.is_a?(String)
+    json = MultiJson.dump(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
+    process :post, url, json, headers, options[:follow_redirect]
   end
 
   def put(url, json, headers = {})
-    json = MultiJson.encode(json) unless json.is_a?(String)
+    json = MultiJson.dump(json) unless json.is_a?(String)
     headers['Content-Type'] = "application/json; charset=#{json.encoding.to_s.downcase}"
     process :put, url, json, headers
   end

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

@@ -3,7 +3,7 @@ module Capybara::Json::Driver
     %w[ get post put delete get! post! put! delete!
         reset!
         current_url
-        source body status_headers status_code
+        source body response_headers status_code
     ].each do |method|
       define_method(method) do
         raise NotImplementedError

data/lib/capybara/rack_test_json/client.rb

@@ -4,17 +4,21 @@ module Capybara::RackTestJson
   class Client
     include Rack::Test::Methods
 
-    attr_accessor :app
+    attr_accessor :app, :options
 
-    def initialize(app)
-      @app = app
+    def initialize(app, options)
+      @app, @options = app, options
     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)
+          if options[:follow_redirect]
+            request_with_follow_redirect(uri, env, &block)
+          else
+            request(uri, env)
+          end
         end
       }
     end

data/lib/capybara/rack_test_json/driver.rb

@@ -1,10 +1,12 @@
 class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
-  def initialize(app)
-    @app = app
+  attr_reader :app, :options
+
+  def initialize(app, options = {})
+    @app, @options = app, { :follow_redirect => true }.merge(options)
   end
 
   def client
-    @client ||= Capybara::RackTestJson::Client.new(@app)
+    @client ||= Capybara::RackTestJson::Client.new(app, options)
   end
 
   def last_request
@@ -14,6 +16,7 @@ class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
   def last_response
     client.last_response
   end
+  alias response last_response
 
   %w[ get delete ].each do |method|
     class_eval %{
@@ -31,7 +34,7 @@ class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
   %w[ post put ].each do |method|
     class_eval %{
       def #{method}(path, json, env = {})
-        json = MultiJson.encode(json) unless json.is_a?(String)
+        json = MultiJson.dump(json) unless json.is_a?(String)
 
         request_env = {
           'CONTENT_LENGTH' => json.size,
@@ -57,7 +60,7 @@ class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
   end
 
   def body
-    MultiJson.decode(source) || {}
+    MultiJson.load(source) || {}
   end
 
   def response_headers

data/spec/capybara/httpclient_json/driver_spec.rb

@@ -19,3 +19,9 @@ describe klass do
   it_should_behave_like 'driver for client error'
   it_should_behave_like 'driver for server error'
 end
+
+describe klass do
+  before { @driver = described_class.new(JsonTestApp, :follow_redirect => false) }
+
+  it_should_behave_like "driver not to follow redirect"
+end

data/spec/capybara/json_spec.rb

@@ -9,36 +9,36 @@ require 'spec_helper'
 
   describe Capybara::Json do
     include described_class
-    
+
     before(:all) do
       Capybara.app = JsonTestApp
       Capybara.current_driver = driver
     end
-    
+
     after(:all) do
       Capybara.app = nil
       Capybara.current_driver = Capybara.default_driver
     end
-    
+
     %w[ get get! delete delete! ].each do |method|
       it "register #{method}" do
         __send__(method, '/')
         body.should == { 'Hello world!' => 'Hello world!' }
       end
     end
-    
+
     %w[ post post! put 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)
+        body['rack.input'].should == MultiJson.dump(json)
       end
     end
   end

data/spec/capybara/rack_test_json/driver_spec.rb

@@ -19,3 +19,9 @@ describe klass do
   it_should_behave_like 'driver for client error'
   it_should_behave_like 'driver for server error'
 end
+
+describe klass do
+  before { @driver = described_class.new(JsonTestApp, :follow_redirect => false) }
+
+  it_should_behave_like "driver not to follow redirect"
+end

data/spec/support/driver_examples.rb

@@ -54,6 +54,14 @@ shared_examples_for "driver with redirect support" do
   end
 end
 
+shared_examples_for "driver not to follow redirect" do
+  it "should not follow redirect" do
+    @driver.get "/redirect"
+    @driver.status_code.should == 302
+    URI.parse(@driver.current_url).path.should == "/redirect"
+  end
+end
+
 %w[ post put ].each do |method|
   shared_examples_for "driver to #{method} json" do
     it 'should set content type as json to request' do
@@ -65,14 +73,14 @@ end
       json = { :some => :args }
 
       @driver.__send__(method, '/env', json)
-      @driver.body['content_length'].to_i.should == MultiJson.encode(json).length
+      @driver.body['content_length'].to_i.should == MultiJson.dump(json).length
     end
 
     it 'should post body' do
       json = { :some => :args }
 
       @driver.__send__(method, '/env', json)
-      @driver.body['rack.input'].should == MultiJson.encode(json)
+      @driver.body['rack.input'].should == MultiJson.dump(json)
     end
   end
 end

data/spec/support/json_test_app.rb

@@ -21,8 +21,8 @@ class JsonTestApp < TestApp
   def invoke
     res = catch(:halt) { yield }
 
-    res = [ MultiJson.encode(res => res) ] if Fixnum === res or String === res
-    res = [ MultiJson.encode(res) ] if Hash === res
+    res = [ MultiJson.dump(res => res) ] if Fixnum === res or String === res
+    res = [ MultiJson.dump(res) ] if Hash === res
     if Array === res and Fixnum === res.first
       status(res.shift)
       body(res.pop)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70155556441460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155556441460
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: &70155556457240 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70155556457240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70155556456800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70155556456800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70155556456360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +69,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556456360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155556455820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70155556455820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70155556455400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556455400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70155556454860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556454860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70155556454000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556454000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &70155556452980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556452980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70155556452080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556452080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70155556451560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,8 +181,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155556451560
-description: for testing json-api with capybara
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: for testing json-api
 email:
 - okitakunio@gmail.com
 executables: []
@@ -186,10 +241,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capybara-json
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: for testing json-api with capybara
+summary: for testing json-api
 test_files:
 - spec/capybara/httpclient_json/driver_spec.rb
 - spec/capybara/json_spec.rb