lotusrb 0.3.2 → 0.4.0

data/lib/lotus/generators/slice.rb

@@ -33,17 +33,14 @@ module Lotus
         templates = {
           'application.rb.tt'                 => 'application.rb',
           'config/routes.rb.tt'               => 'config/routes.rb',
-          'config/mapping.rb.tt'              => 'config/mapping.rb',
-          'action.rb.tt'                      => 'controllers/home/index.rb',
           'views/application_layout.rb.tt'    => 'views/application_layout.rb',
           'templates/application.html.erb.tt' => 'templates/application.html.erb',
-          'view.rb.tt'                        => 'views/home/index.rb',
-          'templates/template.html.erb.tt'    => 'templates/home/index.html.erb',
         }
 
         empty_directories = [
-          "public/javascripts",
-          "public/stylesheets"
+          'controllers',
+          'public/javascripts',
+          'public/stylesheets'
         ]
 
         # Add testing directories (spec/ is the default for both MiniTest and RSpec)
@@ -71,13 +68,8 @@ module Lotus
         # Per environment .env
         #
         ['development', 'test'].each do |environment|
-          # Add WEB_DATABASE_URL="file:///db/web_development"
-          cli.append_to_file target.join("config/.env.#{ environment }") do
-            %(#{ opts[:upcase_slice_name] }_DATABASE_URL="file:///db/#{ opts[:slice_name] }_#{ environment }"\n)
-          end
-
           # Add WEB_SESSIONS_SECRET="abc123" (random hex)
-          cli.append_to_file target.join("config/.env.#{ environment }") do
+          cli.append_to_file target.join(".env.#{ environment }") do
             %(#{ opts[:upcase_slice_name] }_SESSIONS_SECRET="#{ SecureRandom.hex(32) }"\n)
           end
         end

data/lib/lotus/generators/slice/application.rb.tt

@@ -91,26 +91,10 @@ module <%= config[:classified_slice_name] %>
       #
       # body_parsers :json
 
-      ##
-      # DATABASE
-      #
-
-      # Configure a database adapter
-      # Argument: A Hash with the settings
-      #           type: Symbol, :file_system, :memory and :sql
-      #           uri:  String, 'file:///db/bookshelf'
-      #                         'memory://localhost/bookshelf'
-      #                         'sqlite:memory:'
-      #                         'sqlite://db/bookshelf.sqlite3'
-      #                         'postgres://localhost/bookshelf'
-      #                         'mysql://localhost/bookshelf'
-      #
-      # adapter type: :file_system, uri: ENV['<%= config[:upcase_slice_name] %>_DATABASE_URL']
-
-      # Configure a database mapping
-      # See: http://www.rubydoc.info/gems/lotus-model#Data_Mapper
+      # When it's true and the router receives a non-encrypted request (http),
+      # it redirects to the secure equivalent resource (https). Default disabled.
       #
-      # mapping 'config/mapping'
+      # force_ssl true
 
       ##
       # TEMPLATES

data/lib/lotus/generators/slice/config/routes.rb.tt

@@ -1,8 +1,2 @@
 # Configure your routes here
-# See: http://www.rubydoc.info/gems/lotus-router/#Usage
-#
-#
-#
-# This route will look for `<%= config[:classified_slice_name] %>::Controllers::Home::Index` action in `apps/<%= config[:slice_name] %>/controllers/home/index.rb`.
-# Please, uncomment the following line to have a working example.
-# get '/', to: 'home#index'
+# See: http://www.rubydoc.info/gems/lotus-router/#Usage

data/lib/lotus/loader.rb

@@ -13,6 +13,10 @@ module Lotus
   # @since 0.1.0
   # @api private
   class Loader
+
+    STRICT_TRANSPORT_SECURITY_HEADER = 'Strict-Transport-Security'.freeze
+    STRICT_TRANSPORT_SECURITY_DEFAULT_VALUE = 'max-age=31536000'.freeze
+
     def initialize(application)
       @application   = application
       @configuration = @application.configuration
@@ -54,13 +58,21 @@ module Lotus
             Lotus::Config::Security::X_FRAME_OPTIONS_HEADER         => config.security.x_frame_options,
             Lotus::Config::Security::CONTENT_SECURITY_POLICY_HEADER => config.security.content_security_policy
           })
+          default_headers.merge!(STRICT_TRANSPORT_SECURITY_HEADER => STRICT_TRANSPORT_SECURITY_DEFAULT_VALUE) if config.force_ssl
 
           if config.cookies.enabled?
             require 'lotus/action/cookies'
             prepare { include Lotus::Action::Cookies }
             cookies config.cookies.default_options
           end
