Merge branch 'master' into fix-issue-453

lib/lotus/commands/new/abstract.rb

@@ -62,7 +62,7 @@ def add_sql_templates
         def add_git_templates
           return if git_dir_present?
 
-          source = database_config.filesystem? ? 'gitignore.tt' : '.gitignore'
+          source = database_config.filesystem? ? 'gitignore_with_db.tt' : 'gitignore.tt'
           target = '.gitignore'
           add_mapping(source, target)
         end

lib/lotus/generators/application/app/Gemfile.tt

@@ -19,7 +19,7 @@ gem 'lotusrb',       '<%= Lotus::VERSION %>'
 gem 'lotus-model',   '<%= config[:lotus_model_version] %>'
 <%- end -%>
 
-<%- if config[:database_config][:gem] %>
+<%- if config[:database_config][:gem] -%>
 gem '<%= config[:database_config][:gem] %>'
 <%- end -%>
 

lib/lotus/generators/application/app/gitignore.tt

@@ -1,4 +1,2 @@
-/db/<%= config[:app_name] %>_development
-/db/<%= config[:app_name] %>_test
 /public/assets*
 /tmp

lib/lotus/generators/application/app/gitignore_with_db.tt

@@ -0,0 +1,4 @@
+/db/<%= config[:app_name] %>_development
+/db/<%= config[:app_name] %>_test
+/public/assets*
+/tmp

lib/lotus/generators/application/container/gitignore.tt

@@ -1,4 +1,2 @@
-/db/<%= config[:app_name] %>_development
-/db/<%= config[:app_name] %>_test
 /public/assets*
 /tmp

lib/lotus/generators/application/container/gitignore_with_db.tt

@@ -0,0 +1,4 @@
+/db/<%= config[:app_name] %>_development
+/db/<%= config[:app_name] %>_test
+/public/assets*
+/tmp

lib/lotus/welcome.rb

@@ -7,10 +7,12 @@ module Lotus
   class Welcome
     def initialize(app)
       @root = Pathname.new(__dir__).join('templates').realpath
-      @body = [ERB.new(@root.join('welcome.html.erb').read).result(binding)]
     end
 
     def call(env)
+      @request_path = env['REQUEST_PATH'] || ''
+      @body = [ERB.new(@root.join('welcome.html.erb').read).result(binding)]
+
       [200, {}, @body]
     end
 
@@ -24,10 +26,15 @@ def container?
       Environment.new.container?
     end
 
+    def application_class
+      applications = Lotus::Application.applications.to_a
+      applications.select do |app|
+        @request_path.include? app.configuration.path_prefix.to_s
+      end.first
+    end
+
     def app
-      Utils::String.new(
-        Application.applications.first
-      ).namespace.downcase
+      Utils::String.new(application_class).namespace.downcase
     end
   end
 end