eac_rails_base0 0.47.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dbf7853e319ed40781d1ba226a0a69ab73429884cbd6355c9ffc53cd8e3ac62
-  data.tar.gz: acf438c17b387f7b2fc025d92371809a4ec2dc68c2373678bd91c275d5e3e011
+  metadata.gz: 8e43e3647ec0c12ea7d4f08153621cb934ec30a18198cb4e28fde9f19ee770d7
+  data.tar.gz: 70d2754d4ef92d0835213cc9eb4c832ba84252481468f9541285749fcb1d68be
 SHA512:
-  metadata.gz: db2d718db7eca5f9720efcd5e3d4cf7618364611b9d08ca8329da68abcdab1acee7a414dc3dae7c676aaaf8f68c8948c5a568fbb5b958a3b3a95790087039340
-  data.tar.gz: '08a70dac3579768cd8d3f7596e064a4ba16e2b8e8fa17b7263743669e5aab78b12bf70463324d853fca00126c7bbd516d0499f2d47aa0e790e9498ca314019f9'
+  metadata.gz: d2fd327487eb0048b88447ba2055b19f547c67e861900663fcdf61972b186a96e298c8cf5a8e70b4ab26a31682189e68d5040f74038d918da426cdea27a81306
+  data.tar.gz: d29081e42fd87229f9394db9804183d9ca1fe9bf6759f2ad59a3f55160d3cb2cfc9edf410e9cdab78ce9ef011998c39b62722b64c7b1a28c93b9a3fcd74aaf44

data/app/controllers/eac_rails_base0/application_controller.rb

@@ -7,9 +7,11 @@ module EacRailsBase0
     layout 'eac_rails_base0/application'
     helper ::EacRailsBase0::AppVersionHelper
     helper ::EacRailsBase0::LayoutHelper
+    helper ::EacRailsBase0::MainMenuHelper
     helper ::EacRailsUtils::FormatterHelper
     helper ::EacRailsUtils::LinksHelper
     helper ::EacRailsUtils::OpenGraphProtocolHelper
+    helper ::EacRailsBase0::UserMenuHelper
 
     # Prevent CSRF attacks by raising an exception.
     # For APIs, you may want to use :null_session instead.

data/app/helpers/eac_rails_base0/layout_helper.rb

@@ -3,8 +3,6 @@
 module EacRailsBase0
   module LayoutHelper
     APP_TITLE_METHOD = 'app_title'
-    APP_MAIN_MENU_ENTRIES_METHOD = 'app_main_menu_entries'
-    ADMIN_ENTRIES = %w[eac_users_support tasks_scheduler aranha br_railties mailer].freeze
 
     def base0_app_title
       if respond_to?(APP_TITLE_METHOD)
@@ -13,60 +11,5 @@ module EacRailsBase0
         "Implement the helper method \"#{APP_TITLE_METHOD}\""
       end
     end
-
-    def base0_app_main_menu_entries
-      if respond_to?(APP_MAIN_MENU_ENTRIES_METHOD)
-        send(APP_MAIN_MENU_ENTRIES_METHOD, base0_app_main_menu_default_entries)
-      else
-        base0_app_main_menu_default_entries
-      end
-    end
-
-    def base0_app_main_menu_default_entries
-      {
-        'Administração' => base0_app_main_menu_admin_entries
-      }
-    end
-
-    def base0_app_main_menu_admin_entries
-      ADMIN_ENTRIES.map do |identifier|
-        [::I18n.t("eac_rails_base0.main_menu.admin.#{identifier}"),
-         send("#{identifier}_main_menu_admin_entries")]
-      end.to_h
-    end
-
-    def mailer_main_menu_admin_entries
-      %w[info send_test].map do |action|
-        [
-          t("eac_rails_base0.mailer.#{action}"),
-          main_app.send("#{action}_eac_rails_base0_mailer_index_path")
-        ]
-      end.to_h
-    end
-
-    def eac_users_support_main_menu_admin_entries
-      {
-        ::EacUsersSupport::User.model_name.human(count: 2) => [eac_users_support.admin_users_path]
-      }
-    end
-
-    def tasks_scheduler_main_menu_admin_entries
-      {
-        t('activerecord.models.scheduled_task.other') => [main_app.status_scheduled_tasks_path]
-      }
-    end
-
-    def aranha_main_menu_admin_entries
-      {
-        ::Aranha::Address.model_name.human(count: 2) => [aranha.addresses_path]
-      }
-    end
-
-    def br_railties_main_menu_admin_entries
-      {
-        ::BrRailties::FederalUnit.model_name.human(count: 2) => [br_railties.federal_units_path],
-        ::BrRailties::Municipality.model_name.human(count: 2) => [br_railties.municipalities_path]
-      }
-    end
   end
 end

data/app/helpers/eac_rails_base0/main_menu_helper.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module EacRailsBase0
+  module MainMenuHelper
+    APP_MAIN_MENU_ENTRIES_METHOD = 'app_main_menu_entries'
+    ADMIN_ENTRIES = %w[eac_users_support tasks_scheduler aranha br_railties mailer].freeze
+
+    def base0_app_main_menu_entries
+      if respond_to?(APP_MAIN_MENU_ENTRIES_METHOD)
+        send(APP_MAIN_MENU_ENTRIES_METHOD, base0_app_main_menu_default_entries)
+      else
+        base0_app_main_menu_default_entries
+      end
+    end
+
+    def base0_app_main_menu_default_entries
+      {
+        'Administração' => base0_app_main_menu_admin_entries
+      }
+    end
+
+    def base0_app_main_menu_admin_entries
+      ADMIN_ENTRIES.map do |identifier|
+        [::I18n.t("eac_rails_base0.main_menu.admin.#{identifier}"),
+         send("#{identifier}_main_menu_admin_entries")]
+      end.to_h
+    end
+
+    def mailer_main_menu_admin_entries
+      %w[info send_test].map do |action|
+        [
+          t("eac_rails_base0.mailer.#{action}"),
+          main_app.send("#{action}_eac_rails_base0_mailer_index_path")
+        ]
+      end.to_h
+    end
+
+    def eac_users_support_main_menu_admin_entries
+      {
+        ::EacUsersSupport::User.model_name.human(count: 2) => [eac_users_support.admin_users_path]
+      }
+    end
+
+    def tasks_scheduler_main_menu_admin_entries
+      {
+        t('activerecord.models.scheduled_task.other') => [main_app.status_scheduled_tasks_path]
+      }
+    end
+
+    def aranha_main_menu_admin_entries
+      {
+        ::Aranha::Address.model_name.human(count: 2) => [aranha.addresses_path]
+      }
+    end
+
+    def br_railties_main_menu_admin_entries
+      {
+        ::BrRailties::FederalUnit.model_name.human(count: 2) => [br_railties.federal_units_path],
+        ::BrRailties::Municipality.model_name.human(count: 2) => [br_railties.municipalities_path]
+      }
+    end
+  end
+end

data/app/helpers/eac_rails_base0/user_menu_helper.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module EacRailsBase0
+  module UserMenuHelper
+    def base0_user_menu_entries
+      r = {}
+      if current_user
+        r[current_user.to_s] = {
+          'Alterar senha' => [eac_users_support.edit_user_registration_path]
+        }
+        r['Sair'] = [eac_users_support.destroy_user_session_path, link_method: :delete]
+      else
+        r['Entrar'] = [eac_users_support.new_user_session_path]
+      end
+      r
+    end
+  end
+end

data/app/mailers/eac_rails_base0/application_mailer.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module EacRailsBase0
+  class ApplicationMailer < (
+      begin
+        ::ApplicationMailer
+      rescue StandardError
+        ::ActionMailer::Base
+      end
+    )
+  end
+end

data/app/mailers/eac_rails_base0/send_test_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module EacRailsBase0
-  class SendTestMailer < ::ApplicationMailer
+  class SendTestMailer < ::EacRailsBase0::ApplicationMailer
     def main
       @subject = "#{t('eac_rails_base0.mailer.send_test')} [#{::Time.zone.now}]"
       mail(to: params.fetch(:address), subject: @subject)

data/app/views/layouts/eac_rails_base0/_navbar_user.html.erb

@@ -1,10 +1 @@
-<%
-user_menu = {}
-if current_user
-  user_menu[current_user.to_s] = [main_app.root_path]
-  user_menu['Sair'] = [eac_users_support.destroy_user_session_path, link_method: :delete]
-else
-  user_menu['Entrar'] = [eac_users_support.new_user_session_path]
-end
-%>
-<%= bootstrap_dropdown_menu(user_menu, class: 'navbar-right') %>
+<%= bootstrap_dropdown_menu(base0_user_menu_entries, class: 'navbar-right') %>

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/config/routes.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'aranha/engine'
-
 Rails.application.routes.draw do
   mount ::EacRailsUtils::Engine => '/'
   mount ::EacUsersSupport::Engine => '/'
