lotusrb 0.3.2 → 0.4.0

data/lib/lotus/commands/db/prepare.rb

@@ -0,0 +1,14 @@
+require 'lotus/commands/db/abstract'
+
+module Lotus
+  module Commands
+    class DB
+      class Prepare < Abstract
+        def start
+          require 'lotus/model/migrator'
+          Lotus::Model::Migrator.prepare
+        end
+      end
+    end
+  end
+end

data/lib/lotus/commands/db/version.rb

@@ -0,0 +1,14 @@
+require 'lotus/commands/db/abstract'
+
+module Lotus
+  module Commands
+    class DB
+      class Version < Abstract
+        def start
+          require 'lotus/model/migrator'
+          puts Lotus::Model::Migrator.version
+        end
+      end
+    end
+  end
+end

data/lib/lotus/commands/generate.rb

@@ -10,8 +10,7 @@ module Lotus
       # @since 0.3.0
       # @api private
       GENERATORS_NAMESPACE = "Lotus::Generators::%s".freeze
-      APP = 'app'.freeze
-      SLICE_TYPE = 'slice'.freeze
+      APP_ARCHITECTURE = 'app'.freeze
 
       # @since 0.3.0
       # @api private
@@ -20,21 +19,23 @@ module Lotus
 
       # @since 0.3.0
       # @api private
-      attr_reader :cli, :source, :target, :app, :app_name, :name, :options
+      attr_reader :cli, :source, :target, :app, :app_name, :name, :options, :env
 
       # @since 0.3.0
       # @api private
       def initialize(type, app_name, name, env, cli)
         @cli      = cli
+        @env      = env
         @name     = name
+        @options  = env.to_options.merge(cli.options)
+
+        sanitize_input(app_name, name)
+        @type     = type
 
-        @type = sanitize_type(type)
-        @app_name = app_name
         @source   = Pathname.new(::File.dirname(__FILE__) + "/../generators/#{ @type }/").realpath
         @target   = Pathname.pwd.realpath
 
         @app      = Utils::String.new(@app_name).classify
-        @options  = sanitize_app_name_options(app_name).merge(env.to_options.merge(cli.options))
       end
 
       # @since 0.3.0
@@ -49,7 +50,11 @@ module Lotus
       # @since 0.3.0
       # @api private
       def app_root
-        @app_root ||= Pathname.new([@options[:path], @app_name].join(::File::SEPARATOR))
+        @app_root ||= begin
+          result = Pathname.new(@options[:apps_path])
+          result = result.join(@app_name) if @env.container?
+          result
+        end
       end
 
       # @since 0.3.0
@@ -74,19 +79,14 @@ module Lotus
         Utils::Class.load!(GENERATORS_NAMESPACE % class_name).new(self)
       end
 
-      # @since 0.3.1
-      # @api private
-      def sanitize_app_name_options(app_name)
-        {
-          application: app_name,
-          application_base_url: "/#{app_name}"
-        }
-      end
-
-      # @since 0.3.1
-      # @api private
-      def sanitize_type(type)
-        type == APP ? SLICE_TYPE : type
+      def sanitize_input(app_name, name)
+        if options[:architecture] == APP_ARCHITECTURE
+          @app_name = nil
+          @name     = app_name
+        else
+          @app_name = app_name
+          @name     = name
+        end
       end
     end
   end

data/lib/lotus/commands/new.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'securerandom'
 require 'lotus/application_name'
 require 'lotus/utils/string'
 require 'lotus/utils/class'

data/lib/lotus/commands/routes.rb

@@ -2,11 +2,10 @@ module Lotus
   module Commands
     class Routes
       def initialize(environment)
-        @environment = environment
+        environment.require_application_environment
       end
 
       def start
-        require @environment.env_config
         puts Lotus::Container.new.routes.inspector.to_s
       end
     end

data/lib/lotus/configuration.rb

@@ -108,6 +108,21 @@ module Lotus
       @security ||= Config::Security.new
     end
 
+    # Force ssl redirection if http scheme is set
+    #
+    # @return [Boolean]
+    #
+    # @since 0.4.0
+    #
+    # @see Lotus::Routing::ForceSsl
+    def force_ssl(value = nil)
+      if value
+        @force_ssl = value
+      else
+        @force_ssl || false
+      end
+    end
+
     # The root of the application
     #
     # By default it returns the current directory, for this reason, **all the
@@ -1627,6 +1642,20 @@ module Lotus
       @view ||= Config::FrameworkConfiguration.new
     end
 
