eac_rails_base0 0.36.1 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d120f94fa8405a3f4cfb5ee52090c58b9b0dae1a2a9bece05a33c61794385cc0
-  data.tar.gz: 0532c6ae78103c821e123d69c90364dd02c4cfffbb037247854cef124a795bde
+  metadata.gz: d40e6c771be2a3a4717fe568fd34aea08c56bfbb10d4aa876eddf30f13e3bef5
+  data.tar.gz: b9f149565fea2e3d880b76a4aee6317a59870ed21d4e4e5148b01c60288b97ba
 SHA512:
-  metadata.gz: 5442fbfc8a27b7a1611745a6e2d17f139f65368d9955b1ddcc9cb7bf6e9284791c63bb1ecb8c26fa3bc4c53ad1716962fe5f0e5feed5f7e055cb2bba146c4634
-  data.tar.gz: bb81896acfc52f7b4f5ec629ed7c9ca7b27d6ca67097c2b2d0604de8d7b497abe714228b5e735310d62cd3ee49408254cad1ea6ea45a71698b86d85d516be04b
+  metadata.gz: 609b35c3187d0cb4e490860209775683d80be4d5674c6d45320f74bd851450237622c06714994da6f466b8f6465d2fca27faee294affb38f11939a8a984773f1
+  data.tar.gz: 9823469ddefde147b6759ddd12ef06cb130401ac8273a17fb7dc21b1a5fc7d692257345f3b5c0ebf137ab8cf01b815fc70c24d985a71dc5f5a6e6bc023baae47

data/app/controllers/eac_rails_base0/application_controller.rb

@@ -5,6 +5,7 @@ module EacRailsBase0
     include ::CanCanDry::ControllerAuthorization
 
     layout 'eac_rails_base0/application'
+    helper ::EacRailsBase0::AppVersionHelper
     helper ::EacRailsBase0::LayoutHelper
     helper ::EacRailsUtils::FormatterHelper
     helper ::EacRailsUtils::LinksHelper
@@ -22,6 +23,7 @@ module EacRailsBase0
         redirect_to main_app.root_url
       else
         flash[:danger] = 'Por favor faça o login.'
+        store_location_for(::EacUsersSupport::User, request.fullpath)
         redirect_to eac_users_support.new_user_session_path
       end
     end
@@ -33,5 +35,9 @@ module EacRailsBase0
         super
       end
     end
+
+    def after_sign_in_path_for(resource)
+      stored_location_for(resource) || root_path
+    end
   end
 end

data/app/helpers/eac_rails_base0/app_version_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module EacRailsBase0
+  module AppVersionHelper
+    def base0_app_version
+      base0_app_version_by_environment_variable ||
+        base0_app_version_by_version_file ||
+        ::I18n.t('eac_rails_base0.app_version.unsetted')
+    end
+
+    def base0_app_version_by_environment_variable
+      ENV['APP_VERSION'].to_s.strip.presence
+    end
+
+    def base0_app_version_by_version_file
+      ::Rails.root.children.find { |file| file.basename.to_path.downcase == 'version' }
+             .if_present { |file| file.read.presence }
+    end
+  end
+end

data/app/helpers/eac_rails_base0/panel_default_helper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacRailsBase0
+  module PanelDefaultHelper
+    def panel_default(title, &block)
+      content_tag(:div, class: 'container') do
+        content_tag(:div, class: 'panel panel-default') do
+          panel_heading(title) << panel_body(block)
+        end
+      end
+    end
+
+    private
+
+    def panel_heading(title)
+      content_tag(:div, class: 'panel-heading') do
+        content_tag(:h2, class: 'panel-title') do
+          title
+        end
+      end
+    end
+
+    def panel_body(block)
+      content_tag(:div, class: 'panel-body') do
+        block ? block.call : ''
+      end
+    end
+  end
+end

data/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,11 @@
+<!--
+f.email_field :email, autofocus: true, autocomplete: "email",
+value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
+-->
+<%= panel_default t('devise.confirmation_resend') do %>
+  <%= common_form(resource, as: resource_name, url: confirmation_path(resource_name),
+    html: { method: :post }, :submit_label => t('devise.confirmation_resend_submit')) do |f| %>
+    <%= f.email_field :email, required: true %>
+  <% end %>
+  <%= render "devise/shared/links" %>
+<% end %>

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Olá <%= @email %>!</p>
+<p>Você pode confirmar sua conta de usuário através do link abaixo:</p>
+<p>
+  <%= link_to 'Confirmar minha conta', confirmation_url(@resource, confirmation_token: @token) %>
+</p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,9 @@
+<p>Olá <%= @resource.email %>!</p>
+<p>Alguém solicitou a recuperação de sua senha. Você pode fazer isso
+  através do link abaixo.</p>
+<p><%= link_to 'Alterar minha senha',
+  edit_password_url(@resource, reset_password_token: @token) %></p>
+<p>Se você não efetuou esta solicitação, por favor, ignore este
+  e-mail.</p>
+<p>Sua senha não será alterada até que você acesse o link acima e
+  recadastre-a.</p>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,10 @@
+<%= panel_default t('devise.update_password') do %>
+  <%= common_form(resource, as: resource_name,
+    url: password_path(resource_name), submit_label: t('devise.update_password_submit'),
+    html: { method: :put }
+  ) do |f| %>
+    <%= f.hidden_field :reset_password_token %>
+    <%= f.password_field :password, label: t('devise.new_password'), required: true %>
+    <%= f.password_field :password_confirmation, required: true %>
+  <% end %>
+<% end %>

data/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,7 @@
+<%= panel_default t('devise.forgot_password') do %>
+  <%= common_form(resource, as: resource_name, url: password_path(resource_name),
+    submit_label: t('devise.forgot_password_submit'),
+    html: { method: :post }) do |f| %>
+    <%= f.email_field :email, class: 'form-control' %>
+  <% end %>
+<% end %>

data/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,9 @@
+<%= panel_default t('devise.update_password') do %>
+  <%= common_form(resource, as: resource_name, url: registration_path(resource_name),
+    submit_label: t('devise.update_password_submit'), html: { method: :put, role: "form" }) do |f| %>
+    <p>Preencha os campos abaixo se deseja alterar sua senha.</p>
+    <%= f.password_field :current_password, label: 'Senha atual', required: true %>
+    <%= f.password_field :password, label: 'Nova senha', required: false %>
+    <%= f.password_field :password_confirmation, label: 'Confirmação de senha' %>
+  <% end %>
+<% end %>

data/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,9 @@
+<%= panel_default t('devise.sign_up') do %>
+  <%= common_form(resource, as: resource_name, url: registration_path(resource_name),
+    submit_label: t('devise.sign_up_submit'), html: { role: "form" }) do |f| %>
+    <%= f.email_field :email %>
+    <%= f.password_field :password, required: true %>
+    <%= f.password_field :password_confirmation, required: true %>
+  <% end %>
+  <%= render "devise/shared/links" %>
+<% end %>

data/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,9 @@
+<%= panel_default t('devise.log_in') do %>
+  <%= common_form(resource, as: resource_name, url: session_path(resource_name),
+    :submit_label => t('devise.log_in')) do |f| %>
+    <%= f.email_field :email, required: true %>
+    <%= f.password_field :password, required: true %>
+    <%= f.check_box_field :remember_me %>
+  <% end %>
+  <%= render "devise/shared/links" %>
+<% end %>

data/app/views/devise/shared/_links.html.erb

@@ -0,0 +1,37 @@
+<%
+links = [{
+    condition: controller_name != 'sessions',
+    label: t('devise.log_in'),
+    url: -> { new_session_path(resource_name) }
+    },{
+    condition: devise_mapping.registerable? && controller_name != 'registrations',
+    label: t('devise.sign_up'),
+    url: -> {new_registration_path(resource_name) }
+    },{
+    condition: devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations',
+    label: t('devise.forgot_password'),
+    url: -> {new_password_path(resource_name) }
+    },{
+    condition: devise_mapping.confirmable? && controller_name != 'confirmations',
+    label: t('devise.unreceived_confirmation'),
+    url: -> {new_confirmation_path(resource_name) }
+    },{
+    condition: devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks',
+    label: t('devise.unreceived_unlock'),
+    url: -> { new_unlock_path(resource_name) }
+  }]
+if devise_mapping.omniauthable?
+  links += resource_class.omniauth_providers.map do |provider|
+    {
+      condition: true,
+      label: t("devise.log_in_with", provider: ::OmniAuth::Utils.camelize(provider)),
+      url: -> { omniauth_authorize_path(resource_name, provider) }
+    }
+  end
+end
+%>
+<% links.each do |link| %>
+  <% if link.fetch(:condition) %>
+    <%= link_to link.fetch(:label), link.fetch(:url).call %><br/>
+  <% end %>
+<% end %>

data/config/locales/pt-BR.yml

@@ -4,18 +4,29 @@ pt-BR:
       default: '%d/%m/%Y'
       picker: '%d/%m/%Y'
       short: '%d/%m/%y'
+  devise:
+    confirmation_resend: Reenvio de instruções de confirmação
+    confirmation_resend_submit: Reenviar
+    forgot_password: Esqueceu sua senha?
+    forgot_password_submit: Envie-me as instruções de recuperação de senha
+    log_in: Entrar
+    log_in_with: Entrar com %{provider}
+    log_out: Sair
+    new_password: Nova senha
+    sign_up: Cadastrar-se
+    sign_up_submit: Cadastrar
+    unreceived_confirmation: Não recebeu as instruções de confirmação?
+    unreceived_unlock: Não recebeu as instruções de desbloqueio de conta?
+    update_password: Alteração de senha
+    update_password_submit: Alterar minha senha
   time:
     formats:
       default: "%d/%m/%Y %H:%M"
       picker: '%d/%m/%Y %H:%M'
       short: '%d/%m/%y %H:%M'
   eac_rails_base0:
