hanami 0.8.0 → 0.9.0

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

@@ -0,0 +1,3 @@
+/db/*.sqlite
+/public/assets*
+/tmp

data/lib/hanami/generators/application/container/lib/project.rb.tt

@@ -1,57 +1 @@
-require 'hanami/model'
-require 'hanami/mailer'
-Dir["#{ __dir__ }/<%= config[:project_name] %>/**/*.rb"].each { |file| require_relative file }
-
-Hanami::Model.configure do
-  ##
-  # Database adapter
-  #
-  # Available options:
-  #
-  #  * File System adapter
-  #    adapter type: :file_system, uri: 'file:///db/bookshelf_development'
-  #
-  #  * Memory adapter
-  #    adapter type: :memory, uri: 'memory://localhost/<%= config[:project_name] %>_development'
-  #
-  #  * SQL adapter
-  #    adapter type: :sql, uri: 'sqlite://db/<%= config[:project_name] %>_development.sqlite3'
-  #    adapter type: :sql, uri: 'postgres://localhost/<%= config[:project_name] %>_development'
-  #    adapter type: :sql, uri: 'mysql://localhost/<%= config[:project_name] %>_development'
-  #
-  adapter type: :<%= config[:database_config][:type] %>, uri: ENV['DATABASE_URL']
-
-  <%- if config[:database_config][:type] == :sql -%>
-  ##
-  # Migrations
-  #
-  migrations 'db/migrations'
-  schema     'db/schema.sql'
-
-  <%- end -%>
-  ##
-  # Database mapping
-  #
-  # Intended for specifying application wide mappings.
-  #
-  mapping do
-    # collection :users do
-    #   entity     User
-    #   repository UserRepository
-    #
-    #   attribute :id,   Integer
-    #   attribute :name, String
-    # end
-  end
-end.load!
-
-Hanami::Mailer.configure do
-  root "#{ __dir__ }/<%= 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
-  end
-end.load!
+Hanami::Utils.require!("#{__dir__}/<%= config[:project_name] %>")

data/lib/hanami/generators/application/container/spec_helper.rb.minitest.tt

@@ -4,4 +4,4 @@ ENV['HANAMI_ENV'] ||= 'test'
 require_relative '../config/environment'
 require 'minitest/autorun'
 
-Hanami::Application.preload!
+Hanami.boot

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

@@ -2,9 +2,8 @@
 ENV['HANAMI_ENV'] ||= 'test'
 
 require_relative '../config/environment'
-Hanami::Application.preload!
-
-Dir[__dir__ + '/support/**/*.rb'].each { |f| require f }
+Hanami.boot
+Hanami::Utils.require!("#{__dir__}/support")
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

data/lib/hanami/generators/database_config.rb

@@ -10,12 +10,10 @@ module Hanami
         '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             }
+        'sqlite3'    => { type: :sql,         mri: 'sqlite3', jruby: 'jdbc-sqlite3'  }
       }.freeze
 
-      DEFAULT_ENGINE = 'filesystem'.freeze
+      DEFAULT_ENGINE = 'sqlite'.freeze
 
       attr_reader :engine, :name
 
@@ -23,7 +21,10 @@ module Hanami
         @engine = engine
         @name = name
 
