lotusrb 0.5.0 → 0.6.0

data/lib/lotus/generators/application/container/Rakefile.minitest.tt

@@ -1,4 +1,5 @@
 require 'rake'
+require 'lotus/rake_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|

data/lib/lotus/generators/application/container/Rakefile.rspec.tt

@@ -1,4 +1,5 @@
 require 'rake'
+require 'lotus/rake_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

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

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

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

@@ -1,3 +1,3 @@
-architecture=container
-test=<%= config[:test] %>
-template=erb
+<%= Lotus::Lotusrc::ARCHITECTURE_KEY %>=<%= Lotus::Lotusrc::DEFAULT_ARCHITECTURE %>
+<%= Lotus::Lotusrc::TEST_KEY %>=<%= config[:test] %>
+<%= Lotus::Lotusrc::TEMPLATE_KEY %>=<%= Lotus::Lotusrc::DEFAULT_TEMPLATE %>

data/lib/lotus/generators/application/container/spec_helper.rb.rspec.tt

@@ -58,6 +58,11 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
@@ -97,4 +102,3 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 =end
 end
-

data/lib/lotus/generators/database_config.rb

@@ -1,6 +1,9 @@
+require 'shellwords'
+
 module Lotus
   module Generators
     class DatabaseConfig
+
       SUPPORTED_ENGINES = {
         'mysql'      => { type: :sql,         mri: 'mysql2',  jruby: 'jdbc-mysql'    },
         'mysql2'     => { type: :sql,         mri: 'mysql2',  jruby: 'jdbc-mysql'    },
@@ -12,13 +15,15 @@ module Lotus
         'memory'     => { type: :memory,      mri: nil,       jruby: nil             }
       }.freeze
 
+      DEFAULT_ENGINE = 'filesystem'.freeze
+
       attr_reader :engine, :name
 
       def initialize(engine, name)
         @engine = engine
         @name = name
 
-        SUPPORTED_ENGINES.key?(engine) or fail "\"#{ engine }\" is not a valid database type"
+        SUPPORTED_ENGINES.key?(engine.to_s) or fail "\"#{ engine }\" is not a valid database type"
       end
 
       def to_hash
@@ -37,6 +42,10 @@ module Lotus
         type == :sql
       end
 
+      def filesystem?
+        type == :file_system
+      end
+
       private
 
       def platform
@@ -44,7 +53,7 @@ module Lotus
       end
 
       def platform_prefix
-        :jdbc if Lotus::Utils.jruby?
+        'jdbc:'.freeze if Lotus::Utils.jruby?
       end
 
       def uri
@@ -61,7 +70,11 @@ module Lotus
       def base_uri
         case engine
         when 'mysql', 'mysql2'
-          "mysql2://localhost/#{ name }"
+          if Lotus::Utils.jruby?
+            "mysql://localhost/#{ name }"
+          else
+            "mysql2://localhost/#{ name }"
+          end
         when 'postgresql', 'postgres'
           "postgres://localhost/#{ name }"
         when 'sqlite', 'sqlite3'
@@ -78,7 +91,7 @@ module Lotus
         when 'sqlite', 'sqlite3'
           "#{ platform_prefix }#{ base_uri }_#{ environment }.sqlite"
         else
-          "#{ platform_prefix }#{ base_uri }_#{ environment }"
+          "#{ platform_prefix if sql? }#{ base_uri }_#{ environment }"
         end
       end
     end

data/lib/lotus/generators/generatable.rb

@@ -0,0 +1,51 @@
+require 'lotus/generators/generator'
+
+module Lotus
+  module Generators
+    module Generatable
+
+      def start
+        map_templates
+        process_templates
+      end
+
+      def destroy
+        generator.behavior = :revoke
+        self
+      end
+
+      def generator
+        @generator ||= Lotus::Generators::Generator.new(template_source_path, target_path)
+      end
+
+      def map_templates
+        raise NotImplementedError, "must implement the map_templates method"
+      end
+
+      def add_mapping(source, target)
+        generator.add_mapping(source, target)
+      end
+
+      def process_templates
+        generator.process_templates(template_options)
+        post_process_templates
+      end
+
+      def post_process_templates
+        nil
+      end
+
+      def template_options
+        {}
+      end
+
+      def template_source_path
+        raise NotImplementedError, "must implement the template_source_path method"
+      end
+
+      def target_path
+        raise NotImplementedError, "must implement the target_path method"
+      end
+    end
+  end
+end

data/lib/lotus/generators/generator.rb

