capybara-json 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+* ENHANCEMENT
+ * add json interface to get json
+
 ## 0.2.2
 * BUGFIX
  * rack_test_json works POST, PUT, DELETE as well (thanks to @sonots)

data/README.md

@@ -9,22 +9,25 @@ capybara-json provides the same interface to testing JSON API (both local and re
 Capybara is an acceptance test framework, and it has no interest with client error(4xx response).
 
 ## USAGE
-    require 'capybara/json'
-    include Capybara::Json
-
-    Capybara.current_driver = :rack_test_json
-    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
+
+```ruby
+require 'capybara/json'
+include Capybara::Json
+
+Capybara.current_driver = :rack_test_json
+post '/', { "this is" => "json" } # POST '/'
+json   #=> 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/'
+json   #=> parsed json response
+source #=> raw response body
+get  '/errors/400'
+status_code #=> 400
+get! '/errors' #=> raise Capybara::Json::Error
+```

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/capybara-json.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   # for testing
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.8"
+  s.add_development_dependency "rspec", "~> 2.11"
   s.add_development_dependency "sinatra"
   s.add_development_dependency "thin"
   s.add_development_dependency "yajl-ruby"

data/lib/capybara/httpclient_json/driver.rb

@@ -37,6 +37,10 @@ class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
     MultiJson.load(source) || {}
   end
 
+  def json
+    MultiJson.load(source) || {}
+  end
+
   def response_headers
     response.headers
   end

data/lib/capybara/json.rb

@@ -6,7 +6,7 @@ require 'multi_json'
 module Capybara
   module Json
     def self.to_include
-      Capybara.const_defined?("DSL") ? Capybara::DSL : Capybara
+      ::Capybara.const_defined?("DSL") ? ::Capybara::DSL : ::Capybara
     end
 
     def self.included(base)

data/lib/capybara/rack_test_json/driver.rb

@@ -63,6 +63,10 @@ class Capybara::RackTestJson::Driver < Capybara::Json::Driver::Base
     MultiJson.load(source) || {}
   end
 
+  def json
+    MultiJson.load(source) || {}
+  end
+
   def response_headers
     last_response.headers
   end

data/spec/capybara/httpclient_json/driver_spec.rb

@@ -5,23 +5,23 @@ 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 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_behaves_like 'driver'
+  it_behaves_like 'driver with header support'
+  it_behaves_like 'driver with custom header support'
+  it_behaves_like 'driver with status code support'
+  it_behaves_like 'driver with cookies support'
+  it_behaves_like "driver with redirect support"
+  it_behaves_like 'driver with infinite redirect detection'
 
-  it_should_behave_like 'driver to post json'
-  it_should_behave_like 'driver to put json'
+  it_behaves_like 'driver to post json'
+  it_behaves_like 'driver to put json'
 
-  it_should_behave_like 'driver for client error'
-  it_should_behave_like 'driver for server error'
+  it_behaves_like 'driver for client error'
+  it_behaves_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"
+  it_behaves_like "driver not to follow redirect"
 end

data/spec/capybara/rack_test_json/driver_spec.rb

@@ -5,23 +5,23 @@ klass = Capybara::RackTestJson::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 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_behaves_like 'driver'
+  it_behaves_like 'driver with header support'
+  it_behaves_like 'driver with custom header support'
+  it_behaves_like 'driver with status code support'
+  it_behaves_like 'driver with cookies support'
+  it_behaves_like "driver with redirect support"
+  it_behaves_like 'driver with infinite redirect detection'
 
-  it_should_behave_like 'driver to post json'
-  it_should_behave_like 'driver to put json'
+  it_behaves_like 'driver to post json'
+  it_behaves_like 'driver to put json'
 
-  it_should_behave_like 'driver for client error'
-  it_should_behave_like 'driver for server error'
+  it_behaves_like 'driver for client error'
+  it_behaves_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"
+  it_behaves_like "driver not to follow redirect"
 end

data/spec/spec_helper.rb

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

data/spec/support/driver_examples.rb

@@ -25,11 +25,28 @@ shared_examples_for 'driver' do
   describe '#body' do
     it "should return json reponses" do
       @driver.visit('/')
+      @driver.body.should be_a(Hash)
       @driver.body.should include('Hello world!')
     end
     # pending encoding
   end
 
+  context '#source' do
+    it "should return raw reponse" do
+      @driver.visit('/')
+      @driver.source.should be_a(String)
+      @driver.source.should include('Hello world!')
+    end
+  end
+
+  describe '#json' do
+    it "should return json reponses" do
+      @driver.visit('/')
+      @driver.json.should be_a(Hash)
+      @driver.json.should include('Hello world!')
+    end
+    # pending encoding
+  end
   # TODO: find by jsonpath?
 end
 
@@ -92,7 +109,7 @@ end
 
 shared_examples_for 'driver for client error' do
   it 'should not raise exception' do
-    expect { @driver.get('/errors/400') }.should_not raise_exception
+    expect { @driver.get('/errors/400') }.not_to raise_exception
   end
 
   it 'should make the status code available' do
@@ -111,13 +128,13 @@ shared_examples_for 'driver for client error' do
   end
 
   it 'should raise error using bang!' do
-    expect { @driver.get!('/errors/400') }.should raise_exception(Capybara::Json::Error)
+    expect { @driver.get!('/errors/400') }.to raise_exception(Capybara::Json::Error)
   end
 end
 
 shared_examples_for 'driver for server error' do
   it 'should not raise exception' do
-    expect { @driver.get('/errors/500') }.should_not raise_exception
+    expect { @driver.get('/errors/500') }.not_to raise_exception
   end
 
   it 'should make the status_code available' do
@@ -126,6 +143,6 @@ shared_examples_for 'driver for server error' do
   end
 
   it 'should raise error using bang!' do
-    expect { @driver.get!('/errors/500') }.should raise_exception(Capybara::Json::Error)
+    expect { @driver.get!('/errors/500') }.to 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.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -253,3 +253,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/driver_examples.rb
 - spec/support/json_test_app.rb
+has_rdoc: