lib/rails/session_cookie/app.rb in rails-session_cookie-0.2.2 vs lib/rails/session_cookie/app.rb in rails-session_cookie-0.3.0

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'action_dispatch'
 
 module Rails
   module SessionCookie
     # This mini rack app allows easily get rails session cookie
@@ -18,11 +20,11 @@
           result = app.call(env)
           result.is_a?(Hash) ? [200, result, []] : result
         }
       end
 
-      attr_reader :app, :rails_app
+      attr_reader :app
 
       def initialize(app, session_options = nil)
         auth_session_options = session_options || rails_app.config.session_options
 
         auth_app = if app.respond_to?(:call)
@@ -33,11 +35,11 @@
 
         @app = with_middlewares(auth_app, auth_session_options)
       end
 
       def call(env = {})
-        app.call(default_env.merge(env).dup)
+        app.call(default_env.merge(Env.new(env).env).dup)
       end
 
       def session_cookie(env = {})
         _status, headers, _body = call(env)
         headers[ActionDispatch::Cookies::HTTP_HEADER]
@@ -56,10 +58,10 @@
       def default_env
         rails_app.env_config.merge('REQUEST_METHOD' => 'GET')
       end
 
       def rails_app
-        @rails_app ||= defined?(Rails) && Rails.application || raise(NoRailsApplication)
+        @rails_app ||= (defined?(Rails) && Rails.application) || raise(NoRailsApplication)
       end
     end
   end
 end