hanami 0.9.2 → 1.0.0.beta1

data/lib/hanami/components.rb

@@ -101,6 +101,17 @@ module Hanami
       end
     end
 
+    # Release all the resolved components.
+    # This is used for code reloading.
+    #
+    # NOTE: this MUST NOT be used unless you know what you're doing.
+    #
+    # @since 1.0.0.beta1
+    # @api private
+    def self.release
+      @_resolved.clear
+    end
+
     require 'hanami/components/component'
     require 'hanami/components/components'
   end

data/lib/hanami/components/app/controller.rb

@@ -28,6 +28,7 @@ module Hanami
           unless namespace.const_defined?('Controller', false)
             controller = Hanami::Controller.duplicate(namespace) do
               handle_exceptions config.handle_exceptions
+              public_directory  Hanami.public_directory
               default_request_format config.default_request_format
               default_response_format config.default_response_format
               default_headers(

data/lib/hanami/components/components.rb

@@ -13,11 +13,25 @@ module Hanami
     # @since 0.9.0
     # @api private
     register 'all' do
-      requires 'model', 'apps', 'finalizers'
+      requires 'logger', 'mailer', 'code', 'model', 'apps', 'finalizers'
 
       resolve { true }
     end
 
+    # Setup project's logger
+    #
+    # @since 1.0.0.beta1
+    # @api private
+    register 'logger' do
+      prepare do
+        require 'hanami/logger'
+      end
+
+      resolve do |configuration|
+        Hanami::Logger.new(Hanami.environment.project_name, configuration.logger) unless configuration.logger.nil?
+      end
+    end
+
     # Check if code reloading is enabled
     #
     # @since 0.9.0
@@ -31,9 +45,20 @@ module Hanami
       end
 
       resolve do
-        defined?(Shotgun) &&
-          Components['environment'].code_reloading? &&
-          true
+        !!(defined?(Shotgun) && # rubocop:disable Style/DoubleNegation
+           Components['environment'].code_reloading?)
+      end
+    end
+
+    register 'code' do
+      run do
+        directory = Hanami.root.join('lib')
+
+        if Hanami.code_reloading?
+          Utils.reload!(directory)
+        else
+          Utils.require!(directory)
+        end
       end
     end
 
@@ -50,11 +75,12 @@ module Hanami
     #   Hanami::Components.resolve('model')
     #   Hanami::Components['model'] # => nil
     register 'model' do
-      requires 'model.configuration', 'model.sql'
+      requires 'logger', 'model.configuration', 'model.sql'
 
       resolve do
         if Components['model.configuration']
           Hanami::Model.load!
+          Hanami::Model.configuration.logger = Components['logger']
           true
         end
       end
@@ -77,6 +103,7 @@ module Hanami
 
       resolve do |configuration|
         if Components['model.bundled']
+          Hanami::Model.instance_variable_set(:@configuration, nil) if Hanami.code_reloading?
           Hanami::Model.configure(&configuration.model)
           Hanami::Model.configuration
         end
@@ -135,6 +162,46 @@ module Hanami
       end
     end
 
+    # Tries to evaluate hanami-mailer configuration
+    #
+    # @since 1.0.0.beta1
+    # @api private
+    #
+    # @example With hanami-mailer
+    #   Hanami::Components.resolve('mailer.configuration')
+    #   Hanami::Components['mailer.configuration'].class # => Hanami::Mailer::Configuration
+    register 'mailer.configuration' do
+      prepare do
+        require 'hanami/mailer'
+        require 'hanami/mailer/glue'
+      end
+
+      resolve do |configuration|
+        Hanami::Mailer.configuration = Hanami::Mailer::Configuration.new if Hanami.code_reloading?
+        Hanami::Mailer.configure(&configuration.mailer)
+        Hanami::Mailer.configuration
+      end
+    end
+
+    # Tries to load hanami-mailer
+    #
+    # @since 1.0.0.beta1
+    # @api private
+    #
+    # @example
+    #   Hanami::Components.resolve('mailer')
+    #   Hanami::Components['mailer'] # => true
+    register 'mailer' do
+      requires 'mailer.configuration'
+
+      resolve do
+        if Components['mailer.configuration']
+          Hanami::Mailer.load!
+          true
+        end
+      end
+    end
+
     # Loads the routes for all the mounted Hanami/Rack applications
     #
     # This is used only by `hanami routes` command.
@@ -259,7 +326,7 @@ module Hanami
     # @api private
     register 'app.frameworks' do
       run do |app|
-        ['app.controller', 'app.view', 'app.assets', 'app.logger'].each do |c|
+        ['app.controller', 'app.view', 'app.assets'].each do |c|
           component(c).call(app)
         end
       end
@@ -307,20 +374,6 @@ module Hanami
       end
     end
 
-    # Evaluate hanami/logger configuration of a single Hanami application in the project
-    #
-    # @since 0.9.0
-    # @api private
-    register 'app.logger' do
-      prepare do
-        require 'hanami/components/app/logger'
-      end
-
-      run do |app|
-        Components::App::Logger.resolve(app)
-      end
-    end
-
     # Load the code for a single Hanami application in the project
     #
     # @since 0.9.0

data/lib/hanami/configuration.rb

@@ -46,6 +46,18 @@ module Hanami
       end
     end
 
+    def logger(options = nil)
+      if options.nil?
+        settings.fetch(:logger, nil)
+      else
+        settings[:logger] = options
+      end
+    end
+
+    def environment(name)
+      yield if ENV['HANAMI_ENV'] == name.to_s
+    end
+
     private
 
     attr_reader :settings

data/lib/hanami/env.rb

@@ -59,6 +59,8 @@ module Hanami
       parsed   = Dotenv::Parser.call(contents)
 
       parsed.each do |k, v|
+        next if @env.has_key?(k)
+
         @env[k] = v
       end
       nil

data/lib/hanami/environment.rb

@@ -193,6 +193,10 @@ module Hanami
     #   # is "development". The settings defined in this last file override
     #   # the one defined in the parent (eg `FOO` is overwritten). All the
     #   # other settings (eg `XYZ`) will be left untouched.
+    #   # Variables declared on `.env` and `.env.development` will not override
+    #   # any variable declared on the shell when calling a `hanami` command.
+    #   # Eg. In `FOO="not ok" bundle exec hanami c` `FOO` will not be overwritten
+    #   # to `"ok"`.
     def initialize(options = {})
       opts     = options.to_h.dup
       @env     = Hanami::Env.new(env: opts.delete(:env) || ENV)
@@ -331,7 +335,7 @@ module Hanami
 
     # Check if the current port is the default one
     #
-    # @since x.x.x
+    # @since 1.0.0.beta1
     # @api private
     #
     # @see Hanami::ApplicationConfiguration#port

data/lib/hanami/generators/app/application.rb.tt

@@ -271,18 +271,6 @@ module <%= config[:classified_app_name] %>
     configure :development do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Logger
-      # See: http://hanamirb.org/guides/projects/logging
-      #
-      # Logger stream. It defaults to STDOUT.
-      # logger.stream "log/development.log"
-      #
-      # Logger level. It defaults to DEBUG
-      # logger.level :debug
-      #
-      # Logger format. It defaults to DEFAULT
-      # logger.format :default
     end
 
     ##
@@ -291,12 +279,6 @@ module <%= config[:classified_app_name] %>
     configure :test do
       # Don't handle exceptions, render the stack trace
       handle_exceptions false
-
-      # Logger
-      # See: http://hanamirb.org/guides/projects/logging
-      #
-      # Logger level. It defaults to ERROR
-      logger.level :error
     end
 
     ##
@@ -307,18 +289,6 @@ module <%= config[:classified_app_name] %>
       # host   'example.org'
       # port   443
 
-      # Logger
-      # See: http://hanamirb.org/guides/projects/logging
-      #
-      # Logger stream. It defaults to STDOUT.
-      # logger.stream "log/production.log"
-      #
-      # Logger level. It defaults to INFO
-      logger.level :info
-
-      # Logger format.
-      logger.format :json
-
       assets do
         # Don't compile static assets in production mode (eg. Sass, ES6)
         #

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

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'bundler'
 gem 'rake'
 <%- if config[:hanami_head] -%>
 

data/lib/hanami/generators/application/container/config/boot.rb.tt

@@ -0,0 +1,2 @@
+require_relative './environment'
+Hanami.boot

data/lib/hanami/generators/application/container/config/environment.rb.tt

@@ -13,7 +13,7 @@ Hanami.configure do
     #
     #  * SQL adapter
     #    adapter :sql, 'sqlite://db/<%= config[:project_name] %>_development.sqlite3'
-    #    adapter :sql, 'postgres://localhost/<%= config[:project_name] %>_development'
+    #    adapter :sql, 'postgresql://localhost/<%= config[:project_name] %>_development'
     #    adapter :sql, 'mysql://localhost/<%= config[:project_name] %>_development'
     #
     adapter :<%= config[:database_config][:type] %>, ENV['DATABASE_URL']
@@ -31,10 +31,19 @@ Hanami.configure do
     root 'lib/<%= config[:project_name] %>/mailers'
 
     # See http://hanamirb.org/guides/mailers/delivery
-    delivery do
-      development :test
-      test        :test
-      # production :smtp, address: ENV['SMTP_PORT'], port: 1025
+    delivery :test
+  end
+
+  environment :development do
+    # See: http://hanamirb.org/guides/projects/logging
+    logger level: :debug
+  end
+
+  environment :production do
+    logger level: :info, formatter: :json
+
+    mailer do
+      delivery :smtp, address: ENV['SMTP_HOST'], port: ENV['SMTP_PORT']
     end
   end
 end

data/lib/hanami/generators/database_config.rb

@@ -77,7 +77,7 @@ module Hanami
             "mysql2://localhost/#{ name }"
           end
         when 'postgresql', 'postgres'
-          "postgres://localhost/#{ name }"
+          "postgresql://localhost/#{ name }"
         when 'sqlite', 'sqlite3'
           "sqlite://db/#{ Shellwords.escape(name) }"
         end

data/lib/hanami/generators/mailer/mailer_spec.rb.rspec.tt

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

data/lib/hanami/generators/model/migration.rb.tt

@@ -0,0 +1,10 @@
+Hanami::Model.migration do
+  change do
+    create_table :<%= config[:table_name] %> do
+      primary_key :id
+
+      column :created_at, DateTime, null: false
+      column :updated_at, DateTime, null: false
+    end
+  end
+end

data/lib/hanami/mailer/glue.rb

@@ -1,55 +1,13 @@
-require 'hanami/utils/basic_object'
-
 module Hanami::Mailer
-  # @since 0.5.0
-  # @api private
-  class Delivery < ::Hanami::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(*Hanami::Mailer::Delivery.new(Hanami.env, &blk).to_config)
+    def self.included(configuration)
+      configuration.class_eval do
+        alias_method :delivery, :delivery_method
+      end
     end
   end
 

data/lib/hanami/server.rb

@@ -30,8 +30,7 @@ module Hanami
     # @since 0.8.0
     def middleware
       mw = Hash.new { |e, m| e[m] = [] }
-      mw["deployment"].concat([::Rack::ContentLength, ::Rack::CommonLogger])
-      mw["development"].concat(mw["deployment"] + [::Rack::ShowExceptions, ::Rack::Lint])
+      mw["development"].concat([::Rack::ShowExceptions, ::Rack::Lint])
       require 'hanami/assets/static'
       mw["development"].push(::Hanami::Assets::Static)
       mw
@@ -45,15 +44,8 @@ module Hanami
     private
 
     def setup
-      if code_reloading?
-        @app = Shotgun::Loader.new(rackup, &reloadable)
-      else
-        reloadable.call
-      end
-    end
-
-    def reloadable
-      ->(*) { Hanami::Components.resolve('model', 'finalizers') }
+      return unless code_reloading?
+      @app = Shotgun::Loader.new(rackup)
     end
 
     def environment
@@ -63,7 +55,7 @@ module Hanami
     # @since 0.8.0
     # @api private
     def code_reloading?
-      Components['code_reloading']
+      Hanami.code_reloading?
     end
 
     def rackup

data/lib/hanami/static.rb

@@ -32,10 +32,6 @@ module Hanami
     # @api private
     HEADER_RULES = [[:all, { 'Cache-Control' => "public, max-age=#{MAX_AGE}" }]].freeze
 
-    # @since 0.8.0
-    # @api private
-    EXCLUDED_ENTRIES = %w(. ..).freeze
-
     # @since 0.8.0
     # @api private
     URL_PREFIX = '/'.freeze
@@ -53,10 +49,10 @@ module Hanami
     def _urls(root)
       return [] unless root.exist?
 
-      Dir.entries(root).sort.map do |entry|
-        next if EXCLUDED_ENTRIES.include?(entry)
-        "#{URL_PREFIX}#{entry}"
-      end.compact
+      asset_files = Dir.chdir(root) do
+        Dir['**/*'].select { |path| File.file? path }
+      end
+      Hash[asset_files.map { |entry| ["#{URL_PREFIX}#{entry}", entry] }]
     end
   end
 end