eac_users_support 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3035aae94135c2c69e856603ab0b21c221d677fb687246cabe5eb714c907b450
-  data.tar.gz: 75629c04316f16b0356ab0a338d83003335cd533886d3c258638e47ddbe5982d
+  metadata.gz: '01836f2b85b02d79795bcfcee579d5df0a0de9aac958f4a4a316d273dedabae8'
+  data.tar.gz: 4388ffd42d6253c15eaa9733c8d1fb7860f987e54019aae0a64679e068c1c326
 SHA512:
-  metadata.gz: ba4af58feb6028e21bb31bbbf60ca73a2c55b66889039519eecdfb4123cdc19570737626519ec1fb6da51751f8c8097f1a20bf9cd9d403e2b70cb2f5e9b3b8c1
-  data.tar.gz: 2f0cb961b30020ec89dcf362bae4b872f5e443b9aeefaf78aae02fe79921b3a6553640a12a9fbfe9a6ea334cbc61b7206119365e2aa1f4c42cce31c2fd40b08a
+  metadata.gz: 103bbb79f08060cce8e2cadc58f0d4d2963d81d1d77897446827740ed3b082d002731d28bc4dca72bce461313e09ff997b3efc4019e91b26f7c66409a2c1705c
+  data.tar.gz: 5e31abb9ad4fac9d7bab365ebe39908285771d621ac9be2915e5c73d5a131e650b8f608f02e631d4eb5245054ffce880fc7d04b37f2e8fc593a62b7b05ff17cb

data/app/controllers/eac_users_support/admin/users_controller.rb

@@ -28,7 +28,7 @@ module EacUsersSupport
             flash[:info] = ::I18n.t(:'eac_users_support.password_reset.successful',
                                     user: record, password: record.password)
           else
-            flash[:error] = ::I18n.t(:'eac_users_support.password_reset.failed', user: user) +
+            flash[:error] = ::I18n.t(:'eac_users_support.password_reset.failed', user: user) + # rubocop:disable Style/StringConcatenation
                             ': ' + record.errors.to_s
           end
         end

data/config/initializers/menus.rb

@@ -2,7 +2,7 @@
 
 require 'eac_rails_utils/patches/application'
 
-::Rails.application.root_menu.group(:admin).group(:eac_users_support, :eac_users_support)
-       .within do |g|
-  g.action(:admin_users).label(-> { ::EacUsersSupport::User.plural_name })
+Rails.application.root_menu.group(:admin).group(:eac_users_support, :eac_users_support)
+  .within do |g|
+  g.action(:admin_users).label(-> { EacUsersSupport::User.plural_name })
 end

data/db/migrate/20200322051231_add_devise_invitable_to_eac_users_support_users.rb

@@ -3,7 +3,7 @@
 class AddDeviseInvitableToEacUsersSupportUsers < (
     Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
-  def up
+  def up # rubocop:disable Metrics/MethodLength
     change_table :eac_users_support_users do |t|
       t.string     :invitation_token
       t.datetime   :invitation_created_at

data/lib/eac_users_support/tasks/password_reset.rb

@@ -1,41 +1,58 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 
 module EacUsersSupport
   module Tasks
     class PasswordReset
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(email, administrator)
-        @email = email
-        @administrator = administrator
-      end
+      enable_simple_cache
+      common_constructor :email, :administrator
 
       def run
-        if found_user
-          Rails.logger.info "Usuário encontrado com o email \"#{@email}\""
-          found_user.update!(attributes_to_update)
-        else
-          Rails.logger.info "Usuário não encontrado com o email \"#{@email}\". Criando..."
-          User.create!({ email: @email }.merge(attributes_to_update))
-        end
-        Rails.logger.info "Senha resetada para #{@email}"
+        found_user ? run_on_user_found : run_on_user_not_found
+        Rails.logger.info "Senha resetada para #{email}"
       end
 
       private
 
+      # @return [Hash]
+      def administrator_attributes_to_update
+        administrator ? { administrator: true } : {}
+      end
+
+      # @return [Hash]
       def attributes_to_update
-        r = { password: @email, password_confirmation: @email }
-        if found_user.present? && found_user.confirmed_at.blank?
-          r.merge(confirmed_at: ::DateTime.now)
+        %w[common confirmation administrator].inject({}) do |a, e|
+          a.merge(send("#{e}_attributes_to_update"))
         end
-        r[:administrator] = true if @administrator
-        r
+      end
+
+      # @return [Hash]
+      def common_attributes_to_update
+        { password: email, password_confirmation: email }
+      end
+
+      # @return [Hash]
+      def confirmation_attributes_to_update
+        return {} unless found_user.blank? || found_user.confirmed_at.blank?
+
+        { confirmed_at: ::DateTime.now }
       end
 
       def found_user_uncached
-        ::EacUsersSupport::User.find_by(email: @email)
+        ::EacUsersSupport::User.find_by(email: email)
+      end
+
+      # @return [void]
+      def run_on_user_found
+        Rails.logger.info "Usuário encontrado com o email \"#{email}\""
+        found_user.update!(attributes_to_update)
+      end
+
+      # @return [void]
+      def run_on_user_not_found
+        Rails.logger.info "Usuário não encontrado com o email \"#{email}\". Criando..."
+        User.create!({ email: email }.merge(attributes_to_update))
       end
     end
   end

data/lib/eac_users_support/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacUsersSupport
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/lib/tasks/eac_users_support.rake

@@ -14,6 +14,6 @@ namespace :eac_users_support do
       bin/rake eac_users_support:password_reset[fulano@example.com,1]
   DESCRIPTION
   task :password_reset, %i[email administrator] => :environment do |_t, args|
-    ::EacUsersSupport::Tasks::PasswordReset.new(args.email, args.administrator.present?).run
+    EacUsersSupport::Tasks::PasswordReset.new(args.email, args.administrator.present?).run
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_users_support
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -19,7 +19,7 @@ dependencies:
         version: '4.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.2
+        version: 4.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.2
+        version: 4.9.3
 - !ruby/object:Gem::Dependency
   name: devise_invitable
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: eac_active_scaffold
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,26 +87,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.9.2
 description: 
 email: 
 executables: []
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="