eac_rails_base0 0.48.1 → 0.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79378c7112a06fe0f45f800d7199755616c81ab22e8cae3a659c9e58c670a1e
-  data.tar.gz: de9a2203bcb8d3c047f3b07d9e76e69f5607c289e34e6e3338e9442f888b114b
+  metadata.gz: 8e448e7de6f197a4764c52f7adff9462a934463cd03f0807c70e0724239e5559
+  data.tar.gz: dca62cf72477ae8e4f316938f3c13c2cd20259df15689e197f000434ad0294ec
 SHA512:
-  metadata.gz: 623057d481929806d90b0cdd048ae54421ab8b50c68f6168786156dc96bf00e63b25fca2cbb3985e640945959b4e9f0827a5f03817bda9f44ef170a458ca0ba2
-  data.tar.gz: bdf5b49636938c5bc82ffb02d41f4e7143dfc0058dfafef98048205e2f68619ede2a5c083f068e37dff42a8c90caebf6039a3781d21176e4e6d3abe7f20dc8ef
+  metadata.gz: 9fd308b092cc628c162325f8b126d570bb694369c1c5ee75e055e9cdf4dad7ff93dc49cd773c18926a6f098b59018e32211795eca31ec12cd7b3a66d5f588d33
+  data.tar.gz: a954391ed407a58fda0072d9fc36e7d837ec22518025582f2bbd5389a4fbfd41254ce18d484e69d1ac1c4f63094d545ba572ffc3ce80850a3651b737453e1687

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,64 @@
+# 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],
+        ::Aranha::StartPoint.model_name.human(count: 2) => [aranha.start_points_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/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/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/ability.rb

@@ -58,6 +58,7 @@ module EacRailsBase0
 
         can :manage, ::EacUsersSupport::User
         can :manage, ::Aranha::Address
+        can :manage, ::Aranha::StartPoint
         can :manage, ::BrRailties::FederalUnit
         can :manage, ::BrRailties::Municipality
         can :manage, ::ScheduledTask

data/lib/eac_rails_base0/app_base/ability_mapping.rb

@@ -13,6 +13,7 @@ module EacRailsBase0
         map_devise_invitable
         map_controller 'EacUsersSupport::Admin::Users', :manage, ::EacUsersSupport::User
         map_controller 'Aranha::Addresses', :manage, ::Aranha::Address
+        map_controller 'Aranha::StartPoints', :manage, ::Aranha::StartPoint
         map_controller 'BrRailties::FederalUnits', :manage, ::BrRailties::FederalUnit
         map_controller 'BrRailties::Municipalities', :manage, ::BrRailties::Municipality
         map_controller 'ScheduledTasks', :manage, ::ScheduledTask

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

@@ -32,7 +32,7 @@ module EacRailsBase0App
           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 }
+          vars.each { |name, value| ENV[name.to_s] = value.to_s }
         end
 
         def setup_envvars

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.48.1'
+  VERSION = '0.52.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.48.1
+  version: 0.52.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-12-27 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.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -580,7 +588,9 @@ 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