lotusrb 0.5.0 → 0.6.0

data/lib/lotus/middleware.rb

@@ -52,7 +52,7 @@ module Lotus
       @builder.call(env)
     end
 
-    # Add a middleware to the stack.
+    # Append a middleware to the stack.
     #
     # @param middleware [Object] a Rack middleware
     # @param args [Array] optional arguments to pass to the Rack middleware
@@ -61,7 +61,24 @@ module Lotus
     # @return [Array] the middleware that was added
     #
     # @since 0.2.0
+    #
+    # @see Lotus::Middleware#prepend
     def use(middleware, *args, &blk)
+      @stack.push [middleware, args, blk]
+    end
+
+    # Prepend a middleware to the stack.
+    #
+    # @param middleware [Object] a Rack middleware
+    # @param args [Array] optional arguments to pass to the Rack middleware
+    # @param blk [Proc] an optional block to pass to the Rack middleware
+    #
+    # @return [Array] the middleware that was added
+    #
+    # @since 0.6.0
+    #
+    # @see Lotus::Middleware#use
+    def prepend(middleware, *args, &blk)
       @stack.unshift [middleware, args, blk]
     end
 
@@ -80,8 +97,8 @@ module Lotus
     # @since 0.2.0
     def load_default_stack(application)
       @default_stack_loaded ||= begin
+        _load_assets_middleware
         _load_session_middleware
-        _load_asset_middlewares
         _load_default_welcome_page_for(application)
         use Rack::MethodOverride
 
@@ -106,19 +123,20 @@ module Lotus
     # @since 0.2.0
     def _load_session_middleware
       if @configuration.sessions.enabled?
-        use(*@configuration.sessions.middleware)
+        prepend(*@configuration.sessions.middleware)
       end
     end
 
-    # Add asset middlewares
+    # Use static assets middleware
     #
     # @api private
-    # #since 0.2.0
-    def _load_asset_middlewares
-      if @configuration.serve_assets
-        @configuration.assets.for_each_source do |source|
-          use Rack::Static, urls: source.urls, root: source.root
-        end
+    # @since 0.6.0
+    def _load_assets_middleware
+      env = Lotus.environment
+
+      if !env.container? && env.serve_static_assets?
+        require 'lotus/static'
+        use Lotus::Static
       end
     end
   end

data/lib/lotus/rake_helper.rb

@@ -0,0 +1,68 @@
+require 'rake'
+
+module Lotus
+  # Install Rake tasks in projects
+  #
+  # @since 0.6.0
+  # @api private
+  class RakeHelper
+    include Rake::DSL
+
+    # @since 0.6.0
+    # @api private
+    def self.install_tasks
+      new.install
+    end
+
+    # @since 0.6.0
+    # @api private
+    def install
+      desc "Preload project configuration"
+      task :preload do
+        require 'lotus/environment'
+        Lotus::Environment.new
+      end
+
+      desc "Load the full project"
+      task environment: :preload do
+        require Lotus::Environment.new.env_config
+        Lotus::Application.preload_applications!
+      end
+
+      # Ruby ecosystem compatibility
+      #
+      # Most of the SaaS automatic tasks are designed after Ruby on Rails.
+      # They expect the following Rake tasks to be present:
+      #
+      #   * db:migrate
+      #   * assets:precompile
+      #
+      # See https://github.com/heroku/heroku-buildpack-ruby/issues/442
+      #
+      # ===
+      #
+      # These Rake tasks aren't listed when someone runs `rake -T`, because we
+      # want to encourage developers to use `lotus` commands.
+      #
+      # In order to migrate the database or precompile assets a developer should
+      # use:
+      #
+      #   * lotus db migrate
+      #   * lotus assets precompile
+      #
+      # This is the preferred way to run Lotus command line tasks.
+      # Please use them when you're in control of your deployment environment.
+      namespace :db do
+        task :migrate do
+          system "bundle exec lotus db migrate"
+        end
+      end
+
+      namespace :assets do
+        task :precompile do
+          system "bundle exec lotus assets precompile"
+        end
+      end
+    end
+  end
+end

data/lib/lotus/rake_tasks.rb

@@ -0,0 +1,2 @@
+require 'lotus/rake_helper'
+Lotus::RakeHelper.install_tasks

data/lib/lotus/rendering_policy.rb

