rack-test-rest 0.7.1 → 0.8.0

data/Rakefile

@@ -13,7 +13,7 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 

data/lib/rack-test-rest.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'rack-test-rest/version'
 
 module Rack
@@ -15,7 +16,7 @@ module Rack
       # unless the :code option is specified.
       #
       def create_resource(params={})
-        expected_code = params.delete(:code)
+        id, expected_code, params = _rtr_prepare_params(params)
 
         puts "Posting to: '#{resource_uri}#{@rack_test_rest[:extension]}'" if @rack_test_rest[:debug]
         post "#{resource_uri}#{@rack_test_rest[:extension]}", params
@@ -51,8 +52,7 @@ module Rack
       end
 
       def read_resource(params={})
-        id = params.delete(:id)
-        expected_code = params.delete(:code)
+        id, expected_code, params = _rtr_prepare_params(params)
 
         if id
           uri = "#{resource_uri}/#{id}#{@rack_test_rest[:extension]}"
@@ -81,8 +81,7 @@ module Rack
       end
 
       def update_resource(params={})
-        id = params.delete(:id)
-        expected_code = params.delete(:code)
+        id, expected_code, params = _rtr_prepare_params(params)
 
         puts "Attempting to update #{id} with #{params.inspect}" if @rack_test_rest[:debug]
 
@@ -103,10 +102,11 @@ module Rack
       end
 
       def delete_resource(params={})
-        delete "#{resource_uri}/#{params[:id]}#{@rack_test_rest[:extension]}"
+        id, code, params = _rtr_prepare_params(params)
+        delete "#{resource_uri}/#{id}#{@rack_test_rest[:extension]}"
 
         with_clean_backtraces do
-          return handle_error_code(params[:code]) if params[:code]
+          return handle_error_code(code) if code
           assert_status_code(204)
         end
       end
@@ -167,6 +167,16 @@ module Rack
 
     private
 
+      # split out common arguments & protect payload to ensure
+      # we don't modify it by reference
+      def _rtr_prepare_params(opts)
+        # symbolize all keys & ensure we don't affect original object
+        params = opts.each_with_object({}) { |(k,v),memo| memo[k.to_sym] = v }
+        id = params.delete(:id)
+        code = params.delete(:code)
+        [id, code, params]
+      end
+
       def assert_content_type_is_json(response=last_response)
         # ignore character sets when evaluating content type
         content_type = response.headers['Content-Type'].split(';')[0].strip.downcase

data/lib/rack-test-rest/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Test
     module Rest
-      VERSION = '0.7.1'
+      VERSION = '0.8.0'
     end
   end
 end

data/test/fixtures/sample_app.rb

@@ -0,0 +1,32 @@
+require 'sinatra/base'
+
+module Rack::Test::Rest
+
+  class SampleApp < Sinatra::Base
+
+    get '/v1/users' do
+      headers 'Content-Type' => 'application/json'
+      body '{}'
+    end
+
+    post '/v1/users' do
+      headers 'Content-Type' => 'application/json'
+      body '{}'
+    end
+
+    get '/v1/users/:id' do
+      headers 'Content-Type' => 'application/json'
+      body '{}'
+    end
+
+    put '/v1/users/:id' do
+      status 204
+    end
+
+    delete '/v1/users/:id' do
+      status 204
+    end
+
+  end
+
+end

data/test/rack_test_rest_test.rb

@@ -0,0 +1,94 @@
+require 'test_helper'
+
+class TestRackTestRest < Minitest::Test
+  include Rack::Test::Methods
+  include Rack::Test::Rest
+
+  def app
+    SampleApp
+  end
+
+  def setup
+    @rack_test_rest = {
+      #debug: true
+      root_uri: '/v1',
+      resource: 'users'
+    }
+  end
+
+  def test_read_resource
+    read_resource(id: 15)
+
+    # request
+    assert last_request.get?
+    assert_equal '/v1/users/15', last_request.path
+
+    # response
+    assert last_response.ok?
+  end
+
+  def test_read_should_not_modify_payload
+    payload = {id: 21, foo: 'bar', boom: 'baz'}
+    original = payload.dup
+
+    read_resource(payload)
+    assert_equal original, payload
+  end
+
+  def test_update_resource
+    touched = Time.now
+    update_resource(id: 12, email: 'user@test.com', touched_at: touched)
+
+    # request
+    assert last_request.put?
+    assert_equal '/v1/users/12', last_request.path
+    assert_equal 'user@test.com', last_request.params['email']
+    assert_equal touched.to_s, last_request.params['touched_at']
+
+    # response
+    assert_equal 204, last_response.status
+  end
+
+  def test_update_should_not_modify_payload
+    payload = {id: 21, foo: 'bar', boom: 'baz'}
+    original = payload.dup
+
+    update_resource(payload)
+    assert_equal original, payload
+  end
+
+  def test_delete_resource
+    delete_resource(id: 21)
+
+    # request
+    assert last_request.delete?
+    assert_equal '/v1/users/21', last_request.path
+
+    # response
+    assert_equal 204, last_response.status
+  end
+
+  def test_delete_should_not_modify_payload
+    payload = {id: 21, foo: 'bar', boom: 'baz'}
+    original = payload.dup
+
+    delete_resource(payload)
+    assert_equal original, payload
+  end
+
+  def test_should_accept_string_params
+    # param parsing is DRYed up now, so testing one route
+    # should be adequate
+
+    update_resource('id' => 34, 'email' => 'fred@idk.com')
+
+    # request
+    assert last_request.put?
+    assert_equal '/v1/users/34', last_request.path
+    assert_equal 'fred@idk.com', last_request.params['email']
+
+    # response
+    assert_equal 204, last_response.status
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'pry'
+
+require 'minitest/autorun'
+require 'minitest/mock'
+
+require 'rack'
+require 'rack/test'
+require 'rack-test-rest'
+
+require File.dirname(__FILE__) + "/fixtures/sample_app"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-test-rest
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -41,8 +41,9 @@ files:
 - LICENSE.txt
 - Rakefile
 - README.md
-- test/helper.rb
-- test/test_rack-test-rest.rb
+- test/fixtures/sample_app.rb
+- test/rack_test_rest_test.rb
+- test/test_helper.rb
 homepage: https://github.com/josephruscio/rack-test-rest
 licenses:
 - MIT
@@ -58,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4084849392629650097
+      hash: 2737779017982661905
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,5 +73,6 @@ signing_key:
 specification_version: 3
 summary: Easy testing of RESTful API's with rack-test and Test::Unit.
 test_files:
-- test/helper.rb
-- test/test_rack-test-rest.rb
+- test/fixtures/sample_app.rb
+- test/rack_test_rest_test.rb
+- test/test_helper.rb

data/test/helper.rb

@@ -1,15 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rack-test-rest'
-
-class Test::Unit::TestCase
-end

data/test/test_rack-test-rest.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRackTestRest < Test::Unit::TestCase
-  def test
-    # probably rename this file and start testing for real
-  end
-end