glue.rb in hanami-controller-2.0.0.alpha1

- old
+ new

@@ -1,7 +1,7 @@
 module Hanami
-  module Action
+  class Action
     # Glue code for full stack Hanami applications
     #
     # This includes missing rendering logic that it makes sense to include
     # only for web applications.
     #
@@ -12,55 +12,29 @@
       #
       # @api private
       # @since 0.3.0
       ENV_KEY = 'hanami.action'.freeze
 
-      # @api private
-      # @since 0.3.2
-      ADDITIONAL_HTTP_STATUSES_WITHOUT_BODY = Set.new([301, 302]).freeze
-
-      # Override Ruby's Module#included
-      #
-      # @api private
-      # @since 0.3.0
-      def self.included(base)
-        base.class_eval { _expose(:format) if respond_to?(:_expose) }
-      end
-
-      # Check if the current HTTP request is renderable.
-      #
-      # It verifies if the verb isn't HEAD, if the status demands to omit
-      # the body and if it isn't sending a file.
-      #
-      # @return [TrueClass,FalseClass] the result of the check
-      #
-      # @api private
-      # @since 0.3.2
-      def renderable?
-        !_requires_no_body? &&
-          !sending_file?    &&
-          !ADDITIONAL_HTTP_STATUSES_WITHOUT_BODY.include?(@_status)
-      end
-
       protected
+
       # Put the current instance into the Rack environment
       #
       # @api private
       # @since 0.3.0
       #
       # @see Hanami::Action#finish
-      def finish
+      def finish(req, *)
+        req.env[ENV_KEY] = self
         super
-        @_env[ENV_KEY] = self
       end
 
       # Check if the request's body is a file
       #
       # @return [TrueClass,FalseClass] the result of the check
       #
       # @since 0.4.3
       def sending_file?
-        @_body.is_a?(::Rack::File::Iterator)
+        response.body.is_a?(::Rack::File::Iterator)
       end
     end
   end
 end