-          prepare { include Lotus::Action::Session } if config.sessions.enabled?
+
+          if config.sessions.enabled?
+            prepare do
+              include Lotus::Action::Session
+              include Lotus::Action::CSRFProtection
+            end
+          end
+
           prepare { include Lotus::Action::RoutingHelpers }
 
           config.controller.__apply(self)
@@ -183,6 +195,8 @@ module Lotus
         scheme:      configuration.scheme,
         host:        configuration.host,
         port:        configuration.port,
+        prefix:      configuration.path_prefix,
+        force_ssl:   configuration.force_ssl,
         &configuration.routes
       )
     end

data/lib/lotus/lotusrc.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'dotenv'
+require 'dotenv/parser'
 
 module Lotus
   # Create and read the .lotusrc file in the root of the application
@@ -93,8 +93,9 @@ module Lotus
     #    # => { architecture: 'application', test: 'rspec', template: 'slim' }
     def read
       if exists?
-        lotusrc_options = Dotenv.load path_file
-        Utils::Hash.new(lotusrc_options).symbolize!
+        Utils::Hash.new(
+          Dotenv::Parser.call(content)
+        ).symbolize!
       end
     end
 
@@ -142,5 +143,9 @@ module Lotus
     def path_file
       @root.join FILE_NAME
     end
+
+    def content
+      path_file.read
+    end
   end
 end

data/lib/lotus/templates/{welcome.html → welcome.html.erb}