@@ -27,7 +27,7 @@ module Lotus
     def render(env, response)
       body = _render(env, response)
 
-      response[BODY] = Array(body) unless body.nil?
+      response[BODY] = Array(body) unless body.nil? || body.respond_to?(:each)
       response
     end
 
@@ -66,7 +66,7 @@ module Lotus
     end
 
     def view_for(action, response)
-      if response[BODY].empty?
+      if response[BODY].respond_to?(:empty?) && response[BODY].empty?
         captures = @controller_pattern.match(action.class.name)
         Utils::Class.load!(@view_pattern % { controller: captures[:controller], action: captures[:action] }, @namespace)
       else

data/lib/lotus/repositories/car_repository.rb

@@ -0,0 +1,3 @@
+class CarRepository
+  include Lotus::Repository
+end

data/lib/lotus/repositories/name_repository.rb

@@ -0,0 +1,3 @@
+class NameRepository
+  include Lotus::Repository
+end

data/lib/lotus/setup.rb

@@ -1,5 +1,3 @@
 require 'lotusrb'
 
-Bundler.require(
-  *Lotus::Environment.new.bundler_groups
-)
+Bundler.require(*Lotus::Environment.new.bundler_groups)

data/lib/lotus/static.rb

@@ -0,0 +1,77 @@
+require 'rack/static'
+require 'lotus/assets/compiler'
+
+module Lotus
+  class Static < ::Rack::Static
+    PATH_INFO        = 'PATH_INFO'.freeze
+    PUBLIC_DIRECTORY = Lotus.public_directory.join('**', '*').to_s.freeze
+
+    def initialize(app)
+      super(app, root: Lotus.public_directory, header_rules: _header_rules)
+      @sources = _sources_from_applications
+    end
+
+    def call(env)
+      path           = env[PATH_INFO]
+
+      prefix, config = @sources.find {|p, _| path.start_with?(p) }
+      original       = if prefix && config
+        config.sources.find(path.sub(prefix, ''))
+      end
+
+      if can_serve(path, original)
+        super
+      else
+        precompile(original, config) ?
+          call(env) :
+          @app.call(env)
+      end
+    end
+
+    private
+
+    def can_serve(path, original = nil)
+      destination = Dir[PUBLIC_DIRECTORY].find do |file|
+        file.index(path).to_i > 0
+      end
+
+      (super(path) || !!destination) && _fresh?(original, destination)
+    end
+
+    def _fresh?(original, destination)
+      # At this point we're sure that destination exist.
+      #
+      # If original is missing, it could be a file that a developer manually
+      # created into public directory without having the corresponding original.
+      # In this case we return true, so the destination file can be served.
+      return true if original.nil? || !::File.exist?(original.to_s)
+
+      ::File.mtime(destination) >
+        ::File.mtime(original)
+    end
+
+    def precompile(original, config)
+      return unless original && config
+
+      Lotus::Assets::Compiler.compile(config, original)
+      true
+    end
+
+    def _sources_from_applications
+      Lotus::Application.applications.each_with_object({}) do |application, result|
+        config = _assets_configuration(application)
+        result["#{ config.prefix }/"] = config
+      end
+    end
+
+    def _assets_configuration(application)
+      application.configuration.namespace::Assets.configuration
+    end
+
+    def _header_rules
+      unless Lotus.env?(:development, :test)
+        [[:all, {'Cache-Control' => 'public, max-age=31536000'}]]
+      end
+    end
+  end
+end

data/lib/lotus/templates/welcome.html.erb

@@ -2,11 +2,12 @@
 <html>
   <head>
     <title>Lotus &mdash; A complete web framework for Ruby</title>
