eac_rails_base0 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dbf7853e319ed40781d1ba226a0a69ab73429884cbd6355c9ffc53cd8e3ac62
-  data.tar.gz: acf438c17b387f7b2fc025d92371809a4ec2dc68c2373678bd91c275d5e3e011
+  metadata.gz: 3e6e5c1e785de509bd1c7599df86fdb868e057c4edadd170c31db62b0d2b15bf
+  data.tar.gz: aa1eea6644eb191c24f0a3fc7e9b9482bfc23ebc080b2c4a73ce206676b9434a
 SHA512:
-  metadata.gz: db2d718db7eca5f9720efcd5e3d4cf7618364611b9d08ca8329da68abcdab1acee7a414dc3dae7c676aaaf8f68c8948c5a568fbb5b958a3b3a95790087039340
-  data.tar.gz: '08a70dac3579768cd8d3f7596e064a4ba16e2b8e8fa17b7263743669e5aab78b12bf70463324d853fca00126c7bbd516d0499f2d47aa0e790e9498ca314019f9'
+  metadata.gz: c0b4391fc0d49c14e2d20cd08a0e0be11f9ead8f39cb81a78a2d26c842389a8c5d68d8ec0ba2052d7c1919aa015893b3d9bb9bcc1c5be88861bd3646bb052652
+  data.tar.gz: edfe1a77f9782c2845a647a1ffa991652ebd9fd8810218abeec65accbf4ded71bd2df46074cb219be21b15fccdc4e6e4174b2fd311d5afdce79e3759e2a69006

data/config/initializers/action_mailer.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 
-Rails.application.configure do
-  config.action_mailer.smtp_settings = {
-    address: ENV['action_mailer_smtp_address'],
-    port: ENV['action_mailer_smtp_port'],
-    domain: ENV['action_mailer_smtp_domain'],
-    user_name: ENV['action_mailer_smtp_username'],
-    password: ENV['action_mailer_smtp_password'],
-    authentication: ENV['action_mailer_smtp_authentication'],
-    enable_starttls_auto:
-      ::EacRailsBase0::BooleanValue.to_b(ENV['action_mailer_smtp_enable_starttls_auto'])
-  }
-  %i[host port].each do |option|
-    value = ENV["action_mailer_default_url_#{option}"]
-    if value.present?
-      config.action_mailer.default_url_options ||= {}
-      config.action_mailer.default_url_options[option] = value
+unless ::Rails.env.test?
+  Rails.application.configure do
+    config.action_mailer.smtp_settings = {
+      address: ENV['action_mailer_smtp_address'],
+      port: ENV['action_mailer_smtp_port'],
+      domain: ENV['action_mailer_smtp_domain'],
+      user_name: ENV['action_mailer_smtp_username'],
+      password: ENV['action_mailer_smtp_password'],
+      authentication: ENV['action_mailer_smtp_authentication'],
+      enable_starttls_auto:
+        ::EacRailsBase0::BooleanValue.to_b(ENV['action_mailer_smtp_enable_starttls_auto'])
+    }
+    %i[host port].each do |option|
+      value = ENV["action_mailer_default_url_#{option}"]
+      if value.present?
+        config.action_mailer.default_url_options ||= {}
+        config.action_mailer.default_url_options[option] = value
+      end
     end
+    config.action_mailer.default_options ||= {}
+    config.action_mailer.default_options[:from] = ENV['action_mailer_default_options_from']
+    config.action_mailer.default_options[:reply_to] = ENV['action_mailer_default_options_reply_to']
   end
-  config.action_mailer.default_options ||= {}
-  config.action_mailer.default_options[:from] = ENV['action_mailer_default_options_from']
-  config.action_mailer.default_options[:reply_to] = ENV['action_mailer_default_options_reply_to']
 end

data/lib/eac_rails_base0/app_base/application/all.rb

@@ -6,8 +6,7 @@ module EacRailsBase0App
   class Application < Rails::Application
     module All
       common_concern do
