restrack 1.1.3 → 1.1.5

data/lib/restrack/resource_controller.rb

@@ -1,5 +1,5 @@
 module RESTRack
-  
+
   # All RESTRack controllers should descend from ResourceController.  This class
   # provides the methods for your controllers.
   #
@@ -7,7 +7,7 @@ module RESTRack
   # Collection URI (/widgets/):   |   index   |   replace |   create  |   drop
   # Element URI   (/widgets/42):  |   show    |   update  |   add     |   destroy
   #
-  
+
   class ResourceController
     attr_reader :action, :id
     class << self; attr_accessor :key_type; end
@@ -22,7 +22,8 @@ module RESTRack
       @resource_request = resource_request
       @request = @resource_request.request
       @params = @resource_request.params
-      @input = @resource_request.input
+      @post_params = @resource_request.post_params
+      @get_params = @resource_request.get_params
       self
     end
 
@@ -42,14 +43,14 @@ module RESTRack
     #def update(id);  end
     #def add(id);     end
     #def destroy(id); end
-    
+
     def method_missing(method_sym, *arguments, &block)
       raise HTTP405MethodNotAllowed, 'Method not provided on controller.'
     end
 
     # all internal methods are protected rather than private so that calling methods *could* be overriden if necessary.
     protected
-    
+
     # This method allows one to access a related resource, without providing a direct link to specific relation(s).
     def self.pass_through_to(entity, opts = {})
       entity_name = opts[:as] || entity
@@ -96,7 +97,7 @@ module RESTRack
         end
       )
     end
-    
+
     # This method defines that there are multiple links to members from an entity collection (an array of entity identifiers).
     # This adds an accessor instance method whose name is the entity's class.
     def self.has_defined_relationships_to(entity, opts = {}, &get_entity_id_from_relation_id)
@@ -178,7 +179,7 @@ module RESTRack
       end
       id
     end
-    
+
     # Get action from HTTP verb
     def get_action_from_context
       if @resource_request.request.get?

data/lib/restrack/resource_request.rb

@@ -1,7 +1,7 @@
 module RESTRack
   # The ResourceRequest class handles all incoming requests.
   class ResourceRequest
-    attr_reader :request, :request_id, :input, :params
+    attr_reader :request, :request_id, :params, :post_params, :get_params
     attr_accessor :mime_type, :url_chain
 
     # Initialize the ResourceRequest by assigning a request_id and determining the path, format, and controller of the resource.
@@ -20,8 +20,15 @@ module RESTRack
 
     def prepare
       # Pull input data from POST body
-      @input = parse_body( @request )
-      @params = get_params( @request )
+      @post_params = parse_body( @request )
+      @get_params = parse_query_string( @request )
+      @params = {}
+      # TODO: Test this!
+      if @post_params.is_a? Hash
+        @params = @post_params.merge( @get_params )
+      else
+        @params = @get_params
+      end
       # Setup up the initial routing.
       @url_chain = @request.path_info.split('/')
       @url_chain.shift if @url_chain[0] == ''
@@ -49,7 +56,7 @@ module RESTRack
       @active_controller = instantiate_controller( @active_resource_name )
     end
 
-    # Send out the typed resource's output, this must occur after a call to run.
+    # Send out the typed resource's output.
     def response
       RESTRack.log.debug "{#{@request_id}} Retrieving Output"
       package( @active_controller.call )
@@ -75,23 +82,23 @@ module RESTRack
 
     # Pull input data from POST body
     def parse_body(request)
-      input = request.body.read
+      post_params = request.body.read
       unless request.content_type.blank?
         request_mime_type = MIME::Type.new( request.content_type )
         if request_mime_type.like?( RESTRack.mime_type_for( :JSON ) )
-          input = JSON.parse( input )
+          post_params = JSON.parse( post_params ) rescue post_params
         elsif request_mime_type.like?( RESTRack.mime_type_for( :XML ) )
-          input = XmlSimple.xml_in( input, 'ForceArray' => false )
+          post_params = XmlSimple.xml_in( post_params, 'ForceArray' => false ) rescue post_params
         elsif request_mime_type.like?( RESTRack.mime_type_for( :YAML ) )
-          input = YAML.parse( input )
+          post_params = YAML.parse( post_params ) rescue post_params
         end
       end
-      RESTRack.log.debug "{#{@request_id}} #{request_mime_type.to_s} data in:\n" + input.pretty_inspect
-      input
+      RESTRack.log.debug "{#{@request_id}} #{request_mime_type.to_s} data in:\n" + post_params.pretty_inspect
+      post_params
     end
 
-    def get_params(request)
-      params = request.GET
+    def parse_query_string(request)
+      get_params = request.GET
     end
 
     # Determine the MIME type of the request from the extension provided.
@@ -114,7 +121,7 @@ module RESTRack
       RESTRack.log.debug "{#{@request_id}} Locating Resource #{resource_name}"
       begin
         return RESTRack.controller_class_for( resource_name ).__init(self)
-      rescue
+      rescue Exception => e
         raise HTTP404ResourceNotFound, "The resource #{RESTRack::CONFIG[:SERVICE_NAME]}::#{RESTRack.controller_name(resource_name)} could not be instantiated."
       end
     end
@@ -138,6 +145,11 @@ module RESTRack
       else
         @output = data
       end
+      if @output.respond_to?(:each)
+        return @output
+      else
+        return [@output]
+      end
     end
 
     # Use Builder to generate the XML.

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.1.3"
+  VERSION = "1.1.5"
 end

data/lib/restrack/web_service.rb

@@ -37,19 +37,19 @@ module RESTRack
       end
       case
         when exception.is_a?( HTTP400BadRequest )
-          return [400, {'Content-Type' => 'text/plain'}, exception.message + "\nThe request cannot be fulfilled due to bad syntax." ]
+          return [400, {'Content-Type' => 'text/plain'}, [exception.message || "The request cannot be fulfilled due to bad syntax."] ]
         when exception.is_a?( HTTP401Unauthorized )
-          return [401, {'Content-Type' => 'text/plain'}, exception.message + "\nYou have failed authentication for access to the resource." ]
+          return [401, {'Content-Type' => 'text/plain'}, [exception.message || "You have failed authentication for access to the resource."] ]
         when exception.is_a?( HTTP403Forbidden )
-          return [403, {'Content-Type' => 'text/plain'}, exception.message + "\nYou are forbidden to access that resource." ]
+          return [403, {'Content-Type' => 'text/plain'}, [exception.message || "You are forbidden to access that resource."] ]
         when exception.is_a?( HTTP404ResourceNotFound )
-          return [404, {'Content-Type' => 'text/plain'}, exception.message + "\nThe resource you requested could not be found." ]
+          return [404, {'Content-Type' => 'text/plain'}, [exception.message || "The resource you requested could not be found."] ]
         when exception.is_a?( HTTP405MethodNotAllowed )
-          return [405, {'Content-Type' => 'text/plain'}, exception.message + "\nThe resource you requested does not support the request method provided." ]
+          return [405, {'Content-Type' => 'text/plain'}, [exception.message || "The resource you requested does not support the request method provided."] ]
         when exception.is_a?( HTTP409Conflict )
-          return [409, {'Content-Type' => 'text/plain'}, exception.message + "\nThe resource you requested is in a conflicted state." ]
+          return [409, {'Content-Type' => 'text/plain'}, [exception.message || "The resource you requested is in a conflicted state."] ]
         when exception.is_a?( HTTP410Gone )
-          return [410, {'Content-Type' => 'text/plain'}, exception.message + "\nThe resource you requested is no longer available." ]
+          return [410, {'Content-Type' => 'text/plain'}, [exception.message || "The resource you requested is no longer available."] ]
         else # HTTP500ServerError
           msg = exception.message + "\n\n" + exception.backtrace.join("\n")
           if resource_request && resource_request.request_id
@@ -57,7 +57,7 @@ module RESTRack
           else
             RESTRack.log.error msg
           end
-          return [500, {'Content-Type' => 'text/plain'}, msg ]
+          return [500, {'Content-Type' => 'text/plain'}, [msg] ]
       end # case Exception
     end # method caught
 

data/test/sample_app_1/config/constants.yaml

@@ -20,6 +20,6 @@
 :DEFAULT_RESOURCE:        bazu 
 
 # These are the resources which can be accessed from the root of your web service. If left empty, all resources are available at the root.
-:ROOT_RESOURCE_ACCEPT:    [ foo_bar ]
+:ROOT_RESOURCE_ACCEPT:    [ foo_bar, errors ]
 # These are the resources which cannot be accessed from the root of your web service. Use either this or ROOT_RESOURCE_ACCEPT as a blacklist or whitelist to establish routing (relationships defined in resource controllers define further routing).
 :ROOT_RESOURCE_DENY:      [ baz ]

data/test/sample_app_1/controllers/errors_controller.rb

@@ -0,0 +1,46 @@
+class SampleApp::ErrorsController < RESTRack::ResourceController
+
+  #module HTTPStatus
+  #  class HTTP400BadRequest       < Exception; end
+  #  class HTTP401Unauthorized     < Exception; end
+  #  class HTTP403Forbidden        < Exception; end
+  #  class HTTP404ResourceNotFound < Exception; end
+  #  class HTTP405MethodNotAllowed < Exception; end
+  #  class HTTP409Conflict         < Exception; end
+  #  class HTTP410Gone             < Exception; end
+  #  class HTTP500ServerError      < Exception; end
+  #end
+
+  def bad_request
+    raise HTTP400BadRequest, 'tester'
+  end
+
+  def unauthorized
+    raise HTTP401Unauthorized, 'tester'
+  end
+
+  def forbidden
+    raise HTTP403Forbidden, 'tester'
+  end
+
+  def resource_not_found
+    raise HTTP404ResourceNotFound, 'tester'
+  end
+
+  def method_not_allowed
+    raise HTTP405MethodNotAllowed, 'tester'
+  end
+
+  def conflict
+    raise HTTP409Conflict, 'tester'
+  end
+
+  def gone
+    raise HTTP410Gone, 'tester'
+  end
+
+  def server_error
+    raise HTTP500ServerError, 'tester'
+  end
+
+end

data/test/sample_app_1/controllers/foo_bar_controller.rb

@@ -24,7 +24,7 @@ class SampleApp::FooBarController < RESTRack::ResourceController
   has_relationships_to( :baza, :as => :children ) do |id|
     [1,2,3,4,5,6,7,8,9]
   end
-  
+
   has_defined_relationships_to( :baza, :as => :def ) do |id|
     [1,8,9,17]
   end
@@ -97,17 +97,17 @@ class SampleApp::FooBarController < RESTRack::ResourceController
   end
 
   def echo
-    return @input
+    return @post_params
   end
-  
+
   def echo_get
     return @params.merge({ 'get?' => @resource_request.request.get?.to_s })
   end
-  
+
   def custom_entity(id)
     return id
   end
-  
+
   def custom_collection
     return [1,1,2,3,5,8,13,21,34]
   end

data/test/sample_app_1/test/test_controller_actions.rb

@@ -19,7 +19,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :foo => 'bar', :baz => 123 }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_update
@@ -31,7 +31,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_add
@@ -43,7 +43,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_destroy
@@ -55,7 +55,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
 
