eac_rails_base0 0.34.1 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3e5eb35f94687aa107c7b794a1fcb1c7a2be5c83bc5470c8a2ccd63354d911
-  data.tar.gz: 435b04aba0c29a6095cc7d60fe38392f6f99b9add924ae23666593874d324d3d
+  metadata.gz: a2794df8b976c501bdbb92510e8eb6738ca7326a2c68f62f30284564fcf91967
+  data.tar.gz: 53ac32e50ffb98d03d8c441360f34af9e38b8bdf6a98c17aba1c48f030b51dbc
 SHA512:
-  metadata.gz: ef9181e5bdc9f747068f9c3fe795f05068f7d4a1ad8eb391de91c32b1afd112f9d1fbbf64c24a86c7da288473dd996166a40260fc2ee40d02bdc50a896ca4884
-  data.tar.gz: 48f590ceabb20253c7fb79145c5891ef61acef7c93d1409e04310bed3094c222c81eb84df509e67c341e71b0b716a7e868348b8abdbcf174f49e8700a66c497a
+  metadata.gz: 562e183c5a65735bbef3c64a829dfc593503347db7d43e3b2163af9ffc4fd69400a0d2dff3a35766be8d6fa7fb8047bf5f67c90dab519073c222ae5e196eb291
+  data.tar.gz: de7691a56d76b914fd1d967aa9f4d58d0bea5f241a9818ee3a4be67daf49785e2a87345eefbf726d9474eac3030b2989900e9a5f8a96670046287c0eec313c39

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,27 @@ 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}".
     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/app_base/application.rb

@@ -50,5 +50,8 @@ module EacRailsBase0App
         env.logger
       )
     end
+
+    migrate_deprecated_dir = ::Rails.root.join('db', 'migrate_deprecated')
+    config.paths['db/migrate'] << migrate_deprecated_dir if migrate_deprecated_dir.directory?
   end
 end

data/lib/eac_rails_base0/engine.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require 'aranha/engine'
+require 'br_railties/engine'
+require 'eac_rails_utils/engine'
+require 'eac_users_support/engine'
+
 module EacRailsBase0
   class Engine < ::Rails::Engine
   end

data/lib/eac_rails_base0/version.rb

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

data/lib/tasks/eac_rails_base0.rake

@@ -22,15 +22,6 @@ namespace :eac_rails_base0 do
 
   desc 'Minitest and RSpec for application'
   task test: ['test', 'eac_rails_base0:rspec']
-
-  namespace :gems do
-    desc 'Minitest and RSpec for application and local gems'
-    task test_all: :environment do
-      require 'eac_ruby_gems_utils/tests/multiple'
-      tests = ::EacRubyGemsUtils::Tests::Multiple.new(::EacRailsBase0::Gems.all)
-      raise 'Some test did not pass' unless tests.ok?
-    end
-  end
 end
 
 Rake::Task['default'].clear

data/lib/tasks/eac_rails_base0/gems.rake

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+namespace :eac_rails_base0 do
+  namespace :gems do
+    desc <<~DESCRIPTION
+      Minitest and RSpec for application and local gems.
+
+      Use GEMS environment variable to test only selected gems. Example:
+
+        rake eac_rails_base0:gems:test_all GEMS=gem1_name,gem2_name
+    DESCRIPTION
+    task test_all: :environment do
+      require 'eac_ruby_gems_utils/tests/multiple'
+      gems = ::EacRailsBase0::Gems.all
+      ENV['GEMS'].if_present { |v| v.to_s.split(',').map(&:strip) }.if_present do |gem_names|
+        gems = gems.select { |gem| gem_names.include?(gem.to_s) }
+      end
+      tests = ::EacRubyGemsUtils::Tests::Multiple.new(gems)
+      raise 'Some test did not pass' unless tests.ok?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_base0
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.37.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -510,7 +516,17 @@ files:
 - app/assets/stylesheets/eac_rails_base0/default_configuration.scss
 - app/controllers/eac_rails_base0/application_controller.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
@@ -583,6 +599,7 @@ files:
 - lib/generators/eac_rails_base0/testers/testers_generator.rb
 - lib/generators/eac_rails_base0_generator.rb
 - lib/tasks/eac_rails_base0.rake
+- lib/tasks/eac_rails_base0/gems.rake
 homepage: https://github.com/esquilo-azul/eac_rails_base0
 licenses:
 - MIT