restrack 1.1.7 → 1.1.8

data/lib/restrack/resource_controller.rb

@@ -9,7 +9,7 @@ module RESTRack
   #
 
   class ResourceController
-    attr_reader :action, :id
+    attr_reader :action, :id, :params
     class << self; attr_accessor :key_type; end
 
     # Base initialization method for resources and storage of request input
@@ -39,6 +39,10 @@ module RESTRack
     # all internal methods are protected rather than private so that calling methods *could* be overriden if necessary.
     protected
 
+    def package_error(error)
+      @output = @resource_request.package(error)[0] # TODO: Remove this if change line 97 in resource_request.rb
+    end
+
     # 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

data/lib/restrack/resource_request.rb

@@ -24,11 +24,12 @@ module RESTRack
       @get_params = parse_query_string( @request )
       @params = {}
       # TODO: Test this!
-      if @post_params.is_a? Hash
+      if @post_params.respond_to?(:merge)
         @params = @post_params.merge( @get_params )
       else
         @params = @get_params
       end
+      RESTRack.log.debug 'combined params: ' + @params.inspect
       # Setup up the initial routing.
       @url_chain = @request.path_info.split('/')
       @url_chain.shift if @url_chain[0] == ''
@@ -74,6 +75,32 @@ module RESTRack
       @mime_type.to_s
     end
 
+    # This handles outputing properly formatted content based on the file extension in the URL.
+    def package(data)
+      if @mime_type.like?( RESTRack.mime_type_for( :JSON ) )
+        @output = data.to_json
+      elsif @mime_type.like?( RESTRack.mime_type_for( :XML ) )
+        if File.exists? builder_file
+          @output = builder_up(data)
+        elsif data.respond_to?(:to_xml)
+          @output = data.to_xml
+        else
+          @output = XmlSimple.xml_out(data, 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
+        end
+      elsif @mime_type.like?(RESTRack.mime_type_for( :YAML ) )
+        @output = YAML.dump(data)
+      elsif @mime_type.like?(RESTRack.mime_type_for( :TEXT ) )
+        @output = data.to_s
+      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
+    end
+
     private
     def get_request_id
       t = Time.now
@@ -100,6 +127,8 @@ module RESTRack
 
     def parse_query_string(request)
       get_params = request.GET
+      RESTRack.log.debug "{#{@request_id}} GET data in:\n" + get_params.pretty_inspect
+      get_params
     end
 
     # Determine the MIME type of the request from the extension provided.
@@ -127,32 +156,6 @@ module RESTRack
       end
     end
 
-    # This handles outputing properly formatted content based on the file extension in the URL.
-    def package(data)
-      if @mime_type.like?( RESTRack.mime_type_for( :JSON ) )
-        @output = data.to_json
-      elsif @mime_type.like?( RESTRack.mime_type_for( :XML ) )
-        if File.exists? builder_file
-          @output = builder_up(data)
-        elsif data.respond_to?(:to_xml)
-          @output = data.to_xml
-        else
-          @output = XmlSimple.xml_out(data, 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
-        end
-      elsif @mime_type.like?(RESTRack.mime_type_for( :YAML ) )
-        @output = YAML.dump(data)
-      elsif @mime_type.like?(RESTRack.mime_type_for( :TEXT ) )
-        @output = data.to_s
-      else
-        @output = data
-      end
-      if @output.respond_to?(:each)
-        return @output
-      else
-        return [@output]
-      end
-    end
-
     # Use Builder to generate the XML.
     def builder_up(data)
       buffer = ''

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/test/sample_app_1/controllers/errors_controller.rb

@@ -12,35 +12,35 @@ class SampleApp::ErrorsController < RESTRack::ResourceController
   #end
 
   def bad_request
-    raise HTTP400BadRequest, 'tester'
+    raise HTTP400BadRequest, package_error('tester')
   end
 
   def unauthorized
-    raise HTTP401Unauthorized, 'tester'
+    raise HTTP401Unauthorized, package_error('tester')
   end
 
   def forbidden
-    raise HTTP403Forbidden, 'tester'
+    raise HTTP403Forbidden, package_error('tester')
   end
 
   def resource_not_found
-    raise HTTP404ResourceNotFound, 'tester'
+    raise HTTP404ResourceNotFound, package_error('tester')
   end
 
   def method_not_allowed
-    raise HTTP405MethodNotAllowed, 'tester'
+    raise HTTP405MethodNotAllowed, package_error('tester')
   end
 
   def conflict
-    raise HTTP409Conflict, 'tester'
+    raise HTTP409Conflict, package_error('tester')
   end
 
   def gone
-    raise HTTP410Gone, 'tester'
+    raise HTTP410Gone, package_error('tester')
   end
 
   def server_error
-    raise HTTP500ServerError, 'tester'
+    raise HTTP500ServerError, package_error('tester')
   end
 
 end

data/test/sample_app_1/test/test_errors.rb

@@ -31,8 +31,7 @@ class SampleApp::TestControllerActions < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal response_code, output[0]
-    assert_equal 'tester', output[2][0]
-puts output.inspect
+    assert_equal 'tester'.to_json, output[2][0]
   end
 
   def test_unauthorized

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8022520 !ruby/object:Gem::Requirement
+  requirement: &7018500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8022520
+  version_requirements: *7018500
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &8021980 !ruby/object:Gem::Requirement
+  requirement: &7017840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8021980
+  version_requirements: *7017840
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &8021380 !ruby/object:Gem::Requirement
+  requirement: &7017160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8021380
+  version_requirements: *7017160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8020780 !ruby/object:Gem::Requirement
+  requirement: &7016600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8020780
+  version_requirements: *7016600
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &8019800 !ruby/object:Gem::Requirement
+  requirement: &7015960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *8019800
+  version_requirements: *7015960
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &8018620 !ruby/object:Gem::Requirement
+  requirement: &7015380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8018620
+  version_requirements: *7015380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &8018120 !ruby/object:Gem::Requirement
+  requirement: &7014700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8018120
+  version_requirements: *7014700
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &8017480 !ruby/object:Gem::Requirement
+  requirement: &7014080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8017480
+  version_requirements: *7014080
 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