restrack 1.2.3 → 1.2.4

data/lib/restrack/resource_controller.rb

@@ -50,10 +50,12 @@ module RESTRack
         # I am AR bound
         errors = ARFormattedError.new(errors)
       end
-      @output = @resource_request.package(errors)[0] # TODO: Remove this if change line 97 in resource_request.rb
+      @output = @resource_request.package(errors)
     end
+
     def package_error(error)
-      package_errors(error)
+      errors = error.is_a?(String) ? [error] : error
+      package_errors(errors)
     end
 
     # This method allows one to access a related resource, without providing a direct link to specific relation(s).

data/lib/restrack/resource_request.rb

@@ -94,11 +94,7 @@ module RESTRack
       else
         @output = data
       end
-      if @output.respond_to?(:each) # TODO: Should this do this?  Perhaps always bundle in array in web_service.rb
-        return @output
-      else
-        return [@output]
-      end
+      return @output
     end
 
     private

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/lib/restrack/web_service.rb

@@ -24,7 +24,7 @@ module RESTRack
     def valid( resource_request, response )
       RESTRack.log.debug "(#{resource_request.request_id}) HTTP200OK '#{resource_request.mime_type.to_s}' response data:\n" + response.to_s unless not response.respond_to?( :to_s )
       RESTRack.request_log.info "(#{resource_request.request_id}) HTTP200OK"
-      return [200, {'Content-Type' => resource_request.content_type}, response ]
+      return [200, {'Content-Type' => resource_request.content_type}, [response] ]
     end
 
     # Return appropriate response code and messages per raised exception type.
@@ -53,12 +53,12 @@ module RESTRack
         when exception.is_a?( HTTP422ResourceInvalid )
           return [422, {'Content-Type' => 'text/plain'}, [exception.message || "Invalid attribute values sent for resource."] ]
         else # HTTP500ServerError
-          msg = exception.message + "\n\n" + exception.backtrace.join("\n")
           if resource_request && resource_request.request_id
-            RESTRack.log.error "(#{resource_request.request_id}) #{exception.class.to_s} " + msg
+            RESTRack.log.error "(#{resource_request.request_id}) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
           else
-            RESTRack.log.error "(<nil-reqid>) #{exception.class.to_s} " + msg
+            RESTRack.log.error "(<nil-reqid>) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
           end
+          msg = (exception.message == exception.class.to_s) ? exception.backtrace.join("\n") : exception.message
           return [500, {'Content-Type' => 'text/plain'}, [msg] ]
       end # case Exception
     end # method caught

data/test/sample_app_1/controllers/errors_controller.rb

@@ -51,4 +51,8 @@ class SampleApp::ErrorsController < RESTRack::ResourceController
     raise HTTP500ServerError, package_error('tester')
   end
 
+  def server_error_with_backtrace
+    raise HTTP500ServerError
+  end
+
 end

data/test/sample_app_1/test/test_errors.rb

@@ -31,7 +31,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
-    assert_equal 'tester'.to_json, output[2][0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_unauthorized
@@ -44,6 +44,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_forbidden
@@ -56,6 +57,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_resource_not_found
@@ -68,6 +70,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_method_not_allowed
@@ -80,6 +83,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_conflict
@@ -92,6 +96,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_gone
@@ -104,6 +109,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
   end
 
   def test_resource_invalid
@@ -117,6 +123,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
     end
     assert_equal response_code, output[0]
     assert JSON.parse(output[2][0]).has_key?('message')
+    assert_equal 'This is a WebDAV HTTP extension code used by ActiveResource to communicate validation errors, rather than 400.', JSON.parse(output[2][0])['message']
   end
 
   def test_resource_invalid_active_record_format
@@ -155,6 +162,21 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
+    assert_equal 'tester', JSON.parse(output[2][0])[0]
+  end
+
+  def test_server_error_with_backtrace
+    response_code = 500
+    # This will/should spam the log
+    env = Rack::MockRequest.env_for('/errors/server_error_with_backtrace', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal response_code, output[0]
+    assert_not_equal 'tester', output[2][0]
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &10448680 !ruby/object:Gem::Requirement
+  requirement: &23011460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10448680
+  version_requirements: *23011460
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &10447720 !ruby/object:Gem::Requirement
+  requirement: &23010920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10447720
+  version_requirements: *23010920
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &10446540 !ruby/object:Gem::Requirement
+  requirement: &23010360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10446540
+  version_requirements: *23010360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10445940 !ruby/object:Gem::Requirement
+  requirement: &23009720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10445940
+  version_requirements: *23009720
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &10445300 !ruby/object:Gem::Requirement
+  requirement: &22957080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *10445300
+  version_requirements: *22957080
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &10444560 !ruby/object:Gem::Requirement
+  requirement: &22956200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10444560
+  version_requirements: *22956200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10439600 !ruby/object:Gem::Requirement
+  requirement: &22955320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10439600
+  version_requirements: *22955320
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &10438800 !ruby/object:Gem::Requirement
+  requirement: &22954780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10438800
+  version_requirements: *22954780
 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