lotusrb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c8e5cd99a779eb8d3a481262d6af49538a457e
-  data.tar.gz: 5ea631568ee7e5fc205204e97c7d5daecaa8be5d
+  metadata.gz: 14dca86469ca5f5042c6bc2ea9e31ebaad01d19a
+  data.tar.gz: 0f6cbdd53e4f2c60a666fe1d691e4fda872a4f95
 SHA512:
-  metadata.gz: ed2204a15910591470fbb00e31331180a2192bbf0b9b4871a6b7fb5c2cdd9a043e53ecbb2193e32531f27ed5b14229118af90a7d441a69679cb156f6a5f2b0ab
-  data.tar.gz: e89361b9895b13d112f743e11ee83889be44561a6159429a24b9eb85c0297c20e9f8ed6e1ea386249776f094a6373417df5d7350e67351650a65f52022794523
+  metadata.gz: b134692103f23248c496e9f4bdac72c1cd3d1b8b31961c0aa1823da8c9d25e13351f57200ac81ebed0b66361e51990b1ab5497945b79529b9d0f65e887d262c7
+  data.tar.gz: d47a47dd5fa20eeb449c5ee48d0e3c712f3e4eeaa62929e2329e4fb413a31ed15a1b4562ad357f936d6e56a1eaeb17e122144261579b8f4a9fc7b9eb4add653c

data/CHANGELOG.md

@@ -1,9 +1,52 @@
 # Lotus
 A complete web framework for Ruby
 
+## v0.6.0 - 2016-01-12
+### Added
+- [Luca Guidi] Introduced configurable assets compressors
+- [Luca Guidi] Introduced "CDN mode" in order to serve static assets via Content Distribution Networks
+- [Luca Guidi] Introduced "Digest mode" in production in order to generate and serve assets with checksum suffix
+- [Luca Guidi] Introduced `lotus assets precompile` command to precompile, minify and append checksum suffix to static assets
+- [Luca Guidi] Send `Content-Cache` HTTP header when serving static assets in production mode
+- [Luca Guidi] Support new env var `SERVE_STATIC_ASSETS="true"` in order to serve static assets for the entire project
+- [Luca Guidi] Generate new applications by including `Web::Assets::Helpers` in `view.prepare` block
+- [Luca Guidi] Introduced new Rake tasks `:preload` and `:environment`
+- [Luca Guidi] Introduced new Rake tasks `db:migrate` and `assets:precompile` for Rails/Heroku compatibility
+- [Tadeu Valentt & Lucas Allan Amorin] Added `lotus destroy` command for apps, models, actions, migrations and mailers
+- [Lucas Allan Amorim] Custom initializers (`apps/web/config/initializers`) they are ran when the project is loaded and about to start
+- [Trung Lê] Generate mailer templates directory for new projects (eg. `lib/bookshelf/mailers/templates`)
+- [Tadeu Valentt] Alias `--database` as `-d` for `lotus new`
+- [Tadeu Valentt] Alias `--arch` as `-a` for `lotus new`
+- [Sean Collins] Let `lotus generate action` to guess HTTP method (`--method` arg) according to RESTful conventions
+- [Gonzalo Rodríguez-Baltanás Díaz] Generate new applications with default favicon
+
+### Fixed
+- [Neil Matatall] Use "secure compare" for CSRF tokens in order to prevent timing attacks
+- [Bernardo Farah] Fix support for chunked response body (via `Rack::Chunked::Body`)
+- [Lucas Allan Amorim] Add `bundler` as a runtime dependency
+- [Lucas Allan Amorim] Ensure to load properly Bundler dependencies when starting the application
+- [Luca Guidi] Ensure sessions to be always available for other middleware in Rack stack of single applications
+- [Ken Gullaksen] Ensure to specify `LOTUS_PORT` env var from `.env`
+- [Andrey Deryabin] Fix `lotus new .` and prevent to generate the project in a subdirectory of current one
+- [Jason Charnes] Validate entity name for model generator
+- [Caius Durling] Fixed generator for nested actions (eg. `lotus generate action web domains/certs#index`)
+- [Tadeu Valentt] Prevent to generate migrations with the same name
+- [Luca Guidi] Ensure RSpec examples to be generated with `RSpec.describe` instead of only `describe`
+- [Andrey Deryabin] Avoid `lotus` command to generate unnecessary `.lotusrc` files
+- [Jason Charnes] Convert camel case application name into snake case when generating actions (eg. `BeautifulBlossoms` to `beautiful_blossoms`)
+- [Alfonso Uceda Pompa] Convert dasherized names into underscored names when generating projects (eg. `awesome-project` to `awesome_project`)
+
+### Changed
+- [Sean Collins] Welcome page shows current year in copyright notes
+- [Luca Guidi] Add `/public/assets*` to `.gitignore` of new projects
+- [Luca Guidi] Removed support for `default_format` in favor of `default_request_format`
+- [Luca Guidi] Removed support for `apps/web/public` in favor of `apps/web/assets` as assets sources for applications
+- [Luca Guidi] Removed support for `serve_assets` for single applications in order to global static assets server enabled via `SERVE_STATIC_ASSETS` env var
+- [Luca Guidi] `assets` configuration in `apps/web/application.rb` now accepts a block to configure sources and other settings
+
 ## v0.5.0 - 2015-09-30
 ### Added