@@ -0,0 +1,35 @@
+require 'thor'
+require 'forwardable'
+
+module Lotus
+  module Generators
+    class Generator
+
+      extend Forwardable
+
+      def_delegators :@processor, :run, :behavior=, :inject_into_file, :append_to_file, :prepend_to_file
+
+      class Processor < Thor
+        include Thor::Actions
+      end
+
+      def initialize(template_source_path, target_path)
+        @template_source_path = template_source_path
+        @target_path = target_path
+        @template_mappings = []
+        @processor = Processor.new
+        @processor.class.source_root(@template_source_path)
+      end
+
+      def add_mapping(source, target)
+        @template_mappings << [source, target]
+      end
+
+      def process_templates(options = {})
+        @template_mappings.each do |src, dst|
+          @processor.template(@template_source_path.join(src), @target_path.join(dst), options)
+        end
+      end
+    end
+  end
+end

data/lib/lotus/generators/test_framework.rb

@@ -0,0 +1,42 @@
+require 'lotus/lotusrc'
+module Lotus
+  module Generators
+    class TestFramework
+      RSPEC = 'rspec'.freeze
+      MINITEST = 'minitest'.freeze
+      VALID_FRAMEWORKS = [RSPEC, MINITEST].freeze
+
+      attr_reader :framework
+
+      def initialize(lotusrc, framework)
+        @framework = (framework || lotusrc.options.fetch(:test))
+        assert_framework!
+      end
+
+      def rspec?
+        framework == RSPEC
+      end
+
+      def minitest?
+        framework == MINITEST
+      end
+
+      private
+
+      def assert_framework!
+        if !supported_framework?
+          raise ArgumentError.new("Unknown test framework '#{ framework}'. Please use one of #{ valid_test_frameworks.join(', ')}")
+        end
+      end
+
+      def valid_test_frameworks
+        VALID_FRAMEWORKS.map { |name| "'#{ name }'"}
+      end
+
+      def supported_framework?
+        VALID_FRAMEWORKS.include?(framework)
+      end
+
+    end
+  end
+end

data/lib/lotus/loader.rb

@@ -31,6 +31,7 @@ module Lotus
         load_configuration_load_paths!
         load_rack!
         load_frameworks!
+        load_initializers!
       end
     end
 
@@ -45,6 +46,7 @@ module Lotus
       _configure_model_framework! if defined?(Lotus::Model)
       _configure_controller_framework!
       _configure_view_framework!
+      _configure_assets_framework!
       _configure_logger!
     end
 
@@ -97,6 +99,34 @@ module Lotus
       end
     end
 
+    def _configure_assets_framework!
+      config = configuration
+
+      unless application_module.const_defined?('Assets')
+        assets = Lotus::Assets.duplicate(namespace) do
+          root             config.root
+
+          scheme           config.scheme
+          host             config.host
+          port             config.port
+
+          public_directory Lotus.public_directory
+          prefix           Utils::PathPrefix.new('/assets').join(config.path_prefix)
+
+          manifest         Lotus.public_directory.join('assets.json')
+          compile          true
+
+          config.assets.__apply(self)
+        end
+
+        assets.configure do
+          cdn host != config.host
+        end
+
+        application_module.const_set('Assets', assets)
+      end
+    end
+
     def _configure_model_framework!
       config = configuration
       if _lotus_model_loaded? && !application_module.const_defined?('Model')
@@ -122,6 +152,7 @@ module Lotus
 
     def load_frameworks!
       _load_view_framework!
+      _load_assets_framework!
       _load_model_framework!
     end
 
@@ -131,6 +162,12 @@ module Lotus
       }
     end
 
+    def _load_assets_framework!
+      application_module.module_eval %{
+        #{ application_module }::Assets.load!
+      }
+    end
+
     def _load_model_framework!
       return unless _load_model_framework?
 
@@ -211,5 +248,11 @@ module Lotus
     def namespace
       configuration.namespace || application_module
     end
+
+    def load_initializers!
+      Dir["#{configuration.root}/config/initializers/**/*.rb"].each do |file|
+        require file
+      end
+    end
   end
 end

data/lib/lotus/lotusrc.rb

@@ -1,8 +1,9 @@
 require 'pathname'
 require 'dotenv/parser'
+require 'lotus/utils/hash'
 
 module Lotus
-  # Create and read the .lotusrc file in the root of the application
+  # Read the .lotusrc file in the root of the application
   #
   # @since 0.3.0
   # @api private
@@ -20,15 +21,21 @@ module Lotus
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc#options
     DEFAULT_ARCHITECTURE = 'container'.freeze
 
+    # Application architecture value
+    #
+    # @since 0.6.0
+    # @api private
+    APP_ARCHITECTURE = 'app'.freeze
+
     # Architecture key for writing the lotusrc file
     #
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc::DEFAULT_OPTIONS
     ARCHITECTURE_KEY = 'architecture'.freeze
 
     # Test suite default value
@@ -36,7 +43,7 @@ module Lotus
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc::DEFAULT_OPTIONS
     DEFAULT_TEST_SUITE = 'minitest'.freeze
 
     # Test suite key for writing the lotusrc file
@@ -44,7 +51,7 @@ module Lotus
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc::DEFAULT_OPTIONS
     TEST_KEY = 'test'.freeze
 
     # Template default value
@@ -52,7 +59,7 @@ module Lotus
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc::DEFAULT_OPTIONS
     DEFAULT_TEMPLATE = 'erb'.freeze
 
     # Template key for writing the lotusrc file
@@ -60,66 +67,44 @@ module Lotus
     # @since 0.3.0
     # @api private
     #
-    # @see Lotus::Lotusrc#read
+    # @see Lotus::Lotusrc::DEFAULT_OPTIONS
     TEMPLATE_KEY = 'template'.freeze
 
-    # Initialize Lotusrc class with application's root and enviroment options.
-    # Create the lotusrc file if it doesn't exist in the root given.
+    # Default values for writing the lotusrc file
+    #
+    # @since 0.5.1
+    # @api private
+    #
+    # @see Lotus::Lotusrc#options
+    DEFAULT_OPTIONS = Utils::Hash.new({
+      ARCHITECTURE_KEY => DEFAULT_ARCHITECTURE,
+      TEST_KEY         => DEFAULT_TEST_SUITE,
+      TEMPLATE_KEY     => DEFAULT_TEMPLATE
+    }).symbolize!.freeze
+
+    # Initialize Lotusrc class with application's root and environment options.
     #
     # @param root [Pathname] Application's root
-    # @param options [Hash] Environment's options
     #
     # @see Lotus::Environment#initialize
-    def initialize(root, options = {})
-      @root    = root
-      @options = options
-
-      # NOTE this line is here in order to auto-upgrade applications generated
-      # with lotusrb < 0.3.0. Consider to remove it in the future.
-      create
+    def initialize(root)
+      @root = root
     end
 
-    # Read lotusrc file and parse it's values.
+    # Read lotusrc file (if exists) and parse it's values or return default.
     #
     # @return [Lotus::Utils::Hash] parsed values
     #
     # @example Default values if file doesn't exist
-    #   Lotus::Lotusrc.new(Pathname.new(Dir.pwd)).read
+    #   Lotus::Lotusrc.new(Pathname.new(Dir.pwd)).options
     #    # => { architecture: 'container', test: 'minitest', template: 'erb' }
     #
     # @example Custom values if file doesn't exist
     #   options = { architect: 'application', test: 'rspec', template: 'slim' }
-    #   Lotus::Lotusrc.new(Pathname.new(Dir.pwd), options).read
+    #   Lotus::Lotusrc.new(Pathname.new(Dir.pwd), options).options
     #    # => { architecture: 'application', test: 'rspec', template: 'slim' }
-    def read
-      if exists?
-        Utils::Hash.new(
-          Dotenv::Parser.call(content)
-        ).symbolize!
-      end
-    end
-
-    private
-
-    # Create lotusrc file if exists
-    #
-    # @since 0.3.0
-    # @api private
-    #
-    # @see Lotus::Lotusrc::DEFAULT_ARCHITECTURE
-    # @see Lotus::Lotusrc::ARCHITECTURE_KEY
-    # @see Lotus::Lotusrc::DEFAULT_TEST_SUITE
-    # @see Lotus::Lotusrc::TEST_KEY
-    # @see Lotus::Lotusrc::DEFAULT_TEMPLATE
-    # @see Lotus::Lotusrc::TEMPLATE_KEY
-    def create
-      unless exists?
-        rcfile = File.new(path_file, "w")
-        rcfile.puts "#{ ARCHITECTURE_KEY }=#{ @options.fetch(:architecture, DEFAULT_ARCHITECTURE) }"
-        rcfile.puts "#{ TEST_KEY }=#{ @options.fetch(:test, DEFAULT_TEST_SUITE) }"
-        rcfile.puts "#{ TEMPLATE_KEY }=#{ @options.fetch(:template, DEFAULT_TEMPLATE) }"
-        rcfile.close
-      end
+    def options
+      @options ||= symbolize(DEFAULT_OPTIONS.merge(file_options))
     end
 
     # Check if lotusrc file exists
@@ -132,6 +117,16 @@ module Lotus
       path_file.exist?
     end
 
+    private
+
+    def symbolize(hash)
+      Utils::Hash.new(hash).symbolize!
+    end
+
+    def file_options
+      symbolize(exists? ? Dotenv::Parser.call(content) : {})
+    end
+
     # Return the lotusrc file's path
     #
     # @since 0.3.0
@@ -144,6 +139,12 @@ module Lotus
       @root.join FILE_NAME
     end
 
+    # Return the content of lotusrc file
+    #
+    # @since 0.3.0
+    # @api private
+    #
+    # @return [String] content of lotusrc file
     def content
       path_file.read
     end