+    # This options is used as a bridge between container and router application.
+    #
+    # @return [String, NilClass] path prefix for routes
+    #
+    # @since 0.4.0
+    # @api private
+    def path_prefix(value = nil)
+      if value.nil?
+        @path_prefix
+      else
+        @path_prefix = value
+      end
+    end
+
     private
     # @since 0.2.0
     # @api private

data/lib/lotus/container.rb

@@ -3,16 +3,32 @@ require 'lotus/router'
 
 module Lotus
   class Container
+    class Router < ::Lotus::Router
+      def mount(app, options)
+        app = app.new(path_prefix: options.fetch(:at)) if lotus_app?(app)
+        super(app, options)
+      end
+
+      private
+
+      def lotus_app?(app)
+        app.ancestors.include? Lotus::Application
+      end
+    end
+
     attr_reader :routes
 
-    def self.configure(&blk)
-      Mutex.new.synchronize { @@configuration = blk }
+    def self.configure(options = {}, &blk)
+      Mutex.new.synchronize do
+        @@options       = options
+        @@configuration = blk
+      end
     end
 
     def initialize
       Mutex.new.synchronize do
         assert_configuration_presence!
-        @routes = Lotus::Router.new(&@@configuration)
+        @routes = Router.new(&@@configuration)
       end
     end
 

data/lib/lotus/environment.rb

@@ -94,6 +94,22 @@ module Lotus
     # @api private
     CODE_RELOADING = { 'development' => true }.freeze
 
+    # @since 0.4.0
+    # @api private
+    CONTAINER = 'container'.freeze
+
+    # @since 0.4.0
+    # @api private
+    CONTAINER_PATH = 'apps'.freeze
+
+    # @since 0.4.0
+    # @api private
+    APPLICATION = 'app'.freeze
+
+    # @since 0.4.0
+    # @api private
+    APPLICATION_PATH = 'app'.freeze
+
     # Initialize a Lotus environment
     #
     # It accepts an optional set of configurations from the CLI commands.
@@ -121,17 +137,17 @@ module Lotus
     #
     # @example Define ENV variables from .env
     #
-    #   # % tree config/
-    #   #   config
+    #   # % tree .
+    #   #   .
+    #   #   # ...
     #   #   ├── .env
-    #   #   ├── .env.development
-    #   #   └── environment.rb
+    #   #   └── .env.development
     #
-    #   # % cat config/.env
+    #   # % cat .env
     #   #   FOO="bar"
     #   #   XYZ="yes"
     #
-    #   # % cat config/.env.development
+    #   # % cat .env.development
     #   #   FOO="ok"
     #
     #   require 'lotus/environment'
@@ -156,7 +172,7 @@ module Lotus
     #   # the one defined in the parent (eg `FOO` is overwritten). All the
     #   # other settings (eg `XYZ`) will be left untouched.
     def initialize(options = {})
-      @options = Lotus::Lotusrc.new(root).read
+      @options = Lotus::Lotusrc.new(root, options).read
       @options.merge! Utils::Hash.new(options).symbolize!
       @mutex   = Mutex.new
       @mutex.synchronize { set_env_vars! }
@@ -315,6 +331,16 @@ module Lotus
       root.join(@options.fetch(:environment) { config.join(DEFAULT_ENVIRONMENT_CONFIG) })
     end
 
+    # Require application environment
+    #
+    # Eg <tt>require "config/environment"</tt>.
+    #
+    # @since 0.4.0
+    # @api private
+    def require_application_environment
+      require env_config.to_s
+    end
+
     # Determine if activate code reloading for the current environment while
     # running the server.
     #
@@ -337,6 +363,32 @@ module Lotus
       @options.fetch(:code_reloading) { !!CODE_RELOADING[environment] }
     end
 
+    # @since 0.4.0
+    # @api private
+    def architecture
+      @options.fetch(:architecture) {
+        puts "Cannot recognize Lotus architecture, please check `.lotusrc'"
+        exit 1
+      }
+    end
+
+    # @since 0.4.0
+    # @api private
+    def container?
+      architecture == CONTAINER
+    end
+
+    # @since 0.4.0
+    # @api private
+    def apps_path
+      @options.fetch(:path) {
+        case architecture
+        when CONTAINER   then CONTAINER_PATH
+        when APPLICATION then APPLICATION_PATH
+        end
+      }
+    end
+
     # Serialize the most relevant settings into a Hash
     #
     # @return [Lotus::Utils::Hash]