+    <link rel="shortcut icon" type="image/x-icon" href="/assets/favicon.ico">
     <style>
       * { margin: 0; padding: 0; }
       body { font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; color: #333; background-color: #ecf0f1; font-size: 16px; line-height: 24px; }
-      h1, h2, h3 { margin: -20px; line-height: 100px; text-align: center; }
-      h1 { font-size: 60px; color: #551e54; }
+      h2, h3 { margin: -20px; line-height: 100px; text-align: center; }
+      .logo { text-align: center; margin-top: 0.5em; }
       h2 { font-size: 30px; }
       h3 { font-size: 20px; line-height: 22px; color: #666; }
       hr { margin: 2em; color: #ecf0f1; }
@@ -23,7 +24,9 @@
   </head>
   <body>
     <div id="container">
-      <h1>Lotus</h1>
+      <div class="logo">
+        <img alt="Lotus Logo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAW4AAABYCAMAAADiKO25AAAAilBMVEUAAABQK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK01QK013Ei1ZAAAALXRSTlMAwNCwcB8QYKAC+haQ9e/qPQrZUAaKf+RFmskwJKpLaVW6WqV437WENirGlmT3SgtbAAAG40lEQVR42uzb6XKiQBSG4YMKCAyryCYqKq7jd/+3NwsqQzyNpGY6OFU8P6mkKnlDmm66pS7UzcGiwRcpbMBZ0eArGN/w29GggXT+GDfLkAaSWRc8KBoNpNIy/CHzaSBRqKDhMIzfMqX4YE4DaQo8GeaD0lgunsTD8C3LHIyIBlJoNhjOcHvLsQZrSwMZxmDtaCBDDFZAAxlMsBwa/DTk/r8Ng4k8flIus727H+10q9uj0rruRj+/IduVyTA3/BTtujHxYH/XXk8ErdTEg3nQh3ezXXlLE03x6dUyx3PRZE5P9GXCfLUuo2iie++7hWp5ha7PVmefGpIMz2yvfRGf2HimJNRVoVSO9Hl5ubHxsJ9ufRLKlS4saqqvs1Kl4pGIv126uAt2V4sewHLVtldUuQOOTV1NUBnTJ4V6ho/s9EwCC3ShUlN9nTVCZUY8LXrKsylCqjhgKYb4BayRgRXLzm1s92At1ffJvYrBCLYG/RKAV4i3F67gjSTnzhWI2BPjTXJHEMgW9NMGvMAQbZ6FMXhLublnDlocrLfIHUHILA2i7xBYibaGtxCYS81dol2gvkHuGdpMiNYQGIsOPmwgsJWZe45X4rz33JqLmrPf2/jTXmv5iUyNP9ZjQSSXmHuCPwTzVe5TaCXlpXHZog/yUYODijtqsP5Z7gh3F139HSuZ73HnEVFoQ6DgD63pEHAMebkT1DYe1fLUbEynWk1R+Uacv88duqiYV4MevPEtYPvYkPJHMnfi0UdO7uYKIF5R0znDQ9Rvbg83OjUsFABZWP/qnBF/4DiAgC4v9xJ3zFIvrJ/25rnX3KVwRqw7dk7tY7EZEkMTj/XScid1bb/9MbrpNXeKypGeqKt6T1JgQQwPAjuSljvDTaCJO1a8/nLXJSdU6x6wIIYOgZO03N7LscIf4ebwDrnn1EYBryTGUfiglJZ7iZsjiZxwp/aYe1evyFuczc6rROEq1FZl5a7fu7t+hz9J2WPueb18bDMBKyXGDqwrSctdMDe3+Pa+9Jh7i7u5T7VOt6yZqsTIpyb7jyAvd8qsWsURTL+/3FadJi4tEjKO+CCOhF+uHl00mSVJzB10OgIQ4cbrLzcdUDM3a5VEvAtqbpoY1MJIUhc15UQSc4cmKmm3ufm6x9wLNAVpoRFvER2C2A2UdL0w6CVjsU6VwI2DcbQgkpk7ZzuKl1/zXnKL522XKCcJZOX2On5wwkVl2mduYwpGtvZJAim5E9x43Yb4ZZ+5yYjAcUoJwaXknrHLVnGFcS+5a6cf7Z1tc6IwEMdXFAQijwJyClKtWqzN9/96N3cOrqOwxCNXmpn83rYK+bt52mx2P3kbxxBe4cdb9xF9N6PIjeQ73oJbKTFV1oJnc16zgBldbgBztubPVCosBE2xswOGu3hZchd9clOwvb16tO+NAtscxxPyZW/RjzlUbh8d0LTcfRRV6fE7PlXYxDf90ouAYIE2OVTugJ4sYvxzP8l2ypFQARdVKmC34Kwwcm6o3DE9WXho/EIUKPhCAQfs9jZHiPyTPVzuCbafmkus16M21gocLyR+/1IQ25APl9smfbl78o4S7Y33VTg8u3lgjaTXJx4kg+VGY2TUaLoDRLiDqnA0fO6NI2EB9sjhcofU45hHHnZEtJtNicAHNIgltJHcNg2+JUFux2++jRETd9hqxkFOGYyrRFgPzuVum94RevVnIEFusLtDqOvmVQKn7UV9zjOne7yP1QhaS7EPPcfNm2u0kESK3GHn4qxYUQen7Ph3AXWGB5ym95VqhGRiHMlTa5LKx9XoGaTIDfg4O4I78gAXvt2Zu9wF6zjY+xo34PhktRO19FLkHT06bBYTwxkht3DA7WpmNTYalvSexMbf3Q7R9swpSjpWOD2N8SyAy+/wpx9f+/nssiYSCQ2RG0qOuJPFoZp9lCuOHKO+zF1+me3zOlxmE37jMvJlEXG5YenyHlJHntxsxSncEJ5xUk4TMMlXoeTLjeQ+JzkASJIbR68X+/Eb/Ypb6Rf95MuNFAZlOTlIlRs2Qbdt76ED88S7qUa/xioiN5JkHu/AZiBZbjAnHBE+ddx2ma/3Nv4lbTG5EfOXy1vY1QDS5QanCtoamVpAkexbjXFqyk9B8N/kRswsfrSMywZAptxIVBmPlp0x6KVOjw9yvtejJtg4z2mW5Ier0vCuD41PWZiAMOH8Sg3CmJVtBNeGG+VhA4IU88su9v8oHe/SbaR6+hjHMgvTSuB7SCz2b89ydHKkn4pO/SWITmynIFpuEj2YKI1OuSuETiitJDpduhi6GICS6FIXYuhCLmqiyxQJoYtwqYkuMSeGLqCoJtFJlwcVRBe/VRFd2lkaunD5t/IbPw+WlZDv0SkAAAAASUVORK5CYII="/>
+      </div>
       <hr />
       <h2>A complete web framework for Ruby</h2>
 
@@ -44,7 +47,7 @@
       </div>
     </div>
     <div id="footer">
-      &copy; 2014 - present Luca Guidi &mdash; Lotus is released under the MIT License.
+      &copy; 2014 &dash; <%= Time.now.year %> Luca Guidi &mdash; Lotus is released under the MIT License.
     </div>
   </body>
 </html>

data/lib/lotus/version.rb

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

data/lib/lotus/views/default.rb

@@ -8,6 +8,7 @@ module Lotus
     # @api private
     class Default
       include Lotus::View
+
       configuration.reset!
 
       layout nil
@@ -20,7 +21,7 @@ module Lotus
 
       def self.render(root, template_name, context)
         format   = context[:format]
-        template = DefaultTemplateFinder.new(root, template_name, format).find
+        template = DefaultTemplateFinder.new(self, root, template_name, format).find
 
         if template
           new(template, context).render

data/lib/lotus/views/default_template_finder.rb

@@ -5,9 +5,10 @@ module Lotus
       #
       # @since 0.2.0
       # @api private
-      def initialize(root, template_name, format)
-         @root    = root
-         @options = { template: template_name, format: format }
+      def initialize(view, root, template_name, format)
+        @view    = view
+        @root    = root
+        @options = { template: template_name, format: format }
       end
 
       private

data/lotusrb.gemspec

@@ -19,18 +19,20 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'lotus-utils',      '~> 0.5', '>= 0.5.2'
-  spec.add_dependency 'lotus-router',     '~> 0.4', '>= 0.4.3'
-  spec.add_dependency 'lotus-controller', '~> 0.4', '>= 0.4.5'
-  spec.add_dependency 'lotus-view',       '~> 0.4', '>= 0.4.4'
-  spec.add_dependency 'lotus-helpers',    '~> 0.2', '>= 0.2.5'
+  spec.add_dependency 'lotus-utils',      '~> 0.6'
+  spec.add_dependency 'lotus-router',     '~> 0.5'
+  spec.add_dependency 'lotus-controller', '~> 0.5'
+  spec.add_dependency 'lotus-view',       '~> 0.5'
+  spec.add_dependency 'lotus-helpers',    '~> 0.2', '>= 0.2.6'
   spec.add_dependency 'lotus-mailer',     '~> 0.1'
+  spec.add_dependency 'lotus-assets',     '~> 0.1'
   spec.add_dependency 'shotgun',          '~> 0.9'
   spec.add_dependency 'dotenv',           '~> 2.0'
   spec.add_dependency 'thor',             '~> 0.19'
+  spec.add_dependency 'bundler',          '~> 1.6'
 
-  spec.add_development_dependency 'bundler',   '~> 1.6'
-  spec.add_development_dependency 'rake',      '~> 10'
-  spec.add_development_dependency 'minitest',  '~> 5'
-  spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'minispec-metadata', '~> 3.2.1'
+  spec.add_development_dependency 'minitest',          '~> 5'
+  spec.add_development_dependency 'rack-test',         '~> 0.6'
+  spec.add_development_dependency 'rake',              '~> 10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotusrb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -18,80 +18,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: lotus-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: lotus-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: lotus-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: lotus-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +77,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +87,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: lotus-mailer
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +102,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: lotus-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +165,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -183,19 +173,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minispec-metadata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +214,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 description: A complete web framework for Ruby
 email:
 - me@lucaguidi.com
@@ -245,8 +249,12 @@ files:
 - lib/lotus/application.rb
 - lib/lotus/application_name.rb
 - lib/lotus/cli.rb
+- lib/lotus/cli_sub_commands/assets.rb
+- lib/lotus/cli_sub_commands/db.rb
+- lib/lotus/cli_sub_commands/destroy.rb
+- lib/lotus/cli_sub_commands/generate.rb
+- lib/lotus/commands/assets/precompile.rb
 - lib/lotus/commands/console.rb
-- lib/lotus/commands/db.rb
 - lib/lotus/commands/db/abstract.rb
 - lib/lotus/commands/db/apply.rb
 - lib/lotus/commands/db/console.rb
@@ -255,11 +263,17 @@ files:
 - lib/lotus/commands/db/migrate.rb
 - lib/lotus/commands/db/prepare.rb
 - lib/lotus/commands/db/version.rb
-- lib/lotus/commands/generate.rb
-- lib/lotus/commands/new.rb
+- lib/lotus/commands/generate/abstract.rb
+- lib/lotus/commands/generate/action.rb
+- lib/lotus/commands/generate/app.rb
+- lib/lotus/commands/generate/mailer.rb
+- lib/lotus/commands/generate/migration.rb
+- lib/lotus/commands/generate/model.rb
+- lib/lotus/commands/new/abstract.rb
+- lib/lotus/commands/new/app.rb
+- lib/lotus/commands/new/container.rb
 - lib/lotus/commands/routes.rb
 - lib/lotus/commands/server.rb
-- lib/lotus/config/assets.rb
 - lib/lotus/config/configure.rb
 - lib/lotus/config/cookies.rb
 - lib/lotus/config/framework_configuration.rb
@@ -273,8 +287,6 @@ files:
 - lib/lotus/container.rb
 - lib/lotus/environment.rb
 - lib/lotus/frameworks.rb
-- lib/lotus/generators/abstract.rb
-- lib/lotus/generators/action.rb
 - lib/lotus/generators/action/action.rb.tt
 - lib/lotus/generators/action/action_spec.minitest.tt
 - lib/lotus/generators/action/action_spec.rspec.tt
@@ -283,9 +295,13 @@ files:
 - lib/lotus/generators/action/view.rb.tt
 - lib/lotus/generators/action/view_spec.minitest.tt
 - lib/lotus/generators/action/view_spec.rspec.tt
-- lib/lotus/generators/app.rb
-- lib/lotus/generators/app/.gitkeep
-- lib/lotus/generators/application/app.rb
+- lib/lotus/generators/app/.gitkeep.tt
+- lib/lotus/generators/app/application.rb.tt
+- lib/lotus/generators/app/config/initializers/.gitkeep
+- lib/lotus/generators/app/config/routes.rb.tt
+- lib/lotus/generators/app/favicon.ico
+- lib/lotus/generators/app/templates/application.html.erb.tt
+- lib/lotus/generators/app/views/application_layout.rb.tt
 - lib/lotus/generators/application/app/.env.development.tt
 - lib/lotus/generators/application/app/.env.test.tt
 - lib/lotus/generators/application/app/.env.tt
@@ -299,8 +315,10 @@ files:
 - lib/lotus/generators/application/app/config.ru.tt
 - lib/lotus/generators/application/app/config/application.rb.tt
 - lib/lotus/generators/application/app/config/environment.rb.tt
+- lib/lotus/generators/application/app/config/initializers/.gitkeep
 - lib/lotus/generators/application/app/config/routes.rb.tt
 - lib/lotus/generators/application/app/db/.gitkeep
+- lib/lotus/generators/application/app/favicon.ico
 - 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
@@ -315,7 +333,6 @@ files:
 - lib/lotus/generators/application/app/spec_helper.rb.rspec.tt
 - lib/lotus/generators/application/app/templates/application.html.erb.tt
 - lib/lotus/generators/application/app/views/application_layout.rb.tt
-- lib/lotus/generators/application/container.rb
 - lib/lotus/generators/application/container/.env.development.tt
 - lib/lotus/generators/application/container/.env.test.tt
 - lib/lotus/generators/application/container/.env.tt
@@ -327,12 +344,15 @@ files:
 - lib/lotus/generators/application/container/capybara.rb.rspec.tt
 - lib/lotus/generators/application/container/config.ru.tt
 - lib/lotus/generators/application/container/config/environment.rb.tt
+- lib/lotus/generators/application/container/config/initializers/.gitkeep
 - lib/lotus/generators/application/container/db/.gitkeep
 - 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/lib/app_name.rb.tt
 - lib/lotus/generators/application/container/lib/chirp/entities/.gitkeep
+- lib/lotus/generators/application/container/lib/chirp/mailers/.gitkeep
+- lib/lotus/generators/application/container/lib/chirp/mailers/templates/.gitkeep
 - lib/lotus/generators/application/container/lib/chirp/repositories/.gitkeep
 - lib/lotus/generators/application/container/lib/config/mapping.rb.tt
 - lib/lotus/generators/application/container/lotusrc.tt
@@ -341,35 +361,34 @@ files:
 - lib/lotus/generators/application/container/spec_helper.rb.minitest.tt
 - lib/lotus/generators/application/container/spec_helper.rb.rspec.tt
 - lib/lotus/generators/database_config.rb
-- lib/lotus/generators/mailer.rb
+- lib/lotus/generators/generatable.rb
+- lib/lotus/generators/generator.rb
 - lib/lotus/generators/mailer/mailer.rb.tt
 - lib/lotus/generators/mailer/mailer_spec.rb.tt
 - lib/lotus/generators/mailer/template.html.tt
 - lib/lotus/generators/mailer/template.txt.tt
-- lib/lotus/generators/migration.rb
 - lib/lotus/generators/migration/migration.rb.tt
-- lib/lotus/generators/model.rb
 - lib/lotus/generators/model/entity.rb.tt
 - lib/lotus/generators/model/entity_spec.minitest.tt
 - lib/lotus/generators/model/entity_spec.rspec.tt
 - lib/lotus/generators/model/repository.rb.tt
 - lib/lotus/generators/model/repository_spec.minitest.tt
 - lib/lotus/generators/model/repository_spec.rspec.tt
-- lib/lotus/generators/slice.rb
-- lib/lotus/generators/slice/.gitkeep.tt
-- lib/lotus/generators/slice/application.rb.tt
-- lib/lotus/generators/slice/config/routes.rb.tt
-- lib/lotus/generators/slice/templates/application.html.erb.tt
-- lib/lotus/generators/slice/views/application_layout.rb.tt
+- lib/lotus/generators/test_framework.rb
 - lib/lotus/loader.rb
 - lib/lotus/lotusrc.rb
 - lib/lotus/mailer/glue.rb
 - lib/lotus/middleware.rb
+- lib/lotus/rake_helper.rb
+- lib/lotus/rake_tasks.rb
 - lib/lotus/rendering_policy.rb
+- lib/lotus/repositories/car_repository.rb
+- lib/lotus/repositories/name_repository.rb
 - lib/lotus/root.rb
 - lib/lotus/routes.rb
 - lib/lotus/routing/default.rb
 - lib/lotus/setup.rb
+- lib/lotus/static.rb
 - lib/lotus/templates/default.html.erb
 - lib/lotus/templates/welcome.html.erb
 - lib/lotus/version.rb
@@ -399,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A complete web framework for Ruby