-    links:
-      delete_confirm: Confirma a remoção de "%{label}"?
-      delete_object: Remover "%{label}".
-      edit_object: Editar "%{label}".
-      goto_url: Ir para %{url}.
-      show_object: Mostrar "%{label}".
+    app_version:
+      unsetted: Não especificada
     main_menu:
       admin:
         aranha: Aranha

data/lib/eac_rails_base0/app_base/ability.rb

@@ -14,19 +14,41 @@ module EacRailsBase0
         administrator_rules(user)
       end
 
+      def devise_confirmation_rules(user)
+        return unless user.new_record?
+
+        can :create, 'Devise::Confirmation'
+        can :read, 'Devise::Confirmation'
+      end
+
+      def devise_invitable_rules(user)
+        can :create, 'Devise::Invitation' if user.administrator?
+        can :update, 'Devise::Invitation'
+        if user.new_record?
+          can :create, 'DeviseInvitable::Registration'
+        else
+          can :update, 'DeviseInvitable::Registration'
+        end
+      end
+
       def devise_password_rules(user)
         return unless user.new_record?
 
         can :manage, 'Devise::Password'
       end
 
+      def devise_registration_rules(user)
+        can :create, 'Devise::Registration' if user.new_record?
+        can :update, 'Devise::Registration' unless user.new_record?
+      end
+
       def devise_session_rules(user)
         can :destroy, 'Devise::Session' unless user.new_record?
         can :create, 'Devise::Session'
       end
 
       def devise_rules(user)
-        %w[password session].each do |devise_module|
+        %w[confirmation invitable password registration session].each do |devise_module|
           send("devise_#{devise_module}_rules", user)
         end
       end

data/lib/eac_rails_base0/app_base/ability_mapping.rb

@@ -6,9 +6,11 @@ module EacRailsBase0
       include CanCanDry::AbilityMapping
       include CanCanDry::AbilityMappingSets::ActiveScaffold
       include CanCanDry::AbilityMappingSets::Devise
+      include CanCanDry::AbilityMappingSets::DeviseInvitable
 
       def initialize
         map_devise
+        map_devise_invitable
         map_controller 'EacUsersSupport::Admin::Users', :manage, ::EacUsersSupport::User
         map_controller 'Aranha::Addresses', :manage, ::Aranha::Address
         map_controller 'BrRailties::FederalUnits', :manage, ::BrRailties::FederalUnit

data/lib/eac_rails_base0/spec_helper/eac_users_support.rb

@@ -23,9 +23,11 @@ RSpec.shared_context 'when user is admin', shared_context: :metadata do
 
   before do
     visit '/users/sign_in'
-    fill_in 'E-mail', with: user.email
-    fill_in 'Password', with: user.password
-    click_on 'Log 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
@@ -37,9 +39,9 @@ end
 RSpec.shared_context 'when user is anonymous', shared_context: :metadata do
   before do
     visit '/'
-    if link_exist?('Sair')
-      click_link('Sair')
-    elsif !link_exist?('Entrar')
+    if link_exist?(::I18n.translate!('devise.log_out'))
+      click_link(::I18n.translate!('devise.log_out'))
+    elsif !link_exist?(::I18n.translate!('devise.log_in'))
       raise 'login nor logout link found'
     end
   end

data/lib/eac_rails_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.39.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -515,8 +515,19 @@ files:
 - app/assets/stylesheets/eac_rails_base0/components.scss
 - app/assets/stylesheets/eac_rails_base0/default_configuration.scss
 - app/controllers/eac_rails_base0/application_controller.rb
+- app/helpers/eac_rails_base0/app_version_helper.rb
 - app/helpers/eac_rails_base0/layout_helper.rb
+- app/helpers/eac_rails_base0/panel_default_helper.rb
 - app/uploaders/eac_rails_base0/default_file_uploader.rb
+- app/views/devise/confirmations/new.html.erb
+- app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/reset_password_instructions.html.erb
+- app/views/devise/passwords/edit.html.erb
+- app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/edit.html.erb
+- app/views/devise/registrations/new.html.erb
+- app/views/devise/sessions/new.html.erb
+- app/views/devise/shared/_links.html.erb
 - app/views/layouts/eac_rails_base0/_flash.html.erb
 - app/views/layouts/eac_rails_base0/_main_menu.html.erb
 - app/views/layouts/eac_rails_base0/_navbar_user.html.erb
@@ -610,8 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Rails base for multiple Rails projects developed by Esquilo Azul Company.