@@ -347,6 +399,7 @@ module Lotus
       @options.merge(
         environment: environment,
         env_config:  env_config,
+        apps_path:   apps_path,
         rackup:      rackup,
         host:        host,
         port:        port
@@ -373,8 +426,8 @@ module Lotus
     # @since 0.2.0
     # @api private
     def set_application_env_vars!
-      Dotenv.load     config.join(DEFAULT_DOTENV)
-      Dotenv.overload config.join(DEFAULT_DOTENV_ENV % environment)
+      Dotenv.load     root.join(DEFAULT_DOTENV)
+      Dotenv.overload root.join(DEFAULT_DOTENV_ENV % environment)
     end
 
     # @since 0.1.0

data/lib/lotus/frameworks.rb

@@ -2,6 +2,7 @@ require 'lotus/router'
 require 'lotus/view'
 require 'lotus/controller'
 require 'lotus/action/glue'
+require 'lotus/action/csrf_protection'
 
 Lotus::Controller.configure do
   prepare do

data/lib/lotus/generators/action.rb

@@ -42,12 +42,14 @@ module Lotus
         assert_action!
 
         opts = {
-          app:           app,
-          controller:    @controller_name,
-          action:        @action_name,
-          action_path:   _action_path_without_suffix,
-          view_path:     _view_path_without_suffix,
-          template_path: _template_path,
+          app:                  app,
+          controller:           @controller_name,
+          action:               @action_name,
+          action_path:          _action_path_without_suffix,
+          relative_action_path: _relative_action_path,
+          relative_view_path:   _relative_view_path,
+          view_path:            _view_path_without_suffix,
+          template_path:        _template_path,
         }
 
         test_type = case options[:test]
@@ -98,6 +100,15 @@ module Lotus
         end
       end
 
+      def app
+        if env.container?
+          super
+        else
+          env.require_application_environment
+          Utils::String.new(Lotus::Application.applications.first).namespace
+        end
+      end
+
       # @since 0.3.0
       # @api private
       def generate_route
@@ -108,14 +119,21 @@ module Lotus
 
         # Insert at the top of the file
         cli.insert_into_file _routes_path, before: /\A(.*)/ do
-          "get '/#{ @controller }', to: '#{ @name }'\n"
+          "get '#{ _route_url }', to: '#{ @name }'\n"
         end
       end
 
+      # @since 0.4.0
+      # @api private
+      def _route_url
+        options.fetch(:url, "/#{ @controller }")
+      end
+
       # @since 0.3.0
       # @api private
       def _routes_path
-        app_root.join("config", "routes#{ SUFFIX }")
+        routes_root = env.container? ? app_root : env.root
+        routes_root.join("config", "routes#{ SUFFIX }")
       end
 
       # @since 0.3.0
@@ -151,13 +169,31 @@ module Lotus
       # @since 0.3.0
       # @api private
       def _action_spec_path
-        spec_root.join(app_name, 'controllers', @controller, "#{ @action }_spec#{ SUFFIX }")
+        spec_root.join(app_name.to_s, 'controllers', @controller, "#{ @action }_spec#{ SUFFIX }")
       end
 
       # @since 0.3.0
       # @api private
       def _view_spec_path
-        spec_root.join(app_name, 'views', @controller, "#{ @action }_spec#{ SUFFIX }")
+        spec_root.join(app_name.to_s, 'views', @controller, "#{ @action }_spec#{ SUFFIX }")
+      end
+
+      # @since 0.4.0
+      # @api private
+      def _relative_action_path
+        result = '../../../'
+        result << '../' if env.container?
+        result << _action_path_without_suffix.to_s
+        result
+      end
+
+      # @since 0.4.0
+      # @api private
+      def _relative_view_path
+        result = '../../../'
+        result << '../' if env.container?
+        result << _view_path_without_suffix.to_s
+        result
       end
     end
   end

data/lib/lotus/generators/action/action_spec.minitest.tt

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require_relative '../../../../<%= config[:action_path] %>'
+require_relative '<%= config[:relative_action_path] %>'
 
 describe <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %> do
   let(:action) { <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %>.new }

data/lib/lotus/generators/action/action_spec.rspec.tt

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require_relative '../../../../<%= config[:action_path] %>'
+require_relative '<%= config[:relative_action_path] %>'
 
 describe <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %> do
   let(:action) { <%= config[:app] %>::Controllers::<%= config[:controller] %>::<%= config[:action] %>.new }