restrack 1.0.0 → 1.1.0

data/lib/restrack/resource_request.rb

@@ -11,7 +11,14 @@ module RESTRack
       @request_id = opts[:request_id] || get_request_id
       # Write input details to logs
       RESTRack.request_log.info "{#{@request_id}} #{@request.path_info} requested from #{@request.ip}"
-      RESTRack.log.debug "{#{@request_id}} Reading POST Input"
+    end
+    
+    def fulfill
+      self.prepare
+      return self.response
+    end
+    
+    def prepare
       # Pull input data from POST body
       @input = parse_body( @request )
       @params = get_params( @request )
@@ -42,10 +49,6 @@ module RESTRack
       @active_controller = instantiate_controller( @active_resource_name )
     end
 
-    def content_type
-      @mime_type.to_s
-    end
-
     # Send out the typed resource's output, this must occur after a call to run.
     def response
       RESTRack.log.debug "{#{@request_id}} Retrieving Output"
@@ -60,6 +63,10 @@ module RESTRack
       @active_controller.call
     end
 
+    def content_type
+      @mime_type.to_s
+    end
+
     private
     def get_request_id
       t = Time.now
@@ -79,7 +86,7 @@ module RESTRack
           input = YAML.parse( input )
         end
       end
-      RESTRack.request_log.debug "{#{@request_id}} #{request_mime_type.to_s} data in\n" + input.pretty_inspect
+      RESTRack.log.debug "{#{@request_id}} #{request_mime_type.to_s} data in:\n" + input.pretty_inspect
       input
     end
     

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/restrack/web_service.rb

@@ -14,7 +14,7 @@ module RESTRack
       request = Rack::Request.new(env)
       begin
         resource_request = RESTRack::ResourceRequest.new( :request => request )
-        response = resource_request.response
+        response = resource_request.fulfill
         return valid resource_request, response
       rescue Exception => exception
         return caught resource_request, exception
@@ -25,15 +25,16 @@ module RESTRack
 
     # Return HTTP200OK SUCCESS
     def valid( resource_request, response )
-      RESTRack.request_log.debug "'#{resource_request.mime_type.to_s}' response data (Request ID: #{resource_request.request_id})\n" + response.to_s unless not response.respond_to?( :to_s )
-      RESTRack.request_log.info "HTTP200OK - (Request ID: #{resource_request.request_id})"
+      RESTRack.log.debug "(#{resource_request.request_id}) '#{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 ]
     end
 
     # Return appropriate response code and messages per raised exception type.
     def caught( resource_request, exception )
+      # This will log the returned status code
       if resource_request && resource_request.request_id
-        RESTRack.request_log.info exception.message + "(Request ID: #{resource_request.request_id})"
+        RESTRack.request_log.info "(#{resource_request.request_id}) " + exception.message
       else
         RESTRack.request_log.info exception.message
       end
@@ -55,7 +56,7 @@ module RESTRack
         else # HTTP500ServerError
           msg = exception.message + "\n\n" + exception.backtrace.join("\n")
           if resource_request && resource_request.request_id
-            RESTRack.log.error msg + " (Request ID: #{resource_request.request_id})\n\n"
+            RESTRack.log.error "(#{resource_request.request_id})" + msg
           else
             RESTRack.log.error msg
           end

data/test/sample_app_1/config.ru

@@ -0,0 +1,3 @@
+# Rails.root/config.ru
+require File.join(File.dirname(__FILE__), 'loader')
+run SampleApp::WebService.new

metadata

@@ -2,7 +2,7 @@
 name: restrack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Chris St. John
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,6 +138,7 @@ files:
 - lib/restrack/version.rb
 - lib/restrack/web_service.rb
 - restrack.gemspec
+- test/sample_app_1/config.ru
 - test/sample_app_1/config/constants.yaml
 - test/sample_app_1/controllers/bat_controller.rb
 - test/sample_app_1/controllers/bata_controller.rb
@@ -211,6 +212,7 @@ signing_key:
 specification_version: 3
 summary: A lightweight MVC framework developed specifically for JSON (and XML) REST services.
 test_files: 
+- test/sample_app_1/config.ru
 - test/sample_app_1/config/constants.yaml
 - test/sample_app_1/controllers/bat_controller.rb
 - test/sample_app_1/controllers/bata_controller.rb