rack-test-rest 0.3.0 → 0.4.0

data/README.md

@@ -61,6 +61,8 @@ to create either the URI for creating/indexing resources or the URI for a partic
     :root_uri + '/' + :resource + :extension
     :root_uri + '/' + :resource + '/' + params[:id].to_s + :extension
 
+Currently JSON is the only supported response Content-Type.
+
 ## `create_resource(params={})`
 
 Performs a POST to with any specified parameters to `:root_uri/:resource:extension`

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rack-test-rest.rb

@@ -6,6 +6,25 @@ module Rack
         "#{@rack_test_rest[:root_uri]}/#{@rack_test_rest[:resource]}"
       end
 
+      def handle_error_code(code)
+        assert_equal(code, last_response.status)
+
+        if @rack_test_rest[:debug]
+          puts "Status: #{last_response.status}" if @rack_test_rest[:debug]
+          puts "Headers:"
+          puts last_response.headers.inspect
+          puts "Body: #{last_response.body}" if @rack_test_rest[:debug]
+        end
+
+        assert_equal 'application/json', last_response.headers['Content-Type']
+
+        if last_response.headers['Content-Length'].to_i > 0
+          JSON.parse(last_response.body)
+        else
+          nil
+        end
+      end
+
       def create_resource(params={})
         expected_code = params[:code]
         params.delete :code
@@ -13,17 +32,18 @@ module Rack
         puts "Posting to: '#{resource_uri}#{@rack_test_rest[:extension]}'" if @rack_test_rest[:debug]
         post "#{resource_uri}#{@rack_test_rest[:extension]}", params
 
-        if expected_code
-          assert_equal(expected_code, last_response.status)
-        else
-          if @rack_test_rest[:debug]
-            puts "#{last_response.status}: #{last_response.body}"
-            puts last_response.original_headers["Location"]
-          end
-          assert_equal(201, last_response.status)
-          if @rack_test_rest[:location]
-            assert last_response.original_headers["Location"] =~ @rack_test_rest[:location]
-          end
+        return handle_error_code(expected_code) if expected_code
+
+        if @rack_test_rest[:debug]
+          puts "#{last_response.status}: #{last_response.body}"
+          puts last_response.original_headers["Location"]
+        end
+
+        assert_equal(201, last_response.status)
+        assert_equal 'application/json', last_response.headers['Content-Type']
+
+        if @rack_test_rest[:location]
+          assert last_response.original_headers["Location"] =~ @rack_test_rest[:location]
         end
 
         last_response.original_headers["Location"]
@@ -44,18 +64,17 @@ module Rack
         puts "GET #{uri} #{params}" if @rack_test_rest[:debug]
         get uri, params
 
+        return handle_error_code(expected_code) if expected_code
+
         if @rack_test_rest[:debug]
           puts "Code: #{last_response.status}"
           puts "Body: #{last_response.body}"
         end
 
-        if expected_code
-          assert_equal(expected_code, last_response.status)
-          return nil
-        else
-          assert_equal(200, last_response.status)
-          return JSON.parse(last_response.body)
-        end
+        assert_equal 'application/json', last_response.headers['Content-Type']
+        assert_equal(200, last_response.status)
+
+        JSON.parse(last_response.body)
       end
 
       def update_resource(params={})
@@ -69,23 +88,19 @@ module Rack
 
         put "#{resource_uri}/#{id}#{@rack_test_rest[:extension]}", params
 
+        return handle_error_code(expected_code) if expected_code
+
         puts "#{last_response.status}: #{last_response.body}" if @rack_test_rest[:debug]
 
-        if expected_code
-          assert_equal(expected_code, last_response.status)
-        else
-          assert_equal(204, last_response.status)
-        end
+        assert_equal(204, last_response.status)
       end
 
       def delete_resource(params={})
         delete "#{resource_uri}/#{params[:id]}#{@rack_test_rest[:extension]}"
 
-        if params[:code]
-          assert_equal(params[:code], last_response.status)
-        else
-          assert_equal(204, last_response.status)
-        end
+        return handle_error_code(params[:code]) if params[:code]
+
+        assert_equal(204, last_response.status)
       end
 
       def paginate_resource(params={})

data/rack-test-rest.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-test-rest}
-  s.version = "0.3.0"
+  s.name = "rack-test-rest"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Ruscio"]
-  s.date = %q{2011-10-02}
-  s.description = %q{rack-test-rest is an extension to rack-test that when combined with Test::Unit simplifies the process of unit testing properly designed RESTful API's.}
-  s.email = %q{joe@ruscio.org}
+  s.date = "2011-10-20"
+  s.description = "rack-test-rest is an extension to rack-test that when combined with Test::Unit simplifies the process of unit testing properly designed RESTful API's."
+  s.email = "joe@ruscio.org"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -29,11 +29,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_rack-test-rest.rb"
   ]
-  s.homepage = %q{http://github.com/josephruscio/rack-test-rest}
+  s.homepage = "http://github.com/josephruscio/rack-test-rest"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Abstractions for testing RESTful API's with rack-test and Test::Unit.}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Abstractions for testing RESTful API's with rack-test and Test::Unit."
   s.test_files = [
     "test/helper.rb",
     "test/test_rack-test-rest.rb"

metadata

@@ -1,93 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-test-rest
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Joseph Ruscio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2011-10-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: &2163619080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2163619080
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2163618380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2163618380
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2163617640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: *2163617640
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id004
+  requirement: &2163617040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-description: rack-test-rest is an extension to rack-test that when combined with Test::Unit simplifies the process of unit testing properly designed RESTful API's.
+  version_requirements: *2163617040
+description: rack-test-rest is an extension to rack-test that when combined with Test::Unit
+  simplifies the process of unit testing properly designed RESTful API's.
 email: joe@ruscio.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -99,40 +75,34 @@ files:
 - rack-test-rest.gemspec
 - test/helper.rb
 - test/test_rack-test-rest.rb
-has_rdoc: true
 homepage: http://github.com/josephruscio/rack-test-rest
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -210201095594734930
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Abstractions for testing RESTful API's with rack-test and Test::Unit.
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_rack-test-rest.rb