@@ -11,7 +11,7 @@
       h3 { font-size: 20px; line-height: 22px; color: #666; }
       hr { margin: 2em; color: #ecf0f1; }
       ul { text-align: center; }
-      li { display: inline; margin: 3em; line-height: 24px; list-style-type: none; vertical-align: text-top;}
+      li { display: inline; margin: 2em; line-height: 24px; list-style-type: none; vertical-align: text-top;}
       p { margin-top: 60px; text-align: center; }
       a { color: #333; padding: 1px; }
       code { padding: .2em; background-color: #ecf0f1 }
@@ -30,12 +30,13 @@
       <h3>Lotus is Open Source Software for MVC web development.<br />
         It's simple, fast and lightweight.</h3>
 
-      <p>Please edit <code>apps/web/config/routes.rb</code> to add your first route.</p>
+      <p>Please generate a new action with:<br><code>bundle exec lotus generate action<%= application_name %> home#index --url=/</code>.</p>
 
       <hr style="margin-top: 4em;"/>
       <div id="content">
         <ul>
           <li><a href="http://lotusrb.org">Website</a></li>
+          <li><a href="http://lotusrb.org/guides">Guides</a></li>
           <li><a href="http://www.rubydoc.info/gems/lotusrb">API docs</a></li>
           <li><a href="https://github.com/lotus/lotus">Source code</a></li>
           <li><a href="https://gitter.im/lotus/chat">Chat</a></li>
@@ -43,7 +44,7 @@
       </div>
     </div>
     <div id="footer">
-      &copy; 2015 Luca Guidi &mdash; Lotus is released under the MIT License.
+      &copy; 2014 - present 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.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/lotus/welcome.rb

@@ -1,14 +1,33 @@
+require 'erb'
 require 'pathname'
+require 'lotus/environment'
+require 'lotus/utils/string'
 
 module Lotus
   class Welcome
     def initialize(app)
       @root = Pathname.new(__dir__).join('templates').realpath
-      @body = [@root.join('welcome.html').read]
+      @body = [ERB.new(@root.join('welcome.html.erb').read).result(binding)]
     end
 
     def call(env)
       [200, {}, @body]
     end
+
+    def application_name
+      " #{ app }" if container?
+    end
+
+    private
+
+    def container?
+      Environment.new.container?
+    end
+
+    def app
+      Utils::String.new(
+        Application.applications.first
+      ).namespace.downcase
+    end
   end
 end

data/lotusrb.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency 'lotus-utils',      '~> 0.4'
-  spec.add_dependency 'lotus-router',     '~> 0.4'
-  spec.add_dependency 'lotus-controller', '~> 0.4'
+  spec.add_dependency 'lotus-utils',      '~> 0.5'
+  spec.add_dependency 'lotus-router',     '~> 0.4', '>= 0.4.1'
+  spec.add_dependency 'lotus-controller', '~> 0.4', '>= 0.4.4'
   spec.add_dependency 'lotus-view',       '~> 0.4'
-  spec.add_dependency 'lotus-helpers',    '~> 0.1'
+  spec.add_dependency 'lotus-helpers',    '~> 0.2'
   spec.add_dependency 'shotgun',          '~> 0.9'
-  spec.add_dependency 'dotenv',           '~> 1.0'
+  spec.add_dependency 'dotenv',           '~> 2.0'
   spec.add_dependency 'thor',             '~> 0.19'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotusrb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: lotus-router
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: lotus-controller
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: lotus-view
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -192,13 +204,21 @@ files:
 - README.md
 - bin/lotus
 - lib/lotus.rb
+- lib/lotus/action/csrf_protection.rb
 - lib/lotus/action/routing_helpers.rb
 - lib/lotus/application.rb
 - lib/lotus/application_name.rb
 - lib/lotus/cli.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
+- lib/lotus/commands/db/create.rb
+- lib/lotus/commands/db/drop.rb
+- 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/routes.rb
@@ -227,16 +247,47 @@ 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/application/app/.env.development.tt
+- lib/lotus/generators/application/app/.env.test.tt
+- lib/lotus/generators/application/app/.env.tt
+- lib/lotus/generators/application/app/.gitkeep
+- lib/lotus/generators/application/app/Gemfile.tt
+- lib/lotus/generators/application/app/Rakefile.minitest.tt
+- lib/lotus/generators/application/app/Rakefile.rspec.tt
+- lib/lotus/generators/application/app/apps/.gitkeep.tt
+- lib/lotus/generators/application/app/capybara.rb.rspec.tt
+- 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/routes.rb.tt
+- lib/lotus/generators/application/app/db/.gitkeep
+- 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/lib/app_name.rb.tt
+- lib/lotus/generators/application/app/lib/chirp/entities/.gitkeep
+- lib/lotus/generators/application/app/lib/chirp/repositories/.gitkeep
+- lib/lotus/generators/application/app/lib/config/mapping.rb.tt
+- lib/lotus/generators/application/app/lotusrc.tt
+- lib/lotus/generators/application/app/rspec.rspec.tt
+- lib/lotus/generators/application/app/schema.sql.tt
+- lib/lotus/generators/application/app/spec_helper.rb.minitest.tt
+- 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
 - lib/lotus/generators/application/container/.gitkeep
 - lib/lotus/generators/application/container/Gemfile.tt
 - lib/lotus/generators/application/container/Rakefile.minitest.tt
 - lib/lotus/generators/application/container/Rakefile.rspec.tt
 - lib/lotus/generators/application/container/capybara.rb.rspec.tt
 - lib/lotus/generators/application/container/config.ru.tt
-- lib/lotus/generators/application/container/config/.env.development.tt
-- lib/lotus/generators/application/container/config/.env.test.tt
-- lib/lotus/generators/application/container/config/.env.tt
 - lib/lotus/generators/application/container/config/environment.rb.tt
 - lib/lotus/generators/application/container/db/.gitkeep
 - lib/lotus/generators/application/container/features_helper.rb.minitest.tt
@@ -248,8 +299,11 @@ files:
 - lib/lotus/generators/application/container/lib/config/mapping.rb.tt
 - lib/lotus/generators/application/container/lotusrc.tt
 - lib/lotus/generators/application/container/rspec.rspec.tt
+- lib/lotus/generators/application/container/schema.sql.tt
 - lib/lotus/generators/application/container/spec_helper.rb.minitest.tt
 - lib/lotus/generators/application/container/spec_helper.rb.rspec.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
@@ -259,16 +313,11 @@ files:
 - lib/lotus/generators/model/repository_spec.rspec.tt
 - lib/lotus/generators/slice.rb
 - lib/lotus/generators/slice/.gitkeep.tt
-- lib/lotus/generators/slice/action.rb.tt
 - lib/lotus/generators/slice/application.rb.tt
-- lib/lotus/generators/slice/config/mapping.rb.tt
 - lib/lotus/generators/slice/config/routes.rb.tt
 - lib/lotus/generators/slice/templates/application.html.erb.tt
-- lib/lotus/generators/slice/templates/template.html.erb.tt
-- lib/lotus/generators/slice/view.rb.tt
 - lib/lotus/generators/slice/views/application_layout.rb.tt
 - lib/lotus/loader.rb
-- lib/lotus/logger.rb
 - lib/lotus/lotusrc.rb
 - lib/lotus/middleware.rb
 - lib/lotus/rendering_policy.rb
@@ -277,7 +326,7 @@ files:
 - lib/lotus/routing/default.rb
 - lib/lotus/setup.rb
 - lib/lotus/templates/default.html.erb
-- lib/lotus/templates/welcome.html
+- lib/lotus/templates/welcome.html.erb
 - lib/lotus/version.rb
 - lib/lotus/views/default.rb
 - lib/lotus/views/default_template_finder.rb
@@ -305,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A complete web framework for Ruby