capybara-json 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
+## 0.1.1
+* ENHANCEMENT
+    * get!, post!, put!, delete!
+* BUGFIX
+    * ensure the same interface sending header to app
+
 ## 0.1.0
-   * gurantee the same interface in error response
+* ENHANCEMENT
+    * gurantee the same interface in error response
 
 ## 0.0.3
 * ENHANCEMENT

data/README.md

@@ -17,20 +17,16 @@ testing web application
     post '/', { "this is" => "json" } # POST '/'
     body   #=> parsed json response
     source #=> raw response body
+    get  '/errors/400'
+    status_code #=> 400
+    get! '/errors' #=> raise Capybara::Json::Error
 
     Capybara.current_driver = :httpclient_json
     Capybara.app_host = 'http://example.com'
     post '/', { "this is" => "json" } # POST 'http://example.com/'
     body   #=> parsed json response
     source #=> raw response body
+    get  '/errors/400'
+    status_code #=> 400
+    get! '/errors' #=> raise Capybara::Json::Error
 
-## ROADMAP
-
-* 0.0.1
-    * create :rack_test_json driver which supports normal json response (2xx, 3xx)
-* 0.0.3
-    * 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)
-* 0.2.0
-    * add jsonpath? interface to search response

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/capybara/httpclient_json/driver.rb

@@ -54,6 +54,22 @@ class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
   def delete(url, params = {}, headers = {})
     process :delete, url, params, headers
   end
+
+  %w[ get delete ].each do |method|
+    class_eval %{
+      def #{method}!(url, params = {}, env = {})
+        handle_error { #{method}(url, params, env) }
+      end
+    }
+  end
+
+  %w[ post put ].each do |method|
+    class_eval %{
+      def #{method}!(url, json, headers = {})
+        handle_error { #{method}(url, json, headers) }
+      end
+      }
+  end
   
   def reset!
     @client = nil
@@ -73,4 +89,9 @@ class Capybara::HTTPClientJson::Driver < Capybara::Driver::Base
       end
     end
   end
+
+  def handle_error(&block)
+    yield
+    raise(Capybara::Json::Error, response) if status_code >= 400
+  end
 end

data/lib/capybara/json/error.rb

@@ -0,0 +1,6 @@
+module Capybara
+  module Json
+    class Error < Exception
+    end
+  end
+end

data/lib/capybara/json.rb

@@ -29,6 +29,8 @@ module Capybara
         end
       }
     end
+
+    autoload :Error, 'capybara/json/error'
   end
 
   module RackTestJson

data/lib/capybara/rack_test_json/driver.rb

@@ -5,19 +5,51 @@ class Capybara::RackTestJson::Driver < to_inherit
     MultiJson.decode(source) || {}
   end
 
+  %w[ get delete ].each do |method|
+    class_eval %{
+      def #{method}(path, params = {}, env = {})
+        super(path, params, env_for_rack(env))
+      end
+
+      def #{method}!(path, params = {}, env = {})
+        handle_error { #{method}(path, params, env) }
+      end
+    }
+  end
+
   %w[ post put ].each do |method|
     class_eval %{
       def #{method}(path, json, env = {})
         json = MultiJson.encode(json) unless json.is_a?(String)
-        
+
         request_env = {
           'CONTENT_LENGTH' => json.size,
           'CONTENT_TYPE'   => "application/json; charset=\#{json.encoding.to_s.downcase}", 
           'rack.input'     => StringIO.new(json)
-        }.merge(env)
+        }.merge(env_for_rack(env))
         
         super(path, {}, request_env)
       end
+
+      def #{method}!(path, json, env = {})
+        handle_error { #{method}(path, json, env) }
+      end
     }
   end
+
+  protected
+  def env_for_rack(env)
+    env.inject({}) do |rack_env, (key, value)|
+      env_key = key.upcase.gsub('-', '_')
+      env_key = "HTTP_" + env_key unless env_key == "CONTENT_TYPE"
+      rack_env[env_key] = value
+
+      rack_env
+    end
+  end
+
+  def handle_error(&block)
+    yield
+    raise(Capybara::Json::Error, response) if status_code >= 400
+  end
 end

data/spec/capybara/httpclient_json/driver_spec.rb

@@ -7,6 +7,7 @@ describe klass do
 
   it_should_behave_like 'driver'
   it_should_behave_like 'driver with header support'
+  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 infinite redirect detection'

data/spec/capybara/rack_test_json/driver_spec.rb

@@ -7,6 +7,7 @@ describe klass do
 
   it_should_behave_like 'driver'
   it_should_behave_like 'driver with header support'
+  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 infinite redirect detection'

data/spec/support/driver_examples.rb

@@ -40,6 +40,13 @@ shared_examples_for 'driver with header support' do
   end
 end
 
+shared_examples_for 'driver with custom header support' do
+  it "should send custom header" do
+    @driver.get('/env', {}, { 'X-Custom-Header' => 'custom header'})
+    @driver.body['headers']['X_CUSTOM_HEADER'].should == 'custom header'
+  end
+end
+
 
 %w[ post put ].each do |method|
   shared_examples_for "driver to #{method} json" do
@@ -83,6 +90,10 @@ shared_examples_for 'driver for client error' do
     @driver.get('/errors/400')
     @driver.body['status_code'].should == 400
   end
+
+  it 'should raise error using bang!' do
+    expect { @driver.get!('/errors/400') }.should raise_exception(Capybara::Json::Error)
+  end
 end
 
 shared_examples_for 'driver for server error' do
@@ -94,4 +105,8 @@ shared_examples_for 'driver for server error' do
     @driver.get('/errors/500')
     @driver.status_code.should == 500
   end
+
+  it 'should raise error using bang!' do
+    expect { @driver.get!('/errors/500') }.should raise_exception(Capybara::Json::Error)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &79508610 !ruby/object:Gem::Requirement
+  requirement: &74677520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79508610
+  version_requirements: *74677520
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &79508060 !ruby/object:Gem::Requirement
+  requirement: &74676990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79508060
+  version_requirements: *74676990
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &79507280 !ruby/object:Gem::Requirement
+  requirement: &74676250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79507280
+  version_requirements: *74676250
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79506490 !ruby/object:Gem::Requirement
+  requirement: &74675420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0.rc
   type: :development
   prerelease: false
-  version_requirements: *79506490
+  version_requirements: *74675420
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &79505920 !ruby/object:Gem::Requirement
+  requirement: &74674860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79505920
+  version_requirements: *74674860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &79505530 !ruby/object:Gem::Requirement
+  requirement: &74674450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79505530
+  version_requirements: *74674450
 - !ruby/object:Gem::Dependency
   name: autowatchr
-  requirement: &79505310 !ruby/object:Gem::Requirement
+  requirement: &74674220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79505310
+  version_requirements: *74674220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79505050 !ruby/object:Gem::Requirement
+  requirement: &74673970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79505050
+  version_requirements: *74673970
 description: for testing json-api with capybara
 email:
 - okitakunio@gmail.com
@@ -121,6 +121,7 @@ files:
 - lib/capybara-json.rb
 - lib/capybara/httpclient_json/driver.rb
 - lib/capybara/json.rb
+- lib/capybara/json/error.rb
 - lib/capybara/rack_test_json/driver.rb
 - spec/capybara/httpclient_json/driver_spec.rb
 - spec/capybara/json_spec.rb