-- [Ines Coelho & Rosa Faria] Mailers
+- [Ines Coelho & Rosa Faria] Introduced mailers support
 - [Theo Felippe] Added configuration entries: `#default_request_format` and `default_response_format`
 - [Rodrigo Panachi] Introduced `logger` configuration for applications, to be used like this: `Web::Logger.debug`
 - [Ben Lovell] Simpler and less verbose RSpec tests
@@ -26,7 +69,7 @@ A complete web framework for Ruby
 ### Fixed
 - [Alfonso Uceda Pompa] Ensure to load correctly apps in `lotus console`
 - [Alfonso Uceda Pompa] Ensure to not duplicate prefix for Container mounted apps (eg `/admin/admin/dashboard`)
-- [Alfonso Uceda Pompa] Ensure generator for application arch to generate session secret
+- [Alfonso Uceda Pompa] Ensure generator for "application" architecture to generate session secret
 - [Alfonso Uceda Pompa & Trung Lê & Hiếu Nguyễn] Exit unsuccessfully when `lotus generate model` doesn't receive a mandatory name for model
 - [Miguel Molina] Exit unsuccessfully when `lotus new --database` receives an unknown value
 - [Luca Guidi] Ensure to prepend sessions middleware, so other Rack components can have access to HTTP session
@@ -49,7 +92,7 @@ A complete web framework for Ruby
 - [Luca Guidi] `.env`, `.env.development` and `.env.test` are generated and expected to be placed at the root of the project.
 - [Luca Guidi] Remove database mapping from generated apps.
 - [Trung Lê & Luca Guidi] Remove default generated from new apps.
-- [Luca Guidi] New application should depend on `lotus-model ~> 0.4`
+- [Luca Guidi] New projects should depend on `lotus-model ~> 0.4`
 
 ## v0.3.2 - 2015-05-22
 ### Added
@@ -79,9 +122,9 @@ A complete web framework for Ruby
 - [Luca Guidi] Introduced action generator. Eg. `bundle exec lotus generate action web dashboard#index`
 - [Alfonso Uceda Pompa] Allow to specify default coookies options in application configuration. Eg. `cookies true, { domain: 'lotusrb.org' }`
 - [Tom Kadwill] Include `Lotus::Helpers` in views.
-- [Linus Pettersson] Allow to specify `--database` CLI option when generate a new application. Eg. `lotus new bookshelf --database=postgresql`
-- [Linus Pettersson] Initialize a Git repository when generating a new application
-- [Alfonso Uceda Pompa] Produce `.lotusrc` when generating a new application
+- [Linus Pettersson] Allow to specify `--database` CLI option when generate a new project. Eg. `lotus new bookshelf --database=postgresql`
+- [Linus Pettersson] Initialize a Git repository when generating a new project
+- [Alfonso Uceda Pompa] Produce `.lotusrc` when generating a new project
 - [Alfonso Uceda Pompa] Security HTTP headers. `X-Frame-Options` and `Content-Security-Policy` are now enabled by default.
 - [Linus Pettersson] Database console. Run with `bundle exec lotus db console`
 - [Luca Guidi] Dynamic finders for relative and absolute routes. It implements method missing: `Web::Routes.home_path` will resolve to `Web::Routes.path(:home)`.
@@ -95,21 +138,21 @@ A complete web framework for Ruby
 ### Added
 - [Huy Đỗ] Introduced `Lotus::Logger`
 - [Jimmy Zhang] `lotus new` accepts a `--path` argument
-- [Jimmy Zhang] Application generator for the current directory (`lotus new .`). This is useful to provide a web deliverable for existing Ruby gems.
-- [Trung Lê] Add example mapping file for application generator: `lib/config/mapping.rb`
-- [Hiếu Nguyễn] RSpec support for application generator: `--test=rspec` or `--test=minitest` (default)
+- [Jimmy Zhang] Project generator for the current directory (`lotus new .`). This is useful to provide a web deliverable for existing Ruby gems.
+- [Trung Lê] Add example mapping file for project generator: `lib/config/mapping.rb`
+- [Hiếu Nguyễn] RSpec support for project generator: `--test=rspec` or `--test=minitest` (default)
 
 ### Fixed
 - [Luca Guidi] `lotus version` to previx `v` (eg `v0.2.1`)
-- [Rob Yurkowski] Ensure application name doesn't contain special or forbidden characters
+- [Rob Yurkowski] Ensure project name doesn't contain special or forbidden characters
 - [Luca Guidi] Ensure all the applications are loaded in console
-- [Trung Lê] Container architecture: preload only `lib/<appname>/**/*.rb`
-- [Hiếu Nguyễn] Fixed `lotus new` to print usage when application name isn't provided
+- [Trung Lê] Container architecture: preload only `lib/<projectname>/**/*.rb`
+- [Hiếu Nguyễn] Fixed `lotus new` to print usage when project name isn't provided
 
 ## v0.2.0 - 2014-06-23
 ### Added
-- [Luca Guidi] Introduced `lotus new` as a command to generate applications. It supports "container" architecture for now.
-- [Luca Guidi] Show a welcome page when the application doesn't have routes
+- [Luca Guidi] Introduced `lotus new` as a command to generate projects. It supports "container" architecture for now.
+- [Luca Guidi] Show a welcome page when one mounted Lotus application doesn't have routes
 - [Luca Guidi] Introduced `Lotus::Application.preload!` to preload all the Lotus applications in a given Ruby process. (Bulk `Lotus::Application.load!`)
 - [Trung Lê] Allow browsers to fake non `GET`/`POST` requests via `Rack::MethodOverride`
 - [Josue Abreu] Allow to define body parses for non `GET` HTTP requests (`body_parsers` configuration)

data/FEATURES.md

@@ -3,6 +3,27 @@
 
 ## Features
 
+## v0.6.0 - 2016-01-12
+
+- Assets preprocessors support (eg. Sass, ES6, Opal, Less, CoffeScript..)
+- Assets compressors (eg. YUI, UglifyJS2, Google Closure Compiler, Sass..)
+- Assets helpers:
+  * `javascript`
+  * `stylesheet`
+  * `favicon`
+  * `image`
+  * `video`
+  * `audio`
+  * `asset_path`
+  * `asset_url`
+- Content Delivery Network (CDN) support for static assets (CDN mode)
+- Checksum suffix for static assets in production mode (Digest mode)
+- Support for third party gems as assets distribution channel (eg. `lotus-jquery`)
+- CLI: `lotus assets` command `precompile`: preprocess, minify and append checksum suffix
+- CLI: `lotus destroy` destroy apps, models, actions, migrations and mailers
+- Custom initializers (`apps/web/config/initializers`)
+- Rake tasks `:preload` and `:environment`
+
 ## v0.5.0 - 2015-09-30
 
 - Mailers

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2015 Luca Guidi
+Copyright © 2014-2016 Luca Guidi
 
 MIT License
 