@@ -68,7 +68,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = [1,2,3,4,5,6,7].to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_replace
@@ -80,7 +80,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_create
@@ -92,7 +92,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_drop
@@ -104,7 +104,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :success => true }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_custom_entity_action
@@ -116,9 +116,9 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = '7476'.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
-  
+
   def test_custom_collection_action
     env = Rack::MockRequest.env_for('/foo_bar/custom_collection', {
       :method => 'GET'
@@ -128,7 +128,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = [1,1,2,3,5,8,13,21,34].to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_missing

data/test/sample_app_1/test/test_controller_inputs.rb

@@ -19,7 +19,7 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :test => '1', :hello => 'world', 'get?' => 'true' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_FUBAR_params
@@ -31,7 +31,7 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :test => '1', :hello => 'world', 'get?' => 'false' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_post_no_content_type
@@ -44,7 +44,7 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal test_val.to_json, output[2] # will be converted to json because of default response type
+    assert_equal test_val.to_json, output[2][0] # will be converted to json because of default response type
   end
 
   def test_post_json
@@ -58,7 +58,7 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_post_xml
@@ -72,7 +72,7 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_post_text
@@ -86,6 +86,6 @@ class SampleApp::TestControllerInputs < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 end

data/test/sample_app_1/test/test_controller_modifiers.rb

@@ -19,7 +19,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZ => 'ALOHA!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     env = Rack::MockRequest.env_for('/foo_bar/133/bata/abc', {
       :method => 'GET'
@@ -29,7 +29,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :OTHER => 'YUP' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     env = Rack::MockRequest.env_for('/foo_bar/144/bata/', {
       :method => 'GET'
@@ -39,7 +39,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = [1,2,3,4,5].to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     env = Rack::MockRequest.env_for('/foo_bar/144/other_bata', {
       :method => 'GET'
@@ -49,7 +49,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = [1,2,3,4,5].to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_has_relationship_to
@@ -61,7 +61,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZ => 'ALOHA!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/baz', {
       :method => 'GET'
@@ -71,7 +71,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :OTHER => 'YUP' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/144/baz/', {
       :method => 'GET'
@@ -81,7 +81,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZ => 'ALOHA!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     #------
     
@@ -93,7 +93,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :WOM => 'NOBAT!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/slugger', {
       :method => 'GET'
@@ -103,7 +103,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :SUHWING => 'BATTER' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/144/slugger/', {
       :method => 'GET'
@@ -113,7 +113,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :WOM => 'NOBAT!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_has_relationships_to
@@ -125,7 +125,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZA => 'YESSIR' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/children/7', {
       :method => 'GET'
@@ -135,7 +135,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :NOWAY => 'JOSE' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/children/11', {
       :method => 'GET'
@@ -157,7 +157,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZA => 'YESSIR' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/def/8', {
       :method => 'GET'
@@ -167,7 +167,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :NOWAY => 'JOSE' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     # this should 404
     env = Rack::MockRequest.env_for('/foo_bar/133/def/11', {
@@ -199,7 +199,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = '1'
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/second', {
       :method => 'GET'
@@ -209,7 +209,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = '0'
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/third', {
       :method => 'GET'
@@ -219,7 +219,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = '0'
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_keyed_with_type
@@ -232,7 +232,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZA => 'YESSIR' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
 end

data/test/sample_app_1/test/test_errors.rb

@@ -0,0 +1,123 @@
+require 'rubygems'
+require 'test/unit'
+require 'rack/test'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','loader'))
+require 'pp'
+
+class SampleApp::TestControllerActions < Test::Unit::TestCase
+
+  def setup
+    @ws = SampleApp::WebService.new
+  end
+
+  #module HTTPStatus
+  #  class HTTP400BadRequest       < Exception; end
+  #  class HTTP401Unauthorized     < Exception; end
+  #  class HTTP403Forbidden        < Exception; end
+  #  class HTTP404ResourceNotFound < Exception; end
+  #  class HTTP405MethodNotAllowed < Exception; end
+  #  class HTTP409Conflict         < Exception; end
+  #  class HTTP410Gone             < Exception; end
+  #  class HTTP500ServerError      < Exception; end
+  #end
+
+  def test_bad_request
+    response_code = 400
+    env = Rack::MockRequest.env_for('/errors/bad_request', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+    assert_equal 'tester', output[2][0]
+puts output.inspect
+  end
+
+  def test_unauthorized
+    response_code = 401
+    env = Rack::MockRequest.env_for('/errors/unauthorized', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_forbidden
+    response_code = 403
+    env = Rack::MockRequest.env_for('/errors/forbidden', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_resource_not_found
+    response_code = 404
+    env = Rack::MockRequest.env_for('/errors/resource_not_found', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_method_not_allowed
+    response_code = 405
+    env = Rack::MockRequest.env_for('/errors/method_not_allowed', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_conflict
+    response_code = 409
+    env = Rack::MockRequest.env_for('/errors/conflict', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_gone
+    response_code = 410
+    env = Rack::MockRequest.env_for('/errors/gone', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+  def test_server_error
+    response_code = 500
+    # This will/should spam the log
+    env = Rack::MockRequest.env_for('/errors/server_error', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+  end
+
+end

data/test/sample_app_1/test/test_formats.rb

@@ -19,7 +19,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><data><foo>bar</foo><baz>123</baz></data>"
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_show_default_xml
@@ -31,7 +31,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = XmlSimple.xml_out([1,2,3,4,5,6,7], 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
 
     env = Rack::MockRequest.env_for('/foo_bar.xml', {
       :method => 'GET'
@@ -41,7 +41,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = XmlSimple.xml_out([1,2,3,4,5,6,7], 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_show_json
@@ -53,7 +53,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :foo => 'bar', :baz => 123 }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_complex_data_structure_json
@@ -65,7 +65,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = "{\"foo\":\"abc\",\"bar\":\"123\",\"baz\":456,\"more\":{\"one\":1,\"two\":[1,2],\"three\":\"deep_fu\"}}"
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     env = Rack::MockRequest.env_for('/foo_bar/42', {
       :method => 'GET'
@@ -84,7 +84,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
         4 => :four
       }
     }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
     
   def test_complex_data_structure_xml
@@ -96,7 +96,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = "<?xml version='1.0' standalone='yes'?>\n<opt><foo>abc</foo><bar>123</bar><baz>456</baz><more><one>1</one><two>1</two><two>2</two><three>deep_fu</three></more></opt>"
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
     
     env = Rack::MockRequest.env_for('/foo_bar/42/complex_show_xml_no_builder.xml', {
       :method => 'GET'
@@ -115,7 +115,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
         4 => :four
       }
     }, 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
 end

data/test/sample_app_2/test/test_controller_modifiers.rb

@@ -19,7 +19,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZ => 'ALOHA!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/baz', {
       :method => 'GET'
@@ -29,7 +29,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :OTHER => 'YUP' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/144/baz/', {
       :method => 'GET'
@@ -39,7 +39,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZ => 'ALOHA!' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_has_relationships_to
@@ -51,7 +51,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :BAZA => 'YESSIR' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/children/8', {
       :method => 'GET'
@@ -61,7 +61,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = { :NOWAY => 'JOSE' }.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/children/11', {
       :method => 'GET'
@@ -82,7 +82,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = 1.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/second', {
       :method => 'GET'
@@ -92,7 +92,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = 0.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/third', {
       :method => 'GET'
@@ -102,7 +102,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = 0.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
   
   def test_keyed_with_type
@@ -115,7 +115,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = 1.to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
 end

data/test/sample_app_4/test/test_controller_modifiers.rb

@@ -19,7 +19,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
       output = @ws.call(env)
     end
     test_val = [0,1,2,3].to_json
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
 
 
     #"Hello from Bar with id of

data/test/sample_app_4/test/test_formats.rb

@@ -20,7 +20,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     end
     assert_equal 'text/x-yaml', output[1]['Content-Type']
     test_val = YAML.dump( { :foo => '123', :baz => 'bat' } )
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_text
@@ -33,7 +33,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     end
     assert_equal 'text/plain', output[1]['Content-Type']
     test_val = 'Hello 123!'
-    assert_equal test_val, output[2]
+    assert_equal test_val, output[2][0]
   end
 
   def test_image
@@ -45,7 +45,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal 'image/png', output[1]['Content-Type']
-    assert output[2].length
+    assert output[2][0].length
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &17715460 !ruby/object:Gem::Requirement
+  requirement: &10175380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17715460
+  version_requirements: *10175380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &17715040 !ruby/object:Gem::Requirement
+  requirement: &10174660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17715040
+  version_requirements: *10174660
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &17714620 !ruby/object:Gem::Requirement
+  requirement: &10173980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17714620
+  version_requirements: *10173980
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17714200 !ruby/object:Gem::Requirement
+  requirement: &10173340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17714200
+  version_requirements: *10173340
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &17713700 !ruby/object:Gem::Requirement
+  requirement: &10172580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *17713700
+  version_requirements: *10172580
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &17713280 !ruby/object:Gem::Requirement
+  requirement: &10171940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17713280
+  version_requirements: *10171940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17712820 !ruby/object:Gem::Requirement
+  requirement: &10171240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17712820
+  version_requirements: *10171240
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &17736520 !ruby/object:Gem::Requirement
+  requirement: &10170660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17736520
+  version_requirements: *10170660
 description: ! "\nRESTRack is a Rack-based MVC framework that makes it extremely easy
   to develop RESTful data services. It is inspired by\nRails, and follows a few of
   its conventions.  But it has no routes file, routing relationships are done through\nsupplying
@@ -144,11 +144,13 @@ files:
 - test/sample_app_1/controllers/baz_controller.rb
 - test/sample_app_1/controllers/baza_controller.rb
 - test/sample_app_1/controllers/bazu_controller.rb
+- test/sample_app_1/controllers/errors_controller.rb
 - test/sample_app_1/controllers/foo_bar_controller.rb
 - test/sample_app_1/loader.rb
 - test/sample_app_1/test/test_controller_actions.rb
 - test/sample_app_1/test/test_controller_inputs.rb
 - test/sample_app_1/test/test_controller_modifiers.rb
+- test/sample_app_1/test/test_errors.rb
 - test/sample_app_1/test/test_formats.rb
 - test/sample_app_1/test/test_resource_request.rb
 - test/sample_app_1/test/test_web_service.rb
@@ -202,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: restrack
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A lightweight MVC framework developed specifically for JSON (and XML) REST