hanami 0.8.0 → 0.9.0

data/lib/hanami/env.rb

@@ -0,0 +1,67 @@
+begin
+  require 'dotenv'
+rescue LoadError # rubocop:disable Lint/HandleExceptions
+end
+
+module Hanami
+  # Encapsulate access to ENV
+  #
+  # @since 0.9.0
+  # @api private
+  class Env
+    # Create a new instance
+    #
+    # @param env [#[],#[]=] a Hash like object. It defaults to ENV
+    #
+    # @return [Hanami::Env]
+    #
+    # @since 0.9.0
+    # @api private
+    def initialize(env: ENV)
+      @env = env
+    end
+
+    # Return a value, if found
+    #
+    # @param key [String] the key
+    #
+    # @return [String,NilClass] the value, if found
+    #
+    # @since 0.9.0
+    # @api private
+    def [](key)
+      @env[key]
+    end
+
+    # Sets a value
+    #
+    # @param key [String] the key
+    # @param value [String] the value
+    #
+    # @since 0.9.0
+    # @api private
+    def []=(key, value)
+      @env[key] = value
+    end
+
+    # Loads a dotenv file and updates self
+    #
+    # @param path [String, Pathname] the path to the dotenv file
+    #
+    # @return void
+    #
+    # @since 0.9.0
+    # @api private
+    def load!(path)
+      return unless defined?(Dotenv)
+
+      contents = ::File.open(path, "rb:bom|utf-8", &:read)
+      parsed   = Dotenv::Parser.call(contents)
+
+      parsed.each do |k, v|
+        @env[k] = v
+      end
+      nil
+    end
+  end
+end

data/lib/hanami/environment.rb

@@ -2,11 +2,9 @@ require 'thread'
 require 'pathname'
 require 'hanami/utils'
 require 'hanami/utils/hash'
+require 'hanami/env'
 require 'hanami/hanamirc'
-begin
-  require 'dotenv'
-rescue LoadError
-end
+require 'hanami/components'
 
 module Hanami
   # Define and expose information about the Hanami environment.
@@ -196,8 +194,10 @@ module Hanami
     #   # the one defined in the parent (eg `FOO` is overwritten). All the
     #   # other settings (eg `XYZ`) will be left untouched.
     def initialize(options = {})
+      opts     = options.to_h.dup
+      @env     = Hanami::Env.new(env: opts.delete(:env) || ENV)
       @options = Hanami::Hanamirc.new(root).options
-      @options.merge! Utils::Hash.new(options.clone).symbolize!
+      @options.merge! Utils::Hash.new(opts.clone).symbolize!
       LOCK.synchronize { set_env_vars! }
     end
 
@@ -218,7 +218,7 @@ module Hanami
     #
     # @see Hanami::Environment::DEFAULT_ENV
     def environment
-      @environment ||= ENV[HANAMI_ENV] || rack_env || DEFAULT_ENV
+      @environment ||= env[HANAMI_ENV] || rack_env || DEFAULT_ENV
     end
 
     # @since 0.3.1
@@ -304,9 +304,9 @@ module Hanami
     # @see Hanami::Environment::DEFAULT_HOST
     # @see Hanami::Environment::LISTEN_ALL_HOST
     def host
-      @host ||= @options.fetch(:host) {
-        ENV[HANAMI_HOST] || default_host
-      }
+      @host ||= @options.fetch(:host) do
+        env[HANAMI_HOST] || default_host
+      end
     end
 
     # The HTTP port
@@ -324,7 +324,9 @@ module Hanami
     #
     # @see Hanami::Environment::DEFAULT_PORT
     def port
-      @port ||= @options.fetch(:port) { ENV[HANAMI_PORT] || DEFAULT_PORT }.to_i
+      @port ||= @options.fetch(:port) do
+        env[HANAMI_PORT] || DEFAULT_PORT
+      end.to_i
     end
 
     # Path to the Rack configuration file
@@ -366,6 +368,8 @@ module Hanami
       root.join(@options.fetch(:environment) { config.join(DEFAULT_ENVIRONMENT_CONFIG) })
     end
 
+    alias project_environment_configuration env_config
+
     # Require application environment
     #
     # Eg <tt>require "config/environment"</tt>.
@@ -373,9 +377,11 @@ module Hanami
     # @since 0.4.0
     # @api private
     def require_application_environment
-      require env_config.to_s #if env_config.exist?
+      require project_environment_configuration.to_s # if project_environment_configuration.exist?
     end
 
+    alias require_project_environment require_application_environment
+
     # Determine if activate code reloading for the current environment while
     # running the server.
     #
@@ -401,10 +407,10 @@ module Hanami
     # @since 0.4.0
     # @api private
     def architecture
-      @options.fetch(:architecture) {
+      @options.fetch(:architecture) do
         puts "Cannot recognize Hanami architecture, please check `.hanamirc'"
         exit 1
-      }
+      end
     end
 
     # @since 0.4.0
@@ -416,7 +422,7 @@ module Hanami
     # @since 0.6.0
     # @api private
     def serve_static_assets?
-      SERVE_STATIC_ASSETS_ENABLED == ENV[SERVE_STATIC_ASSETS]
+      SERVE_STATIC_ASSETS_ENABLED == env[SERVE_STATIC_ASSETS]
     end
 
     # @since 0.6.0
@@ -463,6 +469,8 @@ module Hanami
 
     private
 
+    attr_reader :env
+
     # @since 0.1.0
     # @api private
     def set_env_vars!
@@ -473,16 +481,18 @@ module Hanami
     # @since 0.2.0
     # @api private
     def set_hanami_env_vars!
-      ENV[HANAMI_ENV]  = ENV[RACK_ENV] = environment
-      ENV[HANAMI_HOST] = host
-      ENV[HANAMI_PORT] = port.to_s
+      env[HANAMI_ENV]  = env[RACK_ENV] = environment
+      env[HANAMI_HOST] = host
+      env[HANAMI_PORT] = port.to_s
     end
 
     # @since 0.2.0
     # @api private
     def set_application_env_vars!
-      return unless defined?(Dotenv) && (dotenv = root.join(DEFAULT_DOTENV_ENV % environment)).exist?
-      Dotenv.overload dotenv
+      dotenv = root.join(DEFAULT_DOTENV_ENV % environment)
+      return unless dotenv.exist?
+
+      env.load!(dotenv)
     end
 
     # @since 0.1.0
@@ -494,11 +504,11 @@ module Hanami
     # @since 0.6.0
     # @api private
     def rack_env
-      case ENV[RACK_ENV]
+      case env[RACK_ENV]
       when RACK_ENV_DEPLOYMENT
         PRODUCTION_ENV
       else
-        ENV[RACK_ENV]
+        env[RACK_ENV]
       end
     end
   end

data/lib/hanami/environment_application_configurations.rb

@@ -0,0 +1,30 @@
+module Hanami
+  class EnvironmentApplicationConfigurations
+    ALL = :all
+
+    def initialize
+      @configurations = Concurrent::Hash.new { |k, v| k[v] = [] }
+    end
+
+    def add(environment, &blk)
+      env = (environment || ALL).to_sym
+      configurations[env].push(blk)
+    end
+
+    def each(environment, &blk)
+      configurations.each do |env, blks|
+        next unless matching_env?(environment, env)
+        blks.each(&blk)
+      end
+    end
+
+    private
+
+    attr_reader :configurations
+
+    def matching_env?(environment, env)
+      environment.to_sym == env ||
+        env == ALL
+    end
+  end
+end

data/lib/hanami/frameworks.rb

@@ -1,3 +1,4 @@
+require 'hanami/utils'
 require 'hanami/validations'
 require 'hanami/router'
 require 'hanami/view'

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

@@ -325,10 +325,10 @@ module <%= config[:classified_app_name] %>
         # See: http://www.rubydoc.info/gems/hanami-assets#Configuration
         compile false
 
-        # Use digest file name for asset paths
+        # Use fingerprint file name for asset paths
         #
         # See: http://hanamirb.org/guides/assets/overview
-        digest  true
+        fingerprint true
 
         # Content Delivery Network (CDN)
         #

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

@@ -31,12 +31,14 @@ gem 'slim'
 gem 'haml'
 <%- end -%>
 
+<%- unless Hanami::Utils.jruby? -%>
 group :development do
   # Code reloading
-  # See: http://hanamirb.org/guides/applications/code-reloading
+  # See: http://hanamirb.org/guides/projects/code-reloading
   gem 'shotgun'
 end
 
+<%- end -%>
 group :test, :development do
   gem 'dotenv', '~> 2.0'
 end

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

@@ -324,10 +324,10 @@ module <%= config[:classified_app_name] %>
         # See: http://www.rubydoc.info/gems/hanami-assets#Configuration
         compile false
 
-        # Use digest file name for asset paths
+        # Use fingerprint file name for asset paths
         #
         # See: http://hanamirb.org/guides/assets/overview
-        digest  true
+        fingerprint true
 
         # Content Delivery Network (CDN)
         #

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

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

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

@@ -7,18 +7,12 @@ Hanami::Model.configure do
   #
   # Available options:
   #
-  #  * File System adapter
-  #    adapter type: :file_system, uri: 'file:///db/bookshelf_development'
-  #
-  #  * Memory adapter
-  #    adapter type: :memory, uri: 'memory://localhost/<%= config[:app_name] %>_development'
-  #
   #  * SQL adapter
-  #    adapter type: :sql, uri: 'sqlite://db/<%= config[:app_name] %>_development.sqlite3'
-  #    adapter type: :sql, uri: 'postgres://localhost/<%= config[:app_name] %>_development'
-  #    adapter type: :sql, uri: 'mysql://localhost/<%= config[:app_name] %>_development'
+  #    adapter :sql, 'sqlite://db/<%= config[:app_name] %>_development.sqlite3'
+  #    adapter :sql, 'postgres://localhost/<%= config[:app_name] %>_development'
+  #    adapter :sql, 'mysql://localhost/<%= config[:app_name] %>_development'
   #
-  adapter type: :<%= config[:database_config][:type] %>, uri: ENV['DATABASE_URL']
+  adapter :<%= config[:database_config][:type] %>, ENV['DATABASE_URL']
 
   <%- if config[:database_config][:type] == :sql -%>
   ##
@@ -26,22 +20,7 @@ Hanami::Model.configure do
   #
   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

data/lib/hanami/generators/application/app/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/app/spec_helper.rb.rspec.tt

@@ -2,7 +2,7 @@
 ENV['HANAMI_ENV'] ||= 'test'
 
 require_relative '../config/environment'
-Hanami::Application.preload!
+Hanami.boot
 
 Dir[__dir__ + '/support/**/*.rb'].each { |f| require f }
 

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

@@ -31,12 +31,14 @@ gem 'slim'
 gem 'haml'
 <%- end -%>
 
+<%- if config[:code_reloading] -%>
 group :development do
   # Code reloading
-  # See: http://hanamirb.org/guides/applications/code-reloading
+  # See: http://hanamirb.org/guides/projects/code-reloading
   gem 'shotgun'
 end
 
+<%- end -%>
 group :test, :development do
   gem 'dotenv', '~> 2.0'
 end

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

@@ -2,7 +2,7 @@ module RSpec
   module FeatureExampleGroup
     def self.included(group)
       group.metadata[:type] = :feature
-      Capybara.app = Hanami::Container.new
+      Capybara.app = Hanami.app
     end
   end
 end

data/lib/hanami/generators/application/container/config.ru.tt

@@ -1,3 +1,3 @@
 require './config/environment'
 
-run Hanami::Container.new
+run Hanami.app

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

@@ -1,6 +1,40 @@
 require 'bundler/setup'
 require 'hanami/setup'
+require 'hanami/model'
 require_relative '../lib/<%= config[:project_name] %>'
 
-Hanami::Container.configure do
+Hanami.configure do
+
+  model do
+    ##
+    # Database adapter
+    #
+    # Available options:
+    #
+    #  * SQL adapter
+    #    adapter :sql, 'sqlite://db/<%= config[:project_name] %>_development.sqlite3'
+    #    adapter :sql, 'postgres://localhost/<%= config[:project_name] %>_development'
+    #    adapter :sql, 'mysql://localhost/<%= config[:project_name] %>_development'
+    #
+    adapter :<%= config[:database_config][:type] %>, ENV['DATABASE_URL']
+
+    <%- if config[:database_config][:type] == :sql -%>
+    ##
+    # Migrations
+    #
+    migrations 'db/migrations'
+    schema     'db/schema.sql'
+    <%- end -%>
+  end
+
+  mailer 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
+    end
+  end
 end

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

@@ -4,7 +4,7 @@ require_relative './spec_helper'
 require 'capybara'
 require 'capybara/dsl'
 
-Capybara.app = Hanami::Container.new
+Capybara.app = Hanami.app
 
 class MiniTest::Spec
   include Capybara::DSL