-        setup('local_configuration', 'assets_cache', 'dependencies', 'localization', 'load_paths',
-              'loggers')
+        setup('assets_cache', 'dependencies', 'localization', 'load_paths', 'loggers')
       end
 
       module ClassMethods
@@ -45,12 +44,6 @@ module EacRailsBase0App
           config.autoload_paths << Rails.root.join('lib')
         end
 
-        def setup_local_configuration
-          local_configuration = ::File.join(rails_root(APP_PATH), 'config',
-                                            'local_configuration.rb')
-          require local_configuration if File.exist?(local_configuration)
-        end
-
         def setup_localization
           config.i18n.default_locale = :'pt-BR'
         end

data/lib/eac_rails_base0/app_base/application/envvars.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/yaml'
+
+module EacRailsBase0App
+  class Application < Rails::Application
+    module Envvars
+      ENVVARS_FILE_BASENAME = 'envvars'
+      ENVVARS_DIRECTORY_NAME = "#{ENVVARS_FILE_BASENAME}.d"
+      ENVVARS_FILE_EXTENSIONS = %w[.yml .yaml].freeze
+
+      common_concern do
+        setup('envvars')
+      end
+
+      module ClassMethods
+        def config_root
+          ::Rails.root.join('config')
+        end
+
+        def envvars_files
+          ENVVARS_FILE_EXTENSIONS.flat_map do |extension|
+            [config_root.join("#{ENVVARS_FILE_BASENAME}#{extension}")] +
+              config_root.join(ENVVARS_DIRECTORY_NAME).glob("*#{extension}")
+          end
+        end
+
+        def load_envvars_file(path)
+          return unless path.exist?
+
+          vars = ::EacRubyUtils::Yaml.load(path.read)
+          raise "\"#{path}\" does not contain a Hash" unless vars.is_a?(::Hash)
+
+          vars.each { |name, value| ENV[name.to_s] = value }
+        end
+
+        def setup_envvars
+          envvars_files.each { |path| load_envvars_file(path) }
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_base0/app_base/application/test.rb

@@ -5,10 +5,16 @@ require 'eac_ruby_utils/core_ext'
 module EacRailsBase0App
   class Application < Rails::Application
     module Test
+      ACTION_MAILER_CONFIGS = {
+        delivery_method: :test,
+        default_url_options: { host: 'localhost', port: 3000 },
+        default_options: { from: 'myadddress@example.net', reply_to: '' }
+      }.freeze
+
       common_concern do
         next unless ::Rails.env.test?
 
-        setup('action_controller', 'general', 'log', 'public_file_server')
+        setup('action_controller', 'action_mailer', 'general', 'log', 'public_file_server')
       end
 
       module ClassMethods
@@ -17,6 +23,12 @@ module EacRailsBase0App
           config.action_controller.allow_forgery_protection = false
         end
 
+        def setup_action_mailer
+          ACTION_MAILER_CONFIGS.each do |key, value|
+            config.action_mailer.send("#{key}=", value)
+          end
+        end
+
         def setup_general
           config.cache_classes = true
           config.eager_load = false
@@ -24,7 +36,6 @@ module EacRailsBase0App
           config.consider_all_requests_local = true
           config.action_controller.perform_caching = false
           config.action_dispatch.show_exceptions = false
-          config.action_mailer.delivery_method = :test
         end
 
         def setup_log

data/lib/eac_rails_base0/app_generator/templates/gitignore

@@ -20,4 +20,5 @@
 
 # Configuration files
 config/database.y*ml
-config/local_configuration.rb
+config/envvars.y*ml
+config/envvars.d/*.y*ml

data/lib/eac_rails_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsBase0
-  VERSION = '0.47.0'
+  VERSION = '0.48.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -625,6 +625,7 @@ files:
 - lib/eac_rails_base0/app_base/application.rb
 - lib/eac_rails_base0/app_base/application/all.rb
 - lib/eac_rails_base0/app_base/application/development.rb
+- lib/eac_rails_base0/app_base/application/envvars.rb
 - lib/eac_rails_base0/app_base/application/production.rb
 - lib/eac_rails_base0/app_base/application/test.rb
 - lib/eac_rails_base0/app_generator/builder.rb