Refactor Lotus::Middleware

Ensure that we clean test fixture temp folder
This avoid spec failed spec with full_stack test

lib/lotus/commands/console.rb

@@ -40,7 +40,7 @@ def engine
       private
 
       def engine_lookup
-        (ENGINES.find {|_, klass| Object.const_defined?(klass) } || default_engine).first
+        (ENGINES.find { |_, klass| Object.const_defined?(klass) } || default_engine).first
       end
 
       def default_engine

lib/lotus/generators/application/container/lib/app_name.rb.tt

@@ -1,5 +1,5 @@
 require 'lotus/model'
-Dir["#{ __dir__ }/**/*.rb"].each {|file| require_relative file }
+Dir["#{ __dir__ }/**/*.rb"].each { |file| require_relative file }
 
 Lotus::Model.configure do
   # Database adapter

lib/lotus/middleware.rb

@@ -80,24 +80,45 @@ def load_middleware(middleware)
     # @since x.x.x
     def load_default_stack(application)
       @default_stack_loaded ||= begin
-        if @configuration.sessions.enabled?
-          use(*@configuration.sessions.middleware)
-        end
+        _load_session_middleware
+        _load_asset_middlewares
+        _load_default_welcome_page_for(application)
+        use Rack::MethodOverride
 
-        if @configuration.serve_assets
-          @configuration.assets.entries.each do |path, children|
-            use Rack::Static, urls: children, root: path
-          end
-        end
+        true
+      end
+    end
 
-        use Rack::MethodOverride
+    # Default welcome page
+    #
+    # @api private
+    # @since 0.2.0
+    def _load_default_welcome_page_for(application)
+      unless application.routes.defined?
+        require 'lotus/welcome'
+        use Lotus::Welcome
+      end
+    end
 
-        unless application.routes.defined?
-          require 'lotus/welcome'
-          use Lotus::Welcome
-        end
+    # Add session middleware
+    #
+    # @api private
+    # @since x.x.x
+    def _load_session_middleware
+      if @configuration.sessions.enabled?
+        use(*@configuration.sessions.middleware)
+      end
+    end
 
-        true
+    # Add asset middlewares
+    #
+    # @api private
+    # #since 0.2.0
+    def _load_asset_middlewares
+      if @configuration.serve_assets
+        @configuration.assets.entries.each do |path, children|
+          use Rack::Static, urls: children, root: path
+        end
       end
     end
   end

lib/lotus/routing/default.rb

@@ -17,7 +17,7 @@ def call(env)
       end
 
       def call(env)
-        action = NullAction.new.tap {|a| a.call(env) }
+        action = NullAction.new.tap { |a| a.call(env) }
         [ DEFAULT_CODE, {CONTENT_TYPE => action.content_type}, DEFAULT_BODY, action ]
       end
     end

test/commands/new_test.rb

@@ -132,7 +132,7 @@ def container_options
     describe 'lib/chirp.rb' do
       it 'generates it' do
         content = @root.join('lib/chirp.rb').read
-        content.must_match 'Dir["#{ __dir__ }/**/*.rb"].each {|file| require_relative file }'
+        content.must_match 'Dir["#{ __dir__ }/**/*.rb"].each { |file| require_relative file }'
         content.must_match %(require 'lotus/model')
         content.must_match %(Lotus::Model.configure)
         content.must_match %(adapter type: :file_system, uri: ENV['CHIRP_DATABASE_URL'])

test/fixtures/body_parsers/application.rb

@@ -10,7 +10,7 @@ def parse(body)
     result = {}
 
     xml = ::REXML::Document.new(body)
-    xml.elements.each('*') {|el| result[el.name] = el.text }
+    xml.elements.each('*') { |el| result[el.name] = el.text }
 
     result
   end