data/README.md

@@ -12,6 +12,7 @@ Lotus combines small yet powerful frameworks:
 * [**Lotus::Helpers**](https://github.com/lotus/helpers) - View helpers for Ruby applications
 * [**Lotus::Mailer**](https://github.com/lotus/mailer) - Mail for Ruby applications
 * [**Lotus::Model**](https://github.com/lotus/model) - Persistence with entities, repositories and data mapper
+* [**Lotus::Assets**](https://github.com/lotus/assets) - Assets management for Ruby
 * [**Lotus::View**](https://github.com/lotus/view) - Presentation with a separation between views and templates
 * [**Lotus::Controller**](https://github.com/lotus/controller) - Full featured, fast and testable actions for Rack
 
@@ -20,12 +21,12 @@ If you aren't familiar with them, please take time to go through their READMEs.
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/lotusrb.png)](http://badge.fury.io/rb/lotusrb)
-[![Build Status](https://secure.travis-ci.org/lotus/lotus.png?branch=master)](http://travis-ci.org/lotus/lotus?branch=master)
-[![Coverage](https://coveralls.io/repos/lotus/lotus/badge.png?branch=master)](https://coveralls.io/r/lotus/lotus)
-[![Code Climate](https://codeclimate.com/github/lotus/lotus.png)](https://codeclimate.com/github/lotus/lotus)
-[![Dependencies](https://gemnasium.com/lotus/lotus.png)](https://gemnasium.com/lotus/lotus)
-[![Inline docs](http://inch-ci.org/github/lotus/lotus.png)](http://inch-ci.org/github/lotus/lotus)
+[![Gem Version](https://badge.fury.io/rb/lotusrb.svg)](http://badge.fury.io/rb/lotusrb)
+[![Build Status](https://secure.travis-ci.org/lotus/lotus.svg?branch=master)](http://travis-ci.org/lotus/lotus?branch=master)
+[![Coverage](https://coveralls.io/repos/lotus/lotus/badge.svg?branch=master)](https://coveralls.io/r/lotus/lotus)
+[![Code Climate](https://codeclimate.com/github/lotus/lotus.svg)](https://codeclimate.com/github/lotus/lotus)
+[![Dependencies](https://gemnasium.com/lotus/lotus.svg)](https://gemnasium.com/lotus/lotus)
+[![Inline docs](http://inch-ci.org/github/lotus/lotus.svg)](http://inch-ci.org/github/lotus/lotus)
 
 ## Contact
 
@@ -96,4 +97,4 @@ __Lotus__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2015 Luca Guidi – Released under MIT License
+Copyright © 2014-2016 Luca Guidi – Released under MIT License

data/bin/lotus

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
+require 'bundler'
 require 'lotus/cli'
 Lotus::Cli.start

data/lib/lotus.rb

@@ -9,6 +9,8 @@ require 'lotus/environment'
 #
 # @see http://lotusrb.org
 module Lotus
+  DEFAULT_PUBLIC_DIRECTORY = 'public'.freeze
+
   # Return root of the project (top level directory).
   #
   # @return [Pathname] root path
@@ -21,6 +23,10 @@ module Lotus
     environment.root
   end
 
+  def self.public_directory
+    root.join(DEFAULT_PUBLIC_DIRECTORY)
+  end
+
   # Return the current environment
   #
   # @return [String] the current environment

data/lib/lotus/action/csrf_protection.rb

@@ -129,7 +129,7 @@ module Lotus
       # @api private
       def invalid_csrf_token?
         verify_csrf_token? &&
-          session[CSRF_TOKEN] != params[CSRF_TOKEN]
+          ! ::Rack::Utils.secure_compare(session[CSRF_TOKEN], params[CSRF_TOKEN])
       end
 
       # Generates a random CSRF Token

data/lib/lotus/application.rb

@@ -134,9 +134,9 @@ module Lotus
     #     end
     #
     #     module Controllers::Dashboard
-    #       include OneFile::Controller
+    #       class Index
+    #         include OneFile::Action
     #
-    #       action 'Index' do
     #         def call(params)
     #           self.body = 'Hello!'
     #         end
@@ -211,10 +211,10 @@ module Lotus
     # @since 0.1.0
     #
     # @see http://rack.github.io
+    # @see Lotus::RenderingPolicy#render
     # @see Lotus::Application#middleware
     def call(env)
-      renderer.render(env,
-                      middleware.call(env))
+      renderer.render(env, middleware.call(env))
     end
 
     # Rack middleware stack

data/lib/lotus/application_name.rb

@@ -9,7 +9,6 @@ module Lotus
     # @since 0.2.1
     RESERVED_WORDS = %w(lotus).freeze
 
-
     # Initialize and check against reserved words
     #
     # An application name needs to be translated in quite a few ways:
@@ -33,9 +32,10 @@ module Lotus
       ensure_validity!
     end
 
-
     # Returns the cleaned application name.
     #
+    # @return [String] the santized name
+    #
     # @example
     #   ApplicationName.new("my-App ").to_s # => "my-app"
     #
@@ -44,10 +44,11 @@ module Lotus
       @name
     end
 
-
     # Returns the application name uppercased with non-alphanumeric characters
     # as underscores.
     #
+    # @return [String] the upcased name
+    #
     # @example
     #   ApplicationName.new("my-app").to_env_s => "MY_APP"
     #
@@ -56,10 +57,12 @@ module Lotus
       @name.upcase.gsub(/\W/, '_')
     end
 
-
     # Returns true if a potential application name matches one of the reserved
     # words.
     #
+    # @param name [String] the application name
+    # @return [TrueClass, FalseClass] the result of the check
+    #
     # @example
     #   Lotus::ApplicationName.invalid?("lotus") # => true
     #
@@ -68,7 +71,6 @@ module Lotus
       RESERVED_WORDS.include?(name)
     end
 
-
     private
 
     # Raises RuntimeError with explanation if the provided name is invalid.
@@ -83,7 +85,6 @@ module Lotus
       end
     end
 
-
     # Cleans a string to be a functioning application name.
     #
     # @api private
@@ -94,6 +95,7 @@ module Lotus
         .strip
         .gsub(/\s/, '_')
         .gsub(/_{2,}/, '_')
+        .gsub(/-/, '_')
     end
   end
 end

data/lib/lotus/cli.rb

@@ -1,110 +1,119 @@
 require 'thor'
-require 'lotus/environment'
-require 'lotus/version'
+require 'lotus/commands/console'
+require 'lotus/commands/new/app'
+require 'lotus/commands/new/container'
 
 module Lotus
   class Cli < Thor
-    include Thor::Actions
+    # include Thor::Actions
 
     desc 'version', 'prints Lotus version'
+    long_desc <<-EOS
+    `lotus version` prints the version of the bundled lotus gem.
+    EOS
     def version
+      require 'lotus/version'
       puts "v#{ Lotus::VERSION }"
     end
 
     desc 'server', 'starts a lotus server'
-    method_option :port,      aliases: '-p', desc: 'The port to run the server on, '
-    method_option :server,                   desc: 'choose a specific Rack::Handler, e.g. webrick, thin etc'
-    method_option :rackup,                   desc: 'a rackup configuration file path to load (config.ru)'
-    method_option :host,                     desc: 'the host address to bind to'
-    method_option :debug,                    desc: 'turn on debug output'
-    method_option :warn,                     desc: 'turn on warnings'
-    method_option :daemonize,                desc: 'if true, the server will daemonize itself (fork, detach, etc)'
-    method_option :pid,                      desc: 'path to write a pid file after daemonize'
-    method_option :environment,              desc: 'path to environment configuration (config/environment.rb)'
-    method_option :code_reloading,           desc: 'code reloading', type: :boolean, default: true
-    method_option :help,      aliases: '-h', desc: 'displays the usage message'
+    long_desc <<-EOS
+    `lotus server` starts a server for the current lotus project.
 
+    $ > lotus server
+
+    $ > lotus server -p 4500
+    EOS
+    method_option :port, aliases: '-p', desc: 'The port to run the server on, '
+    method_option :server, desc: 'choose a specific Rack::Handler, e.g. webrick, thin etc'
+    method_option :rackup, desc: 'a rackup configuration file path to load (config.ru)'
+    method_option :host, desc: 'the host address to bind to'
+    method_option :debug, desc: 'turn on debug output'
+    method_option :warn, desc: 'turn on warnings'
+    method_option :daemonize, desc: 'if true, the server will daemonize itself (fork, detach, etc)'
+    method_option :pid, desc: 'path to write a pid file after daemonize'
+    method_option :environment, desc: 'path to environment configuration (config/environment.rb)'
+    method_option :code_reloading, desc: 'code reloading', type: :boolean, default: true
+    method_option :help, desc: 'displays the usage message'
     def server
       if options[:help]
         invoke :help, ['server']
       else
         require 'lotus/commands/server'
-        Lotus::Commands::Server.new(environment).start
+        Lotus::Commands::Server.new(options).start
       end
     end
 
     desc 'console', 'starts a lotus console'
-    method_option :environment,           desc: 'path to environment configuration (config/environment.rb)'
-    method_option :engine,                desc: 'choose a specific console engine: irb/pry/ripl (irb)'
-    method_option :help,   aliases: '-h', desc: 'displays the usage method'
+    long_desc <<-EOS
+    `lotus console` starts the interactive lotus console.
 
+    $ > 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 :help, desc: 'displays the usage method'
     def console
       if options[:help]
         invoke :help, ['console']
       else
-        require 'lotus/commands/console'
-        Lotus::Commands::Console.new(environment).start
+        Lotus::Commands::Console.new(options).start
       end
     end
 
-    desc 'routes', 'prints routes'
-    method_option :environment,                 desc: 'path to environment configuration (config/environment.rb)'
-    method_option :help,         aliases: '-h', desc: 'displays the usage method'
+    desc 'new APPLICATION_NAME', 'generate a new lotus project'
+    long_desc <<-EOS
+      `lotus new` creates a new lotus project.
+      You can specify various options such as the database to be used as well as the path and architecture.
 
-    def routes
-      if options[:help]
-        invoke :help, ['routes']
-      else
-        require 'lotus/commands/routes'
-        Lotus::Commands::Routes.new(environment).start
-      end
-    end
+      $ > lotus new fancy_app --application_name=admin
 
-    desc 'new', 'generates a new application'
-    method_option :database,             aliases: ['-d', '--db'],   desc: 'application database (filesystem/memory/postgresql/sqlite3/mysql)', type: :string,  default: 'filesystem'
-    method_option :architecture,         aliases: ['-a', '--arch'], desc: 'application architecture (container/app)', type: :string, default: 'container'
-    method_option :application,                                     desc: 'application name',         type: :string,  default: 'web'
-    method_option :application_base_url,                            desc: 'application base url',     type: :string,  default: '/'
-    method_option :path,                                            desc: 'path',                     type: :string
-    method_option :test,                                            desc: 'application test framework (rspec/minitest)', type: :string, default: 'minitest'
-    method_option :lotus_head,                                      desc: 'use Lotus HEAD',           type: :boolean, default: false
-    method_option :help,                 aliases: '-h',             desc: 'displays the usage method'
-
-    def new(name = nil)
-      if options[:help] || name.nil?
+      $ > lotus new fancy_app --arch=app
+
+      $ > lotus new fancy_app --lotus-head=true
+    EOS
+    method_option :database, aliases: ['-d', '--db'], desc: "application database (#{Lotus::Generators::DatabaseConfig::SUPPORTED_ENGINES.keys.join('/')})", default: Lotus::Generators::DatabaseConfig::DEFAULT_ENGINE
+    method_option :architecture, aliases: ['-a', '--arch'], desc: 'project architecture (container/app)', default: Lotus::Commands::New::Abstract::DEFAULT_ARCHITECTURE
+    method_option :application_name, desc: 'application name, only for container', default: Lotus::Commands::New::Container::DEFAULT_APPLICATION_NAME
+    method_option :application_base_url, desc: 'application base url', default: Lotus::Commands::New::Abstract::DEFAULT_APPLICATION_BASE_URL
+    method_option :test, desc: "project test framework (#{Lotus::Generators::TestFramework::VALID_FRAMEWORKS.join('/')})", default: Lotus::Lotusrc::DEFAULT_TEST_SUITE
+    method_option :lotus_head, desc: 'use Lotus HEAD (true/false)', type: :boolean, default: false
+    method_option :help, desc: 'displays the usage method'
+    def new(application_name)
+      if options[:help]
         invoke :help, ['new']
+      elsif options[:architecture] == 'app'
+        Lotus::Commands::New::App.new(options, application_name).start
       else
-        require 'lotus/commands/new'
-        Lotus::Commands::New.new(name, environment, self).start
+        Lotus::Commands::New::Container.new(options, application_name).start
       end
     end
 
-    desc 'generate', 'generates app, action, model, mailer or migration'
-    method_option :application_base_url, desc: 'application base url',                                      type: :string
-    method_option :path,                 desc: 'applications path',                                         type: :string
-    method_option :url,                  desc: 'relative URL for action',                                   type: :string
-    method_option :method,               desc: "HTTP method for action. Upper/lower case is ignored. Must be one of GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS, TRACE.", type: :string, default: 'GET'
-    method_option :skip_view,            desc: 'skip the creation of view and templates (only for action)', type: :boolean, default: false
-    method_option :help, aliases: '-h',  desc: 'displays the usage method'
-
-    # @since 0.3.0
-    # @api private
-    def generate(type = nil, app_name = nil, name = nil)
-      if options[:help] || (type.nil? && app_name.nil? && name.nil?)
-        invoke :help, ['generate']
+    desc 'routes', 'prints the routes'
+    long_desc <<-EOS
+      `lotus routes` outputs all the registered routes to the console.
+    EOS
+    method_option :environment, desc: 'path to environment configuration (config/environment.rb)'
+    method_option :help, desc: 'displays the usage method'
+    def routes
+      if options[:help]
+        invoke :help, ['routes']
       else
-        require 'lotus/commands/generate'
-        Lotus::Commands::Generate.new(type, app_name, name, environment, self).start
+        require 'lotus/commands/routes'
+        Lotus::Commands::Routes.new(options).start
       end
     end
 
-    require 'lotus/commands/db'
-    register Lotus::Commands::DB, 'db', 'db [SUBCOMMAND]', 'manage set of DB operations'
+    require 'lotus/cli_sub_commands/db'
+    register Lotus::CliSubCommands::DB, 'db', 'db [SUBCOMMAND]', 'manage set of DB operations'
 
-    private
+    require 'lotus/cli_sub_commands/generate'
+    register Lotus::CliSubCommands::Generate, 'generate', 'generate [SUBCOMMAND]', 'generate lotus classes'
 
-    def environment
-      Lotus::Environment.new(options)
-    end
+    require 'lotus/cli_sub_commands/destroy'
+    register Lotus::CliSubCommands::Destroy, 'destroy', 'destroy [SUBCOMMAND]', 'destroy lotus classes'
+
+    require 'lotus/cli_sub_commands/assets'
+    register Lotus::CliSubCommands::Assets, 'assets', 'assets [SUBCOMMAND]', 'manage assets'
   end
 end