lotusrb 0.4.1 → 0.5.0

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

@@ -1,13 +1,12 @@
-require 'spec_helper'
 require_relative '<%= config[:relative_view_path] %>'
 
 describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:action] %> do
   let(:exposures) { Hash[foo: 'bar'] }
   let(:template)  { Lotus::View::Template.new('<%= config[:template_path] %>') }
-  let(:view)      { <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:action] %>.new(template, exposures) }
+  let(:view)      { described_class.new(template, exposures) }
   let(:rendered)  { view.render }
 
-  it "exposes #foo" do
+  it 'exposes #foo' do
     expect(view.foo).to eq exposures.fetch(:foo)
   end
 end

data/lib/lotus/generators/application/app.rb

@@ -1,5 +1,6 @@
 require 'shellwords'
 require 'lotus/generators/abstract'
+require 'lotus/generators/database_config'
 
 module Lotus
   module Generators
@@ -8,13 +9,13 @@ module Lotus
         def initialize(command)
           super
 
-          @upcase_app_name       = app_name.to_env_s
-          @classified_app_name   = Utils::String.new(app_name).classify
-          @lotus_head            = options.fetch(:lotus_head)
-          @test                  = options[:test]
-          @database              = options[:database]
-          @application_base_url  = options[:application_base_url]
-          @lotus_model_version   = '~> 0.4'
+          @upcase_app_name      = app_name.to_env_s
+          @classified_app_name  = Utils::String.new(app_name).classify
+          @lotus_head           = options.fetch(:lotus_head)
+          @test                 = options[:test]
+          @database_config      = DatabaseConfig.new(options[:database], app_name)
+          @application_base_url = options[:application_base_url]
+          @lotus_model_version  = '~> 0.5'
 
           cli.class.source_root(source)
         end
@@ -22,15 +23,15 @@ module Lotus
         def start
 
           opts      = {
-            app_name:              app_name,
-            upcase_app_name:       @upcase_app_name,
-            classified_app_name:   @classified_app_name,
-            application_base_url:  @application_base_url,
-            lotus_head:            @lotus_head,
-            test:                  @test,
-            database:              @database,
-            database_config:       database_config,
-            lotus_model_version:   @lotus_model_version,
+            app_name:             app_name,
+            upcase_app_name:      @upcase_app_name,
+            classified_app_name:  @classified_app_name,
+            application_base_url: @application_base_url,
+            lotus_head:           @lotus_head,
+            test:                 @test,
+            database:             @database_config.engine,
+            database_config:      @database_config.to_hash,
+            lotus_model_version:  @lotus_model_version,
           }
 
           templates = {
@@ -54,11 +55,12 @@ module Lotus
             "app/views",
             "lib/#{ app_name }/entities",
             "lib/#{ app_name }/repositories",
+            "lib/#{ app_name }/mailers",
             "public/javascripts",
             "public/stylesheets"
           ]
 
-          empty_directories << if sql_database?
+          empty_directories << if @database_config.sql?
             "db/migrations"
           else
             "db"
@@ -91,10 +93,11 @@ module Lotus
           empty_directories << [
             "spec/#{ app_name }/entities",
             "spec/#{ app_name }/repositories",
+            "spec/#{ app_name }/mailers",
             "spec/support"
           ]
 
-          if sql_database?
+          if @database_config.sql?
             templates.merge!(
               'schema.sql.tt' => 'db/schema.sql'
             )
@@ -110,7 +113,7 @@ module Lotus
           end
 
           unless git_dir_present?