-  mount ::Aranha::Engine => '/aranha'
+  mount ::Aranha::Rails::Engine => '/aranha'
   mount ::BrRailties::Engine => '/br_railties'
 
   namespace(:eac_rails_base0) do

data/lib/eac_rails_base0/app_base/application.rb

@@ -10,6 +10,12 @@ Bundler.require(*Rails.groups)
 module EacRailsBase0App
   class Application < Rails::Application
     class << self
+      def new_stdout_logger
+        logger = ActiveSupport::Logger.new(STDOUT)
+        logger.formatter = config.log_formatter
+        ::ActiveSupport::TaggedLogging.new(logger)
+      end
+
       def setup(*args)
         args.each { |a| send("setup_#{a}") }
       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/development.rb

@@ -48,9 +48,7 @@ module EacRailsBase0App
 
         def setup_log
           config.active_support.deprecation = :log
-          logger = ActiveSupport::Logger.new(STDOUT)
-          logger.formatter = config.log_formatter
-          config.logger = ActiveSupport::TaggedLogging.new(logger)
+          config.logger = new_stdout_logger
         end
       end
     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/production.rb

@@ -33,11 +33,7 @@ module EacRailsBase0App
           config.log_tags = [:request_id]
           config.active_support.deprecation = :notify
           config.log_formatter = ::Logger::Formatter.new
-          return if ENV['RAILS_LOG_TO_STDOUT'].blank?
-
-          logger = ActiveSupport::Logger.new(STDOUT)
-          logger.formatter = config.log_formatter
-          config.logger = ActiveSupport::TaggedLogging.new(logger)
+          config.logger = new_stdout_logger if ENV['RAILS_LOG_TO_STDOUT'].blank?
         end
 
         def setup_public_file_server

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/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aranha/engine'
+require 'aranha/rails/engine'
 require 'br_railties/engine'
 require 'eac_rails_utils/engine'
 require 'eac_users_support/engine'

data/lib/eac_rails_base0/spec_helper/eac_users_support.rb

@@ -12,15 +12,39 @@ RSpec.configure do |config|
 end
 
 FactoryBot.define do
-  factory :user, class: ::EacUsersSupport::User do
+  factory :admin_user, class: ::EacUsersSupport::User do
     email { 'admin@example.com' }
     password { 'mysecret' }
     confirmed_at { ::Time.zone.now }
   end
+
+  factory :non_admin_user, class: ::EacUsersSupport::User do
+    email { 'nonadmin@example.com' }
+    password { 'mysecret' }
+    confirmed_at { ::Time.zone.now }
+  end
 end
 
 RSpec.shared_context 'when user is admin', shared_context: :metadata do
-  let(:user) { ::FactoryBot.create(:user) }
+  let(:user) { ::FactoryBot.create(:admin_user) }
+
+  before do
+    visit '/users/sign_in'
+    fill_in ::I18n.translate!('activerecord.attributes.eac_users_support/user.email'),
+            with: user.email
+    fill_in ::I18n.translate!('activerecord.attributes.eac_users_support/user.password'),
+            with: user.password
+    click_button ::I18n.translate!('devise.log_in')
+  end
+
+  it 'user should be logged' do
+    expect(page).to have_content user.email
+    expect(::EacUsersSupport::User.current_user).not_to be_nil
+  end
+end
+
+RSpec.shared_context 'when user is non admin', shared_context: :metadata do
+  let(:user) { ::FactoryBot.create(:non_admin_user) }
 
   before do
     visit '/users/sign_in'

data/lib/eac_rails_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRailsBase0
-  VERSION = '0.47.0'
+  VERSION = '0.51.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.51.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -31,25 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.5
 - !ruby/object:Gem::Dependency
-  name: aranha
+  name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: aranha-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -580,7 +588,10 @@ files:
 - app/controllers/eac_rails_base0/mailer_controller.rb
 - app/helpers/eac_rails_base0/app_version_helper.rb
 - app/helpers/eac_rails_base0/layout_helper.rb
+- app/helpers/eac_rails_base0/main_menu_helper.rb
 - app/helpers/eac_rails_base0/panel_default_helper.rb
+- app/helpers/eac_rails_base0/user_menu_helper.rb
+- app/mailers/eac_rails_base0/application_mailer.rb
 - app/mailers/eac_rails_base0/send_test_mailer.rb
 - app/models/eac_rails_base0/application_record.rb
 - app/tableless_models/eac_rails_base0/email_send_test.rb
@@ -625,6 +636,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