lotusrb 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14dca86469ca5f5042c6bc2ea9e31ebaad01d19a
-  data.tar.gz: 0f6cbdd53e4f2c60a666fe1d691e4fda872a4f95
+  metadata.gz: a931d2f52487797eb662bea70ae481e1d542a3ca
+  data.tar.gz: c2196ffd93716d30eddda44e75a90972ac72728a
 SHA512:
-  metadata.gz: b134692103f23248c496e9f4bdac72c1cd3d1b8b31961c0aa1823da8c9d25e13351f57200ac81ebed0b66361e51990b1ab5497945b79529b9d0f65e887d262c7
-  data.tar.gz: d47a47dd5fa20eeb449c5ee48d0e3c712f3e4eeaa62929e2329e4fb413a31ed15a1b4562ad357f936d6e56a1eaeb17e122144261579b8f4a9fc7b9eb4add653c
+  metadata.gz: ce8c51b74f48615ef9c9efd5a8b78b5d259877bc23381af72dc427603b67b8ba2335f02b754041ad3ed01ff91171b6d53794ce147d76c31b3568572b59b922ba
+  data.tar.gz: efcc502bd4366499ddca11100877fc9e38d2e1a44ee808e7b2367836ef3707eaecc87480fc068bf5331e6b5bbd393755335c98aaafb8bca21ff71cbb35436815

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Lotus
 A complete web framework for Ruby
 
+## v0.6.1 - 2016-01-19
+### Fixed
+- [Anton Davydov] Show the current app name in Welcome page (eg. `/admin` shows instructions on how to generate an action for `Admin` app)
+- [Anton Davydov] Fix project creation when name contains dashes (eg. `"awesome-project" => "AwesomeProject"`)
+- [Anton Davydov] Ensure to add assets related entries to `.gitignore` when a project is generated with the `--database` flag
+- [deepj] Avoid blank lines in generated `Gemfile`
+- [trexnix] Fix for `lotus destroy app`: it doesn't cause a syntax error in `config/application.rb` anymore
+- [Serg Ikonnikov & Trung Lê] Ensure console to use the bundled engine
+
 ## v0.6.0 - 2016-01-12
 ### Added
 - [Luca Guidi] Introduced configurable assets compressors

data/FEATURES.md

@@ -3,6 +3,8 @@
 
 ## Features
 
+## v0.6.1 - 2016-01-19
+
 ## v0.6.0 - 2016-01-12
 
 - Assets preprocessors support (eg. Sass, ES6, Opal, Less, CoffeScript..)

data/lib/lotus/cli.rb

@@ -51,7 +51,7 @@ module Lotus
     $ > lotus console --engine=pry
     EOS
     method_option :environment, desc: 'path to environment configuration (config/environment.rb)'
-    method_option :engine, desc: "choose a specific console engine: (#{Lotus::Commands::Console::ENGINES.keys.join('/')})", default: Lotus::Commands::Console::DEFAULT_ENGINE
+    method_option :engine, desc: "choose a specific console engine: (#{Lotus::Commands::Console::ENGINES.keys.join('/')})"
     method_option :help, desc: 'displays the usage method'
     def console
       if options[:help]

data/lib/lotus/commands/generate/app.rb

@@ -59,7 +59,7 @@ module Lotus
 
         def add_require_app
           # Add "require_relative '../apps/web/application'"
-          generator.inject_into_file base_path.join('config/environment.rb'), after: /require_relative '\.\.\/lib\/(.*)'/ do
+          generator.inject_into_file base_path.join('config/environment.rb'), after: /require_relative '\.\.\/lib\/.*'/ do
             "\nrequire_relative '../apps/#{ app_name }/application'"
           end
         end
@@ -96,7 +96,7 @@ module Lotus
         end
 
         def classified_app_name
-          Utils::String.new(app_name).classify
+          Utils::String.new(app_name).classify.tr('::', '')
         end
 
         def assert_application_name!(value)

data/lib/lotus/commands/new/abstract.rb

@@ -62,7 +62,7 @@ module Lotus
         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

data/lib/lotus/commands/new/app.rb

@@ -104,7 +104,7 @@ module Lotus
         end
 
         def classified_app_name
-          Utils::String.new(app_name).classify
+          Utils::String.new(app_name).classify.tr('::', '')
         end
 
         # def application_base_path

data/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 -%>
 

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

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

data/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

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

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

data/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

data/lib/lotus/version.rb

@@ -2,5 +2,5 @@ module Lotus
   # Defines the version
   #
   # @since 0.1.0
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/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 @@ module Lotus
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotusrb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -322,6 +322,7 @@ files:
 - lib/lotus/generators/application/app/features_helper.rb.minitest.tt
 - lib/lotus/generators/application/app/features_helper.rb.rspec.tt
 - lib/lotus/generators/application/app/gitignore.tt
+- lib/lotus/generators/application/app/gitignore_with_db.tt
 - lib/lotus/generators/application/app/lib/app_name.rb.tt
 - lib/lotus/generators/application/app/lib/chirp/entities/.gitkeep
 - lib/lotus/generators/application/app/lib/chirp/repositories/.gitkeep
@@ -349,6 +350,7 @@ files:
 - lib/lotus/generators/application/container/features_helper.rb.minitest.tt
 - lib/lotus/generators/application/container/features_helper.rb.rspec.tt
 - lib/lotus/generators/application/container/gitignore.tt
+- lib/lotus/generators/application/container/gitignore_with_db.tt
 - lib/lotus/generators/application/container/lib/app_name.rb.tt
 - lib/lotus/generators/application/container/lib/chirp/entities/.gitkeep
 - lib/lotus/generators/application/container/lib/chirp/mailers/.gitkeep