-        SUPPORTED_ENGINES.key?(engine.to_s) or fail "\"#{ engine }\" is not a valid database type"
+        unless SUPPORTED_ENGINES.key?(engine.to_s) # rubocop:disable Style/GuardClause
+          warn %(`#{engine}' is not a valid database engine)
+          exit(1)
+        end
       end
 
       def to_hash
@@ -42,8 +43,8 @@ module Hanami
         type == :sql
       end
 
-      def filesystem?
-        type == :file_system
+      def sqlite?
+        ['sqlite', 'sqlite3'].include?(engine)
       end
 
       private
@@ -79,10 +80,6 @@ module Hanami
           "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
 

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

@@ -1,3 +1,2 @@
-class <%= config[:model_name] %>
-  include Hanami::Entity
+class <%= config[:model_name] %> < Hanami::Entity
 end

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

@@ -1,3 +1,2 @@
-class <%= config[:model_name] %>Repository
-  include Hanami::Repository
+class <%= config[:model_name] %>Repository < Hanami::Repository
 end

data/lib/hanami/generators/template_engine.rb

@@ -4,7 +4,7 @@ module Hanami
       class UnsupportedTemplateEngine < ::StandardError
       end
 
-      SUPPORTED_ENGINES = %w(erb slim haml).freeze
+      SUPPORTED_ENGINES = %w(erb haml slim).freeze
       DEFAULT_ENGINE = 'erb'.freeze
 
       attr_reader :name
@@ -17,11 +17,16 @@ module Hanami
       private
 
       def assert_engine!
-        unless supported_engine?
-          raise UnsupportedTemplateEngine, "\"#{ @name }\" is not a valid template engine"
+        if !supported_engine?
+          warn "`#{name}' is not a valid template engine. Please use one of: #{valid_template_engines.join(', ')}"
+          exit(1)
         end
       end
 
+      def valid_template_engines
+        SUPPORTED_ENGINES.map { |name| "`#{name}'"}
+      end
+
       def supported_engine?
         SUPPORTED_ENGINES.include?(@name.to_s)
       end

data/lib/hanami/generators/test_framework.rb

@@ -4,7 +4,7 @@ module Hanami
     class TestFramework
       RSPEC = 'rspec'.freeze
       MINITEST = 'minitest'.freeze
-      VALID_FRAMEWORKS = [RSPEC, MINITEST].freeze
+      VALID_FRAMEWORKS = [MINITEST, RSPEC].freeze
 
       attr_reader :framework
 
@@ -25,12 +25,13 @@ module Hanami
 
       def assert_framework!
         if !supported_framework?
-          raise ArgumentError.new("Unknown test framework '#{ framework}'. Please use one of #{ valid_test_frameworks.join(', ')}")
+          warn "`#{framework}' is not a valid test framework. Please use one of: #{valid_test_frameworks.join(', ')}"
+          exit(1)
         end
       end
 
       def valid_test_frameworks
-        VALID_FRAMEWORKS.map { |name| "'#{ name }'"}
+        VALID_FRAMEWORKS.map { |name| "`#{name}'"}
       end
 
       def supported_framework?

data/lib/hanami/middleware.rb

@@ -1,3 +1,6 @@
+require 'rack/builder'
+require 'hanami/utils/class'
+
 module Hanami
   # Rack middleware stack for an application
   #
@@ -6,35 +9,32 @@ module Hanami
   class Middleware
     # Instantiate a middleware stack
     #
-    # @param configuration [Hanami::Configuration] the application's configuration
+    # @param configuration [Hanami::ApplicationConfiguration] the application's configuration
     #
     # @return [Hanami::Middleware] the new stack
     #
     # @since 0.1.0
     # @api private
     #
-    # @see Hanami::Configuration
+    # @see Hanami::ApplicationConfiguration
     def initialize(configuration)
-      @stack = []
+      @stack         = []
       @configuration = configuration
+      @builder       = Rack::Builder.new
     end
 
     # Load the middleware stack
     #
-    # @param application [Hanami::Application] the application loading the middleware
-    #
     # @return [Hanami::Middleware] the loaded middleware stack
     #
     # @since 0.2.0
     # @api private
     #
     # @see http://rdoc.info/gems/rack/Rack/Builder
-    def load!(application, namespace)
-      @namespace = namespace
-      @builder = ::Rack::Builder.new
-      load_default_stack(application)
-      @stack.each { |m, args, block| @builder.use load_middleware(m), *args, &block }
-      @builder.run application.routes
+    def load!
+      load_default_stack
+      stack.each { |m, args, block| builder.use(load_middleware(m), *args, &block) }
+      builder.run routes
 
       self
     end
@@ -49,7 +49,7 @@ module Hanami
     # @since 0.1.0
     # @api private
     def call(env)
-      @builder.call(env)
+      builder.call(env)
     end
 
     # Append a middleware to the stack.
@@ -64,7 +64,8 @@ module Hanami
     #
     # @see Hanami::Middleware#prepend
     def use(middleware, *args, &blk)
-      @stack.push [middleware, args, blk]
+      stack.push [middleware, args, blk]
+      stack.uniq!
     end
 
     # Prepend a middleware to the stack.
@@ -79,27 +80,46 @@ module Hanami
     #
     # @see Hanami::Middleware#use
     def prepend(middleware, *args, &blk)
-      @stack.unshift [middleware, args, blk]
+      stack.unshift [middleware, args, blk]
+      stack.uniq!
     end
 
+    private
+
+    # @api private
+    # @since 0.9.0
+    attr_reader :stack
+
+    # @api private
+    # @since 0.9.0
+    attr_reader :builder
+
+    # @api private
+    # @since 0.9.0
+    attr_reader :configuration
+
     # @api private
     # @since 0.2.0
     def load_middleware(middleware)
       case middleware
       when String
-        @namespace.const_get(middleware)
+        Utils::Class.load!(middleware)
       else
         middleware
       end
     end
 
+    def routes
+      Components["#{configuration.app_name}.routes"]
+    end
+
     # @api private
     # @since 0.2.0
-    def load_default_stack(application)
+    def load_default_stack
       @default_stack_loaded ||= begin
         _load_assets_middleware
         _load_session_middleware
-        _load_default_welcome_page_for(application)
+        _load_default_welcome_page
         _load_method_override_middleware
 
         true
@@ -110,8 +130,8 @@ module Hanami
     #
     # @api private
     # @since 0.2.0
-    def _load_default_welcome_page_for(application)
-      unless Hanami.env?(:test) || application.routes.defined?
+    def _load_default_welcome_page
+      unless Hanami.env?(:test) || routes.defined?
         require 'hanami/welcome'
         use Hanami::Welcome
       end
@@ -122,8 +142,8 @@ module Hanami
     # @api private
     # @since 0.2.0
     def _load_session_middleware
-      if @configuration.sessions.enabled?
-        prepend(*@configuration.sessions.middleware)
+      if configuration.sessions.enabled?
+        prepend(*configuration.sessions.middleware)
       end
     end
 

data/lib/hanami/rake_helper.rb

@@ -16,17 +16,13 @@ module Hanami
 
     # @since 0.6.0
     # @api private
+    #
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def install
-      desc "Preload project configuration"
-      task :preload do
-        require 'hanami/environment'
-        Hanami::Environment.new
-      end
-
       desc "Load the full project"
       task environment: :preload do
-        require Hanami::Environment.new.env_config
-        Hanami::Application.preload_applications!
+        Components.resolve('apps')
       end
 
       # Ruby ecosystem compatibility
@@ -64,5 +60,7 @@ module Hanami
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/hanami/server.rb

@@ -13,32 +13,15 @@ module Hanami
   # @since 0.8.0
   # @api private
   class Server < ::Rack::Server
-
     attr_reader :options
 
-    # @param options [Hash] Environment's options
-    #
-    # @since 0.8.0
-    # @see Hanami::Environment#initialize
-    def initialize(options)
-      @_env    = Hanami::Environment.new(options)
-      @options = _extract_options
-    end
-
-
     # @since 0.8.0
     # @api private
-    def rackup_config
-      @_env.rackup.to_s
-    end
-
-
-    # Adds Shotgun Loader
     #
-    # @since 0.8.0
-    # @api private
-    def app=(shotgun_loader)
-      @app = shotgun_loader
+    # @see Hanami::Environment#initialize
+    def initialize
+      @options = _extract_options
+      setup
     end
 
     # Primarily this removes the ::Rack::Chunked middleware
@@ -54,30 +37,57 @@ module Hanami
       mw
     end
 
+    def start
+      preload
+      super
+    end
+
     private
 
-    # @since 0.8.0
-    # @api private
-    def shotgun_available?
-      require 'shotgun'
-      true
-    rescue LoadError
-      false
+    def setup
+      if code_reloading?
+        @app = Shotgun::Loader.new(rackup, &reloadable)
+      else
+        reloadable.call
+      end
+    end
+
+    def reloadable
+      ->(*) { Hanami::Components.resolve('model', 'finalizers') }
+    end
+
+    def environment
+      Components['environment']
     end
 
     # @since 0.8.0
     # @api private
     def code_reloading?
-      @_env.code_reloading?
+      Components['code_reloading']
+    end
+
+    def rackup
+      environment.rackup.to_s
     end
 
+    def preload
+      if code_reloading?
+        Shotgun.enable_copy_on_write
+        Shotgun.preload
+      else
+        Hanami.boot
+      end
+    end
+
+    # Options for Rack::Server superclass
+    #
     # @since 0.8.0
     # @api private
     def _extract_options
-      @_env.to_options.merge(
-        config:      @_env.rackup.to_s,
-        Host:        @_env.host,
-        Port:        @_env.port,
+      environment.to_options.merge(
+        config:      rackup,
+        Host:        environment.host,
+        Port:        environment.port,
         AccessLog:   []
       )
     end