hanami 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d78ad0596470f8b250d8338f0699027536b75f5e2d831e8d5de80c015752cb1
-  data.tar.gz: 2e2ccb278a4650be97af8cf4a82f744392de01e2ba0bf4e2722894aae428f08e
+  metadata.gz: 9ec1be46fff34a0e6278e8c08a20742d87622bb24ef82b5320c7f71c9900bc6d
+  data.tar.gz: b88a1a45b04427a79a7c7d828353bca49df12de456815d35ff84c18ff09dcda0
 SHA512:
-  metadata.gz: 8cfcdad6be7609b696cb5a9361431e1905efdef079edbdb9a6d1cf16ffa25524d1621b6611906b15d1749651c40921795eb43a4bbf90b638d8a129f3761dc7f3
-  data.tar.gz: 400732666b45a462880bbd56fdddffc96f10420ecca3d031aeacadf87d3c473a3962092de36b88dd1eba713e31cf4908c32974d6c90c0b9f550f876ea87b2a38
+  metadata.gz: 97ff7cbc39b2dca8623431ff84024f854d504618742035242f3ee6ca84af419ba6126812e2e7316f4cb1025f1b5be1b0f383ea7c9acc4947a726c4012e301ec0
+  data.tar.gz: 53c4e2fe586a644adc84a32fa8f19ea41553796e0aeb33d40e0d60185a99bb225a6809b618693e0663569acd7bd040c402928629d8a54cdc63ee9e0a55bc5df2

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Hanami
 The web, with simplicity.
 
+## v1.3.3 - 2019-09-20
+### Added
+- [Gray Manley] Standardize file loading for `.env` files (see: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use)
+
+### Fixed
+- [Alfonso Uceda & Luca Guidi] Ensure to use `:host` option when mounting an application in main router (e.g. `mount Beta::Application.new, at: "/", host: "beta.hanami.test"`)
+
 ## v1.3.2 - 2019-07-26
 ### Added
 - [Luca Guidi] Support both `hanami-validations` 1 and 2

data/FEATURES.md

@@ -3,6 +3,10 @@
 
 ## Features
 
+## v1.3.3 - 2019-09-20
+
+- Standardize file loading for `.env` files (see: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use)
+
 ## v1.3.2 - 2019-07-26
 
 ## v1.3.1 - 2019-01-18

data/lib/hanami/app.rb

@@ -62,7 +62,7 @@ module Hanami
     # @api private
     def mount(configuration)
       configuration.mounted.each do |klass, app|
-        routes.mount(klass, at: app.path_prefix)
+        routes.mount(klass, at: app.path_prefix, host: app.host)
       end
     end
 

data/lib/hanami/cli/commands/new/gitignore.erb

@@ -1,2 +1,4 @@
 /public/assets*
 /tmp
+.env.local
+.env.*.local

data/lib/hanami/cli/commands/new/gitignore_with_sqlite.erb

@@ -1,3 +1,5 @@
 /db/*.sqlite
 /public/assets*
 /tmp
+.env.local
+.env.*.local

data/lib/hanami/configuration.rb

@@ -20,6 +20,7 @@ module Hanami
     # @param app [#call] an application compatible with Rack SPEC
     # @param options [Hash] a set of options
     # @option :at [String] options the mount point
+    # @option :host [String] options the mount point
     #
     # @since 0.9.0
     #
@@ -27,12 +28,14 @@ module Hanami
     #   # config/environment.rb
     #   # ...
     #   Hanami.configure do
+    #     mount Beta::Application, at: '/', host: 'beta.bookshelf.com'
+    #     mount Admin::Application, at: '/api'
     #     mount Web::Application, at: '/'
     #
     #     # ...
     #   end
     def mount(app, options)
-      mounted[app] = App.new(app, options.fetch(:at))
+      mounted[app] = App.new(app, options)
     end
 
     # Configure database

data/lib/hanami/configuration/app.rb

@@ -7,11 +7,14 @@ module Hanami
     class App < SimpleDelegator
       # @api private
       attr_reader :path_prefix
+      # @api private
+      attr_reader :host
 
       # @api private
-      def initialize(app, path_prefix)
+      def initialize(app, options = {})
         super(app)
-        @path_prefix = path_prefix
+        @path_prefix = options[:at]
+        @host = options[:host]
       end
     end
   end

data/lib/hanami/environment.rb

@@ -36,6 +36,12 @@ module Hanami
     # @api private
     DEFAULT_ENV    = 'development'.freeze
 
+    # Test environment
+    #
+    # @since 1.3.3
+    # @api private
+    TEST_ENV = 'test'.freeze
+
     # Production environment
     #
     # @since 0.6.0
@@ -48,11 +54,21 @@ module Hanami
     # @api private
     RACK_ENV_DEPLOYMENT = 'deployment'.freeze
 
-    # Default `.env` per environment file name
+    # @since 1.3.3
+    # @api private
+    DOTENV_LOCAL_FILE = '.env.local'.freeze
+
+    # Default `.env` files that are loaded. The entries are ordered from highest
+    # to lowest priority.
     #
-    # @since 0.2.0
+    # @since 1.3.3
     # @api private
-    DEFAULT_DOTENV_ENV = '.env.%s'.freeze
+    DOTENV_FILES = [
+      '.env.%{environment}.local'.freeze,
+      DOTENV_LOCAL_FILE,
+      '.env.%{environment}'.freeze,
+      '.env'.freeze
+    ].freeze
 
     # Default configuration directory under application root
     #
@@ -132,9 +148,8 @@ module Hanami
     # located under the config directory. All the settings in those files will
     # be exported as `ENV` variables.
     #
-    # Master .env file is ignored to suggest clear separation of environment
-    # configurations and discourage putting sensitive information into source
-    # control.
+    # This table: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+    # has more info on the priority of the .env files.
     #
     # The format of those `.env.<environment>` files follows UNIX and UNIX-like
     # operating system environment variable declaration format and compatible
@@ -487,10 +502,13 @@ module Hanami
     # @since 0.2.0
     # @api private
     def set_application_env_vars!
-      dotenv = root.join(DEFAULT_DOTENV_ENV % environment)
-      return unless dotenv.exist?
+      DOTENV_FILES.each do |filename_format|
+        file = filename_format % { environment: environment }
+        next unless dotenv_applicable?(file)
 
-      env.load!(dotenv)
+        path = root.join(file)
+        env.load!(path) if path.exist?
+      end
     end
 
     # @since 0.1.0
@@ -509,5 +527,15 @@ module Hanami
         env[RACK_ENV]
       end
     end
+
+    # @api private
+    # @since 1.3.3
+    #
+    # @see https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+    def dotenv_applicable?(file)
+      return false if file == DOTENV_LOCAL_FILE && environment == TEST_ENV
+
+      true
+    end
   end
 end

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.3.2'.freeze
+    VERSION = '1.3.3'.freeze
 
     # @since 0.9.0
     # @api private

data/lib/hanami/welcome.rb

@@ -14,6 +14,7 @@ module Hanami
     # @api private
     def call(env)
       @request_path = env['REQUEST_PATH'] || ''
+      @request_host = env['HTTP_HOST'] || ''
       @body = [ERB.new(@root.join('welcome.html.erb').read).result(binding)]
 
       [200, {}, @body]
@@ -29,7 +30,11 @@ module Hanami
     # @api private
     def application_class
       Hanami.configuration.apps do |app|
-        return app if @request_path.include?(app.path_prefix)
+        if app.host.nil?
+          return app if @request_path.include?(app.path_prefix)
+        else
+          return app if @request_host == app.host
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils