Merge branch 'master' into develop

lib/hanami/components/components.rb

@@ -220,6 +220,10 @@ module Hanami
 
           configuration.mailer_settings.each do |settings|
             Hanami::Mailer.configure(&settings)
+            Hanami::Mailer.configuration.mailers.each do |mailer|
+              mailer.configuration = Hanami::Mailer.configuration.duplicate
+              Hanami::Mailer.configuration.copy!(mailer)
+            end
           end
 
           Hanami::Mailer.configuration

lib/hanami/env.rb

@@ -1,5 +1,5 @@
 begin
-  require 'dotenv'
+  require 'dotenv/parser'
 rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
@@ -53,7 +53,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     def load!(path)
-      return unless defined?(Dotenv)
+      return unless defined?(Dotenv::Parser)
 
       contents = ::File.open(path, "rb:bom|utf-8", &:read)
       parsed   = Dotenv::Parser.call(contents)

lib/hanami/hanamirc.rb

@@ -117,7 +117,12 @@ module Hanami
       Utils::Hash.symbolize(hash)
     end
 
+    # Returns options from hanamirc file
+    #
+    # @since 0.6.0
     # @api private
+    #
+    # @return [Hash] hanamirc parsed values
     def file_options
       symbolize(exists? ? parse_file(path_file) : {})
     end

spec/integration/mailer_spec.rb

@@ -0,0 +1,30 @@
+RSpec.describe "Mailer", type: :cli do
+  it "use a mailer" do
+    with_project do
+      generate "mailer welcome"
+      write "lib/bookshelf/mailers/default_user.rb", <<-EOF
+module Mailers
+  module DefaultUser
+    def user_name
+      "Alfonso"
+    end
+  end
+end
+EOF
+
+      replace "config/environment.rb", "delivery :test", <<-EOF
+    delivery :test
+
+    prepare do
+      include Mailers::DefaultUser
+    end
+EOF
+
+      console do |input, _, _|
+        input.puts("Mailers::Welcome.new.user_name")
+      end
+
+      expect(out).to include("Alfonso")
+    end
+  end
+end