lotusrb 0.4.1 → 0.5.0

data/lib/lotus/generators/mailer.rb

@@ -0,0 +1,112 @@
+require 'lotus/generators/abstract'
+require 'lotus/utils/string'
+
+module Lotus
+  module Generators
+    # @since 0.5.0
+    # @api private
+    class Mailer < Abstract
+
+      # @since 0.5.0
+      # @api private
+      TXT_FORMAT  = '.txt'.freeze
+
+      # @since 0.5.0
+      # @api private
+      HTML_FORMAT  = '.html'.freeze
+
+      # @since 0.5.0
+      # @api private
+      DEFAULT_ENGINE = 'erb'.freeze
+
+      # @since 0.5.0
+      # @api private
+      DEFAULT_FROM = "'<from>'".freeze
+
+      # @since 0.5.0
+      # @api private
+      DEFAULT_TO = "'<to>'".freeze
+
+      # @since 0.5.0
+      # @api private
+      DEFAULT_SUBJECT = "'Hello'".freeze
+
+      # @since 0.5.0
+      # @api private
+      def initialize(command)
+        super
+
+        @mailer_name = Utils::String.new(name).classify
+        cli.class.source_root(source)
+      end
+
+      # @since 0.5.0
+      # @api private
+      def start
+        assert_mailer!
+
+        opts = {
+          mailer:  @mailer_name,
+          from:    DEFAULT_FROM,
+          to:      DEFAULT_TO,
+          subject: DEFAULT_SUBJECT,
+        }
+
+        templates = {
+          'mailer_spec.rb.tt' => _mailer_spec_path,
+          'mailer.rb.tt'      => _mailer_path,
+          'template.txt.tt'   => _txt_template_path,
+          'template.html.tt'  => _html_template_path,
+        }
+
+        templates.each do |src, dst|
+          cli.template(source.join(src), target.join(dst), opts)
+        end
+      end
+
+      # @since 0.5.0
+      # @api private
+      def assert_mailer!
+        if @mailer_name.nil? || @mailer_name.empty?
+          raise Lotus::Commands::Generate::Error.new("Missing mailer name")
+        end
+      end
+
+      # @since 0.5.0
+      # @api private
+      def _mailer_path
+        core_root.join('mailers', "#{ name }.rb").to_s
+      end
+
+      # @since 0.5.0
+      # @api private
+      def _mailer_spec_path
+        spec_root.join(::File.basename(Dir.getwd), 'mailers', "#{ name }_spec.rb")
+      end
+
+      # @since 0.5.0
+      # @api private
+      def _txt_template_path
+        __template_path(TXT_FORMAT)
+      end
+
+      # @since 0.5.0
+      # @api private
+      def _html_template_path
+        __template_path(HTML_FORMAT)
+      end
+
+      # @since 0.5.0
+      # @api private
+      def __template_path(format)
+        core_root.join('mailers', 'templates', "#{ name }#{ format }.#{ DEFAULT_ENGINE }")
+      end
+
+      # @since 0.5.0
+      # @api private
+      def name
+        Utils::String.new(app_name || super).underscore
+      end
+    end
+  end
+end

data/lib/lotus/generators/mailer/mailer.rb.tt

@@ -0,0 +1,7 @@
+class Mailers::<%= config[:mailer] %>
+  include Lotus::Mailer
+
+  from    <%= config[:from] %>
+  to      <%= config[:to] %>
+  subject <%= config[:subject] %>
+end

data/lib/lotus/generators/mailer/mailer_spec.rb.tt

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Mailers::<%= config[:mailer] %> do
+  it 'delivers email' do
+    mail = Mailers::<%= config[:mailer] %>.deliver
+  end
+end

data/lib/lotus/generators/model/entity_spec.rspec.tt

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe <%= config[:model_name] %> do
   # place your tests here
 end

data/lib/lotus/generators/model/repository_spec.rspec.tt

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe <%= config[:model_name] %>Repository do
   # place your tests here
 end

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

@@ -82,7 +82,12 @@ module <%= config[:classified_slice_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
@@ -149,7 +154,7 @@ module <%= config[:classified_slice_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).
       #
@@ -172,7 +177,7 @@ module <%= config[:classified_slice_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/slice/templates/application.html.erb.tt

@@ -1,4 +1,4 @@
-<!doctype HTML>
+<!DOCTYPE html>
 <html>
   <head>
     <title><%= config[:classified_slice_name] %></title>

data/lib/lotus/loader.rb

@@ -53,7 +53,8 @@ module Lotus
       unless namespace.const_defined?('Controller')
         controller = Lotus::Controller.duplicate(namespace) do
           handle_exceptions config.handle_exceptions
-          default_format    config.default_format
+          default_request_format config.default_request_format
+          default_response_format config.default_response_format
           default_headers({
             Lotus::Config::Security::X_FRAME_OPTIONS_HEADER         => config.security.x_frame_options,
             Lotus::Config::Security::CONTENT_SECURITY_POLICY_HEADER => config.security.content_security_policy
@@ -112,8 +113,10 @@ module Lotus
 
     def _configure_logger!
       unless application_module.const_defined?('Logger', false)
-        logger = Lotus::Logger.new(application_module.to_s)
-        application_module.const_set('Logger', logger)
+        if configuration.logger.nil?
+          configuration.logger Lotus::Logger.new(application_module.to_s)
+        end
+        application_module.const_set('Logger', configuration.logger)
       end
     end
 
@@ -147,6 +150,10 @@ module Lotus
       defined?(Lotus::Model)
     end
 
+    def _lotus_mailer_loaded?
+      defined?(Lotus::Mailer)
+    end
+
     def load_configuration_load_paths!
       configuration.load_paths.load!(configuration.root)
     end

data/lib/lotus/mailer/glue.rb

@@ -0,0 +1,68 @@
+require 'lotus/utils/basic_object'
+
+module Lotus::Mailer
+  # @since 0.5.0
+  # @api private
+  class Delivery < ::Lotus::Utils::BasicObject
+    # @since 0.5.0
+    # @api private
+    def initialize(env, &blk)
+      @env = env
+      instance_eval(&blk)
+    end
+
+    # @since 0.5.0
+    # @api private
+    def to_config
+      @config
+    end
+
+    # @since 0.5.0
+    # @api private
+    def test(*args)
+      __setup_config(:test, *args)
+    end
+
+    private
+
+    # @since 0.5.0
+    # @api private
+    def method_missing(m, *args)
+      __setup_config(m, *args)
+    end
+
+    # @since 0.5.0
+    # @api private
+    def __setup_config(env, *args)
+      if env.to_s == @env
+        @config = args
+      end
+    end
+  end
+
+
+  # @since 0.5.0
+  # @api private
+  module Glue
+
+    # @since 0.5.0
+    # @api private
+    def delivery(&blk)
+      raise ArgumentError unless block_given?
+      delivery_method(*Lotus::Mailer::Delivery.new(Lotus.env, &blk).to_config)
+    end
+  end
+
+  Configuration.class_eval do
+    include Glue
+  end
+end
+
+# @since 0.5.0
+# @api private
+module Mailers
+end
+
+Lotus::Mailer.configure do
+  namespace Mailers
+end

data/lib/lotus/middleware.rb

@@ -94,7 +94,7 @@ module Lotus
     # @api private
     # @since 0.2.0
     def _load_default_welcome_page_for(application)
-      unless application.routes.defined?
+      unless Lotus.env?(:test) || application.routes.defined?
         require 'lotus/welcome'
         use Lotus::Welcome
       end
@@ -116,8 +116,8 @@ module Lotus
     # #since 0.2.0
     def _load_asset_middlewares
       if @configuration.serve_assets
-        @configuration.assets.entries.each do |path, children|
-          use Rack::Static, urls: children, root: path
+        @configuration.assets.for_each_source do |source|
+          use Rack::Static, urls: source.urls, root: source.root
         end
       end
     end

data/lib/lotus/version.rb

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

data/lotusrb.gemspec

@@ -19,11 +19,12 @@ 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.1'
-  spec.add_dependency 'lotus-router',     '~> 0.4', '>= 0.4.2'
-  spec.add_dependency 'lotus-controller', '~> 0.4', '>= 0.4.4'
-  spec.add_dependency 'lotus-view',       '~> 0.4', '>= 0.4.3'
-  spec.add_dependency 'lotus-helpers',    '~> 0.2'
+  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-mailer',     '~> 0.1'
   spec.add_dependency 'shotgun',          '~> 0.9'
   spec.add_dependency 'dotenv',           '~> 2.0'
   spec.add_dependency 'thor',             '~> 0.19'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotusrb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils
@@ -21,7 +21,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: lotus-router
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: lotus-controller
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: lotus-view
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: lotus-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,6 +109,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: lotus-mailer
+  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
@@ -320,6 +340,12 @@ files:
 - 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/database_config.rb
+- lib/lotus/generators/mailer.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
@@ -337,6 +363,7 @@ files:
 - lib/lotus/generators/slice/views/application_layout.rb.tt
 - lib/lotus/loader.rb
 - lib/lotus/lotusrc.rb
+- lib/lotus/mailer/glue.rb
 - lib/lotus/middleware.rb
 - lib/lotus/rendering_policy.rb
 - lib/lotus/root.rb
@@ -372,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A complete web framework for Ruby