restrack 1.6.7 → 1.6.8

data/Rakefile

@@ -8,7 +8,7 @@ task :default => [:test_all]
 
 desc 'Run all tests.'
 task :test_all do
-  for n in 0..4
+  for n in 0..5
     Rake::Task['test'+n.to_s].invoke
   end
 end

data/lib/restrack/generator/hooks.rb.erb

@@ -7,7 +7,7 @@ module RESTRack
     end
     # Use this to execute code after all requests handled by your service.
     # For example, to do database connection per request you could commit transactions and/or teardown db connections here.
-    def post_processor(request)
+    def post_processor(response)
 
     end
   end # class Hooks

data/lib/restrack/resource_controller.rb

@@ -13,7 +13,7 @@ module RESTRack
   class ResourceController
     extend RESTRack::ResourceRelations
 
-    attr_reader :action, :id, :params
+    attr_reader :action, :id, :params, :resource_request
     class << self; attr_accessor :key_type; end
 
     # Base initialization method for resources and storage of request input

data/lib/restrack/response.rb

@@ -1,6 +1,6 @@
 module RESTRack
   class Response
-    attr_reader :status, :content_type, :body, :mime_type, :headers
+    attr_reader :status, :content_type, :body, :mime_type, :headers, :request
 
     def initialize(request)
       @request = request

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

data/lib/restrack/web_service.rb

@@ -15,10 +15,10 @@ module RESTRack
       end
       response = RESTRack::Response.new(resource_request)
       unless @request_hook.nil? or (RESTRack::CONFIG.has_key?(:POST_PROCESSOR_DISABLED) and RESTRack::CONFIG[:POST_PROCESSOR_DISABLED])
-        @request_hook.post_processor(resource_request)
+        @request_hook.post_processor(response)
       end
       return response.output
     end # method call
 
   end # class WebService
-end # module RESTRack
+end # module RESTRack

data/test/sample_app_5/controllers/hook_controller.rb

@@ -7,5 +7,10 @@ class SampleApp5::HookController < RESTRack::ResourceController
       { 'neither' => true }
     end
   end
+  
+  def dynamic_request
+    @resource_request.instance_variable_set('@error_code', 123456)
+    @resource_request.instance_variable_set('@error_message', 'Invalid password or email address combination')
+  end
 
-end
+end

data/test/sample_app_5/hooks.rb

@@ -7,8 +7,9 @@ module RESTRack
     end
     # Use this to execute code after all requests handled by your service.
     # For example, to do database connection per request you could commit transactions and/or teardown db connections here.
-    def post_processor(request)
+    def post_processor(response)
       $post_processor_executed = true
+      $response = response
     end
   end # class Hooks
-end # module RESTRack
+end # module RESTRack

data/test/sample_app_5/loader.rb

@@ -9,7 +9,7 @@ class SampleApp5::WebService < RESTRack::WebService; end
 RESTRack::CONFIG = RESTRack::load_config(File.join(File.dirname(__FILE__), 'config/constants.yaml'))
 RESTRack::CONFIG[:ROOT] = File.dirname(__FILE__)
 
-require File.join(RESTRack::CONFIG[:ROOT], 'hooks') if File.exists?(File.join(RESTRack::CONFIG[:ROOT], 'hooks'))
+require File.join(RESTRack::CONFIG[:ROOT], 'hooks') if File.exists?(File.join(RESTRack::CONFIG[:ROOT], 'hooks.rb'))
 
 # Dynamically load all controllers
 Find.find(  File.join(File.dirname(__FILE__), 'controllers') ) do |file|

data/test/sample_app_5/test/test_hooks.rb

@@ -20,6 +20,7 @@ class SampleApp5::TestHooks < Test::Unit::TestCase
     end
     test_val = { 'pre_processor_flag' => true.to_s }.to_json
     assert_equal test_val, output[2][0]
+    $post_processor_executed = nil
   end
 
   def test_pre_processor_disabled
@@ -34,6 +35,7 @@ class SampleApp5::TestHooks < Test::Unit::TestCase
     test_val = { 'pre_processor_flag' => nil.to_s }.to_json
     assert_equal test_val, output[2][0]
     RESTRack::CONFIG[:PRE_PROCESSOR_DISABLED] = false
+$post_processor_executed = nil
   end
 
   def test_post_processor_enabled
@@ -59,5 +61,50 @@ class SampleApp5::TestHooks < Test::Unit::TestCase
     end
     assert !$post_processor_executed
     RESTRack::CONFIG[:POST_PROCESSOR_DISABLED] = false
+    $post_processor_executed = nil
+  end
+  
+  def test_post_processor_has_response
+    RESTRack::CONFIG[:PRE_PROCESSOR_DISABLED] = false
+    RESTRack::CONFIG[:POST_PROCESSOR_DISABLED] = false
+    env = Rack::MockRequest.env_for('/hook/post_processor', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert $response.is_a? RESTRack::Response
+    $post_processor_executed = nil
+  end
+  
+  def test_post_processor_has_http_status_in_response
+    RESTRack::CONFIG[:PRE_PROCESSOR_DISABLED] = false
+    RESTRack::CONFIG[:POST_PROCESSOR_DISABLED] = false
+    env = Rack::MockRequest.env_for('/hook/post_processor', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal(200, $response.status)
+    $post_processor_executed = nil
+  end
+  
+  def test_post_processor_allows_pass_through_of_dynamic_request_attributes
+    RESTRack::CONFIG[:PRE_PROCESSOR_DISABLED] = false
+    RESTRack::CONFIG[:POST_PROCESSOR_DISABLED] = false
+    env = Rack::MockRequest.env_for('/hook/dynamic_request', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal(123456, $response.request.instance_variable_get('@error_code'))
+    assert_equal('Invalid password or email address combination', $response.request.instance_variable_get('@error_message'))
+    $post_processor_executed = nil
   end
-end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack