Fix response override from internal middleware. Put action instances …

…in env.
hanami · Dec 1, 2014 · bea967f · bea967f
1 parent 350e391
commit bea967f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/lib/lotus/application.rb b/lib/lotus/application.rb
@@ -153,7 +153,7 @@ def name
     # @see Lotus::Application#middleware
     def call(env)
       middleware.call(env).tap do |response|
-        @rendering_policy.render(response)
+        @rendering_policy.render(env, response)
       end
     end
 

diff --git a/lib/lotus/frameworks.rb b/lib/lotus/frameworks.rb
@@ -6,9 +6,12 @@ module Lotus
   module Frameworks
     module Action
       module Rack
+        ENV_KEY = 'lotus.action'.freeze
+
         protected
-        def response
-          super << self
+        def finish
+          super
+          @_env[ENV_KEY] = self
         end
       end
     end

diff --git a/lib/lotus/rendering_policy.rb b/lib/lotus/rendering_policy.rb
@@ -12,7 +12,7 @@ class RenderingPolicy
     HEADERS = 1
     BODY    = 2
 
-    RACK_RESPONSE_SIZE = 3
+    LOTUS_ACTION = 'lotus.action'.freeze
 
     SUCCESSFUL_STATUSES   = (200..201).freeze
     STATUSES_WITHOUT_BODY = Set.new((100..199).to_a << 204 << 205 << 301 << 302 << 304).freeze
@@ -26,17 +26,15 @@ def initialize(configuration)
       @templates          = configuration.templates
     end
 
-    def render(response)
-      if renderable?(response)
-        action = response.pop
-
+    def render(env, response)
+      if action = renderable?(env)
         body = if successful?(response)
           view_for(response, action).render(
             action.to_rendering
           )
         else
           if render_status_page?(response, action)
-            Lotus::Views::Default.render(@templates, response[STATUS],response: response, format: :html)
+            Lotus::Views::Default.render(@templates, response[STATUS], response: response, format: :html)
           end
         end
 
@@ -45,8 +43,8 @@ def render(response)
     end
 
     private
-    def renderable?(response)
-      response.size > RACK_RESPONSE_SIZE
+    def renderable?(env)
+      env.delete(LOTUS_ACTION)
     end
 
     def successful?(response)

diff --git a/test/fixtures/sessions/application.rb b/test/fixtures/sessions/application.rb
@@ -1,11 +1,10 @@
 module SessionsApp
   class Application < Lotus::Application
     configure do
-      # Activate sessions
       sessions :cookie, secret: '1234567890'
 
       routes do
-        post   '/set_session'  , to: 'sessions#new'
+        post   '/set_session'  , to: 'sessions#create'
         get    '/get_session'  , to: 'sessions#show'
         delete '/clear_session', to: 'sessions#destroy'
       end
@@ -16,7 +15,7 @@ class Application < Lotus::Application
 
 
   module Controllers::Sessions
-    class New
+    class Create
       include SessionsApp::Action
 
       def call(params)
@@ -29,7 +28,7 @@ class Show
       include SessionsApp::Action
 
       def call(params)
-        self.body = session[:name]
+        self.body = session[:name] || '[empty]'
       end
     end
 

diff --git a/test/integration/sessions_test.rb b/test/integration/sessions_test.rb
@@ -31,7 +31,7 @@ def request
   it 'has empty session by default' do
     get '/get_session'
 
-    response.body.must_equal ''
+    response.body.must_equal '[empty]'
   end
 
   it 'allows to set session' do
@@ -49,12 +49,11 @@ def request
 
   it 'allows to clear session' do
     post '/set_session', { name: 'Lotus' }
-    delete '/clear_session', nil, { 'HTTP_COOKIE' => response.headers['Set-Cookie'] }
 
+    delete '/clear_session', nil, { 'HTTP_COOKIE' => response.headers['Set-Cookie'] }
     response.body.must_equal 'Session cleared for: Lotus'
 
     get '/get_session', nil, { 'HTTP_COOKIE' => response.headers['Set-Cookie'] }
-
-    response.body.must_equal ''
+    response.body.must_equal '[empty]'
   end
 end