-            cli.template(source.join(database_type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
+            cli.template(source.join(@database_config.type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
             cli.run("git init #{Shellwords.escape(target)}", capture: true)
           end
         end
@@ -120,66 +123,6 @@ module Lotus
         def git_dir_present?
           File.directory?(source.join('.git'))
         end
-
-        def database_config
-          {
-            gem: database_gem,
-            uri: database_uri,
-            type: database_type
-          }
-        end
-
-        def database_gem
-          {
-            'mysql'      => 'mysql',
-            'mysql2'     => 'mysql2',
-            'postgresql' => 'pg',
-            'postgres'   => 'pg',
-            'sqlite'     => 'sqlite3',
-            'sqlite3'    => 'sqlite3'
-          }[@database]
-        end
-
-        def sql_database?
-          database_type == :sql
-        end
-
-        def database_type
-          case @database
-          when 'mysql', 'mysql2', 'postgresql', 'postgres', 'sqlite', 'sqlite3'
-            :sql
-          when 'filesystem'
-            :file_system
-          when 'memory'
-            :memory
-          end
-        end
-
-        def database_uri
-          {
-            development: "#{database_base_uri}_development",
-            test: "#{database_base_uri}_test"
-          }
-        end
-
-        def database_base_uri
-          case @database
-          when 'mysql'
-            "mysql://localhost/#{app_name}"
-          when 'mysql2'
-            "mysql2://localhost/#{app_name}"
-          when 'postgresql', 'postgres'
-            "postgres://localhost/#{app_name}"
-          when 'sqlite', 'sqlite3'
-            "sqlite://db/#{Shellwords.escape(app_name)}"
-          when 'memory'
-            "memory://localhost/#{app_name}"
-          when 'filesystem'
-            "file:///db/#{app_name}"
-          else
-            raise "\"#{@database}\" is not a valid database type"
-          end
-        end
       end
     end
   end

data/lib/lotus/generators/application/app/Gemfile.tt

@@ -11,6 +11,7 @@ gem 'lotus-helpers',     require: false, github: 'lotus/helpers'
 gem 'lotus-controller',  require: false, github: 'lotus/controller'
 gem 'lotus-view',        require: false, github: 'lotus/view'
 gem 'lotus-model',       require: false, github: 'lotus/model'
+gem 'lotus-mailer',      require: false, github: 'lotus/mailer'
 gem 'lotusrb',                           github: 'lotus/lotus'
 <%- else -%>
 gem 'lotusrb',       '<%= Lotus::VERSION %>'

data/lib/lotus/generators/application/app/config/application.rb.tt

@@ -84,7 +84,12 @@ module <%= config[:classified_app_name] %>
       # Default format for the requests that don't specify an HTTP_ACCEPT header
       # Argument: A symbol representation of a mime type, default to :html
       #
-      # default_format :html
+      # default_request_format :html
+
+      # Default format for responses that doesn't take into account the request format
+      # Argument: A symbol representation of a mime type, default to :html
+      #
+      # default_response_format :html
 
       # HTTP Body parsers
       # Parse non GET responses body for a specific mime type
@@ -146,7 +151,7 @@ module <%= config[:classified_app_name] %>
       # Web applications can send this header to mitigate Cross Site Scripting
       # (XSS) attacks.
       #
-      # The default value allows images, scripts, AJAX, and CSS from the same
+      # The default value allows images, scripts, AJAX, fonts and CSS from the same
       # origin, and does not allow any other resources to load (eg object,
       # frame, media, etc).
       #
@@ -169,7 +174,7 @@ module <%= config[:classified_app_name] %>
       #  * http://content-security-policy.com/
       #  * https://developer.mozilla.org/en-US/docs/Web/Security/CSP/Using_Content_Security_Policy
       #
-      security.content_security_policy "default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self';"
+      security.content_security_policy "default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; font-src 'self';"
 
       ##
       # FRAMEWORKS

data/lib/lotus/generators/application/app/lib/app_name.rb.tt

@@ -1,4 +1,5 @@
 require 'lotus/model'
+require 'lotus/mailer'
 Dir["#{ __dir__ }/<%= config[:app_name] %>/**/*.rb"].each { |file| require_relative file }
 
 Lotus::Model.configure do
@@ -45,3 +46,14 @@ Lotus::Model.configure do
     # end
   end
 end.load!
+
+Lotus::Mailer.configure do
+  root "#{ __dir__ }/<%= config[:app_name] %>/mailers"
+
+  # See http://lotusrb.org/guides/mailers/delivery
+  delivery do
+    development :test
+    test        :test
+    # production :stmp, address: ENV['SMTP_PORT'], port: 1025
+  end
+end.load!

data/lib/lotus/generators/application/container.rb

@@ -1,5 +1,6 @@
 require 'shellwords'
 require 'lotus/generators/abstract'
+require 'lotus/generators/database_config'
 require 'lotus/generators/slice'
 
 module Lotus
@@ -9,23 +10,23 @@ module Lotus
         def initialize(command)
           super
 
-          @slice_generator       = Slice.new(command)
-          @lotus_head            = options.fetch(:lotus_head)
-          @test                  = options[:test]
-          @database              = options[:database]
-          @lotus_model_version   = '~> 0.4'
+          @slice_generator      = Slice.new(command)
+          @database_config      = DatabaseConfig.new(options[:database], app_name)
+          @lotus_head           = options.fetch(:lotus_head)
+          @test                 = options[:test]
+          @lotus_model_version  = '~> 0.5'
 
           cli.class.source_root(source)
         end
 
         def start
           opts      = {
-            app_name:              app_name,
-            lotus_head:            @lotus_head,
-            test:                  @test,
-            database:              @database,
-            database_config:       database_config,
-            lotus_model_version:   @lotus_model_version,
+            app_name:             app_name,
+            lotus_head:           @lotus_head,
+            test:                 @test,
+            database:             @database_config.engine,
+            database_config:      @database_config.to_hash,
+            lotus_model_version:  @lotus_model_version,
           }
 
           templates = {
@@ -42,10 +43,11 @@ module Lotus
 
           empty_directories = [
             "lib/#{ app_name }/entities",
-            "lib/#{ app_name }/repositories"
+            "lib/#{ app_name }/repositories",
+            "lib/#{ app_name }/mailers"
           ]
 
-          empty_directories << if sql_database?
+          empty_directories << if @database_config.sql?
             "db/migrations"
           else
             "db"
@@ -68,7 +70,7 @@ module Lotus
             )
           end
 
-          if sql_database?
+          if @database_config.sql?
             templates.merge!(
               'schema.sql.tt' => 'db/schema.sql'
             )
@@ -77,6 +79,7 @@ module Lotus
           empty_directories << [
             "spec/#{ app_name }/entities",
             "spec/#{ app_name }/repositories",
+            "spec/#{ app_name }/mailers",
             "spec/support"
           ]
 
@@ -90,7 +93,7 @@ module Lotus
           end
 
           unless git_dir_present?
-            cli.template(source.join(database_type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
+            cli.template(source.join(@database_config.type == :file_system ? 'gitignore.tt' : '.gitignore'), target.join('.gitignore'), opts)
             cli.run("git init #{Shellwords.escape(target)}", capture: true)
           end
 
@@ -102,75 +105,6 @@ module Lotus
         def git_dir_present?
           File.directory?(source.join('.git'))
         end
-
-        def database_config
-          {
-            gem: database_gem,
-            uri: database_uri,
-            type: database_type
-          }
-        end
-
-        def database_gem
-          {
-            'mysql'      => 'mysql',
-            'mysql2'     => 'mysql2',
-            'postgresql' => 'pg',
-            'postgres'   => 'pg',
-            'sqlite'     => 'sqlite3',
-            'sqlite3'    => 'sqlite3'
-          }[@database]
-        end
-
-        def database_type
-          case @database
-          when 'mysql', 'mysql2', 'postgresql', 'postgres', 'sqlite', 'sqlite3'
-            :sql
-          when 'filesystem'
-            :file_system
-          when 'memory'
-            :memory
-          end
-        end
-
-        def sql_database?
-          database_type == :sql
-        end
-
-        def database_uri
-          {
-            development: database_environment_uri(:development),
-            test: database_environment_uri(:test)
-          }
-        end
-
-        def database_base_uri
-          case @database
-          when 'mysql'
-            "mysql://localhost/#{app_name}"
-          when 'mysql2'
-            "mysql2://localhost/#{app_name}"
-          when 'postgresql', 'postgres'
-            "postgres://localhost/#{app_name}"
-          when 'sqlite', 'sqlite3'
-            "sqlite://db/#{Shellwords.escape(app_name)}"
-          when 'memory'
-            "memory://localhost/#{app_name}"
-          when 'filesystem'
-            "file:///db/#{app_name}"
-          else
-            raise "\"#{@database}\" is not a valid database type"
-          end
-        end
-
-        def database_environment_uri(environment)
-          case @database
-          when 'sqlite', 'sqlite3'
-            "#{database_base_uri}_#{environment}.sqlite"
-          else
-            "#{database_base_uri}_#{environment}"
-          end
-        end
       end
     end
   end

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

@@ -11,10 +11,11 @@ gem 'lotus-helpers',     require: false, github: 'lotus/helpers'
 gem 'lotus-controller',  require: false, github: 'lotus/controller'
 gem 'lotus-view',        require: false, github: 'lotus/view'
 gem 'lotus-model',       require: false, github: 'lotus/model'
+gem 'lotus-mailer',      require: false, github: 'lotus/mailer'
 gem 'lotusrb',                           github: 'lotus/lotus'
 <%- else -%>
-gem 'lotusrb',       '<%= Lotus::VERSION %>'
-gem 'lotus-model',   '<%= config[:lotus_model_version] %>'
+gem 'lotusrb',     '<%= Lotus::VERSION %>'
+gem 'lotus-model', '<%= config[:lotus_model_version] %>'
 <%- end -%>
 
 <%- if config[:database_config][:gem] %>

data/lib/lotus/generators/application/container/lib/app_name.rb.tt

@@ -1,4 +1,5 @@
 require 'lotus/model'
+require 'lotus/mailer'
 Dir["#{ __dir__ }/<%= config[:app_name] %>/**/*.rb"].each { |file| require_relative file }
 
 Lotus::Model.configure do
@@ -46,3 +47,14 @@ Lotus::Model.configure do
     # end
   end
 end.load!
+
+Lotus::Mailer.configure do
+  root "#{ __dir__ }/<%= config[:app_name] %>/mailers"
+
+  # See http://lotusrb.org/guides/mailers/delivery
+  delivery do
+    development :test
+    test        :test
+    # production :stmp, address: ENV['SMTP_PORT'], port: 1025
+  end
+end.load!

data/lib/lotus/generators/database_config.rb

@@ -0,0 +1,86 @@
+module Lotus
+  module Generators
+    class DatabaseConfig
+      SUPPORTED_ENGINES = {
+        'mysql'      => { type: :sql,         mri: 'mysql2',  jruby: 'jdbc-mysql'    },
+        'mysql2'     => { type: :sql,         mri: 'mysql2',  jruby: 'jdbc-mysql'    },
+        'postgresql' => { type: :sql,         mri: 'pg',      jruby: 'jdbc-postgres' },
+        'postgres'   => { type: :sql,         mri: 'pg',      jruby: 'jdbc-postgres' },
+        'sqlite'     => { type: :sql,         mri: 'sqlite3', jruby: 'jdbc-sqlite3'  },
+        'sqlite3'    => { type: :sql,         mri: 'sqlite3', jruby: 'jdbc-sqlite3'  },
+        'filesystem' => { type: :file_system, mri: nil,       jruby: nil             },
+        'memory'     => { type: :memory,      mri: nil,       jruby: nil             }
+      }.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"
+      end
+
+      def to_hash
+        {
+          gem: gem,
+          uri: uri,
+          type: type
+        }
+      end
+
+      def type
+        SUPPORTED_ENGINES[engine][:type]
+      end
+
+      def sql?
+        type == :sql
+      end
+
+      private
+
+      def platform
+        Lotus::Utils.jruby? ? :jruby : :mri
+      end
+
+      def platform_prefix
+        :jdbc if Lotus::Utils.jruby?
+      end
+
+      def uri
+        {
+          development: environment_uri(:development),
+          test: environment_uri(:test)
+        }
+      end
+
+      def gem
+        SUPPORTED_ENGINES[engine][platform]
+      end
+
+      def base_uri
+        case engine
+        when 'mysql', 'mysql2'
+          "mysql2://localhost/#{ name }"
+        when 'postgresql', 'postgres'
+          "postgres://localhost/#{ name }"
+        when 'sqlite', 'sqlite3'
+          "sqlite://db/#{ Shellwords.escape(name) }"
+        when 'memory'
+          "memory://localhost/#{ name }"
+        when 'filesystem'
+          "file:///db/#{ Shellwords.escape(name) }"
+        end
+      end
+
+      def environment_uri(environment)
+        case engine
+        when 'sqlite', 'sqlite3'
+          "#{ platform_prefix }#{ base_uri }_#{ environment }.sqlite"
+        else
+          "#{ platform_prefix }#{ base_uri }_#{ environment }"
+        end
+      end
+    end
+  end
+end