eac_users_support 0.11.0 → 0.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/eac_users_support/admin/users_controller.rb +1 -1
  3. data/app/controllers/eac_users_support/application_controller.rb +6 -6
  4. data/config/after_initializers/menus.rb +8 -0
  5. data/db/migrate/20160605013848_create_eac_users_support_users.rb +2 -2
  6. data/db/migrate/20160605035833_add_devise_authenticable_to_eac_users_support_users.rb +2 -2
  7. data/db/migrate/20180222202443_add_devise_rememberable_to_eac_users_support_users.rb +2 -2
  8. data/db/migrate/20180318181324_add_administrator_to_eac_users_support_users.rb +2 -2
  9. data/db/migrate/20200322051231_add_devise_invitable_to_eac_users_support_users.rb +3 -3
  10. data/db/migrate/20200322053003_add_devise_confirmable_to_eac_users_support_users.rb +2 -2
  11. data/db/migrate/20200324203335_add_recoverable_to_eac_users_support_users.rb +2 -2
  12. data/db/migrate/20200620215624_add_unconfirmed_email_to_eac_users_support_users.rb +2 -2
  13. data/lib/eac_users_support/tasks/password_reset.rb +38 -21
  14. data/lib/eac_users_support/version.rb +1 -1
  15. data/lib/eac_users_support.rb +2 -0
  16. data/lib/tasks/eac_users_support.rake +1 -1
  17. metadata +39 -33
  18. data/config/initializers/menus.rb +0 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3035aae94135c2c69e856603ab0b21c221d677fb687246cabe5eb714c907b450
4
- data.tar.gz: 75629c04316f16b0356ab0a338d83003335cd533886d3c258638e47ddbe5982d
3
+ metadata.gz: a985fad43be9ae1f798054d12be8812f7b97d485d52785d932337e58e5760a90
4
+ data.tar.gz: 0016be5bc42bb9344b06e1be90612b60690d883d15c0aee079e8e81d5372652d
5
5
  SHA512:
6
- metadata.gz: ba4af58feb6028e21bb31bbbf60ca73a2c55b66889039519eecdfb4123cdc19570737626519ec1fb6da51751f8c8097f1a20bf9cd9d403e2b70cb2f5e9b3b8c1
7
- data.tar.gz: 2f0cb961b30020ec89dcf362bae4b872f5e443b9aeefaf78aae02fe79921b3a6553640a12a9fbfe9a6ea334cbc61b7206119365e2aa1f4c42cce31c2fd40b08a
6
+ metadata.gz: 8bf8bde913f8092534ed4d5907563683024a872e33d1a94b6e7ff4f44910df3fdd88a42b553bce36b80ac272cbec613b1802f7a4c2fce8e22cb1835554e823c1
7
+ data.tar.gz: 7cc3432b559ea1d61243142f3952e41cccd279aeef14753251b030789a858a7e9455620efbbef0ff2d7a2406f54938d90726f7436d851c117ad303f1414b48a8
data/app/controllers/eac_users_support/admin/users_controller.rb CHANGED
@@ -28,7 +28,7 @@ module EacUsersSupport
28
28
  flash[:info] = ::I18n.t(:'eac_users_support.password_reset.successful',
29
29
  user: record, password: record.password)
30
30
  else
31
- flash[:error] = ::I18n.t(:'eac_users_support.password_reset.failed', user: user) +
31
+ flash[:error] = ::I18n.t(:'eac_users_support.password_reset.failed', user: user) + # rubocop:disable Style/StringConcatenation
32
32
  ': ' + record.errors.to_s
33
33
  end
34
34
  end
data/app/controllers/eac_users_support/application_controller.rb CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  module EacUsersSupport
4
4
  class ApplicationController < (
5
- begin
6
- ::ApplicationController
7
- rescue NameError
8
- ::ActionController::Base
9
- end
10
- )
5
+ begin
6
+ ::ApplicationController
7
+ rescue NameError
8
+ ::ActionController::Base
9
+ end
10
+ )
11
11
  end
12
12
  end
data/config/after_initializers/menus.rb ADDED
@@ -0,0 +1,8 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_rails_utils/patches/application'
4
+
5
+ Rails.application.root_menu.group(:admin).group(:eac_users_support, :eac_users_support)
6
+ .within do |g|
7
+ g.action(:admin_users).label(-> { EacUsersSupport::User.plural_name })
8
+ end
data/db/migrate/20160605013848_create_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class CreateEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  create_table :eac_users_support_users do |t|
8
8
  t.string :email, null: false, default: ''
data/db/migrate/20160605035833_add_devise_authenticable_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddDeviseAuthenticableToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  add_column :eac_users_support_users, :encrypted_password, :string, null: false, default: ''
8
8
  add_index :eac_users_support_users, :email, unique: true
data/db/migrate/20180222202443_add_devise_rememberable_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddDeviseRememberableToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  add_column :eac_users_support_users, :remember_created_at, :datetime
8
8
  end
data/db/migrate/20180318181324_add_administrator_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddAdministratorToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  add_column :eac_users_support_users, :administrator, :boolean, null: false, default: false
8
8
  end
data/db/migrate/20200322051231_add_devise_invitable_to_eac_users_support_users.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddDeviseInvitableToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
6
- def up
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
+ def up # rubocop:disable Metrics/MethodLength
7
7
  change_table :eac_users_support_users do |t|
8
8
  t.string :invitation_token
9
9
  t.datetime :invitation_created_at
data/db/migrate/20200322053003_add_devise_confirmable_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddDeviseConfirmableToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  class Model < ::ActiveRecord::Base
7
7
  self.table_name = :eac_users_support_users
8
8
  end
data/db/migrate/20200324203335_add_recoverable_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddRecoverableToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  change_table :eac_users_support_users do |t|
8
8
  t.string :reset_password_token
data/db/migrate/20200620215624_add_unconfirmed_email_to_eac_users_support_users.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class AddUnconfirmedEmailToEacUsersSupportUsers < (
4
- Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
- )
4
+ Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
5
+ )
6
6
  def change
7
7
  add_column :eac_users_support_users, :unconfirmed_email, :string
8
8
  end
data/lib/eac_users_support/tasks/password_reset.rb CHANGED
@@ -1,41 +1,58 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/simple_cache'
3
+ require 'eac_ruby_utils/core_ext'
4
4
 
5
5
  module EacUsersSupport
6
6
  module Tasks
7
7
  class PasswordReset
8
- include ::EacRubyUtils::SimpleCache
9
-
10
- def initialize(email, administrator)
11
- @email = email
12
- @administrator = administrator
13
- end
8
+ enable_simple_cache
9
+ common_constructor :email, :administrator
14
10
 
15
11
  def run
16
- if found_user
17
- Rails.logger.info "Usuário encontrado com o email \"#{@email}\""
18
- found_user.update!(attributes_to_update)
19
- else
20
- Rails.logger.info "Usuário não encontrado com o email \"#{@email}\". Criando..."
21
- User.create!({ email: @email }.merge(attributes_to_update))
22
- end
23
- Rails.logger.info "Senha resetada para #{@email}"
12
+ found_user ? run_on_user_found : run_on_user_not_found
13
+ Rails.logger.info "Senha resetada para #{email}"
24
14
  end
25
15
 
26
16
  private
27
17
 
18
+ # @return [Hash]
19
+ def administrator_attributes_to_update
20
+ administrator ? { administrator: true } : {}
21
+ end
22
+
23
+ # @return [Hash]
28
24
  def attributes_to_update
29
- r = { password: @email, password_confirmation: @email }
30
- if found_user.present? && found_user.confirmed_at.blank?
31
- r.merge(confirmed_at: ::DateTime.now)
25
+ %w[common confirmation administrator].inject({}) do |a, e|
26
+ a.merge(send("#{e}_attributes_to_update"))
32
27
  end
33
- r[:administrator] = true if @administrator
34
- r
28
+ end
29
+
30
+ # @return [Hash]
31
+ def common_attributes_to_update
32
+ { password: email, password_confirmation: email }
33
+ end
34
+
35
+ # @return [Hash]
36
+ def confirmation_attributes_to_update
37
+ return {} unless found_user.blank? || found_user.confirmed_at.blank?
38
+
39
+ { confirmed_at: ::DateTime.now }
35
40
  end
36
41
 
37
42
  def found_user_uncached
38
- ::EacUsersSupport::User.find_by(email: @email)
43
+ ::EacUsersSupport::User.find_by(email: email)
44
+ end
45
+
46
+ # @return [void]
47
+ def run_on_user_found
48
+ Rails.logger.info "Usuário encontrado com o email \"#{email}\""
49
+ found_user.update!(attributes_to_update)
50
+ end
51
+
52
+ # @return [void]
53
+ def run_on_user_not_found
54
+ Rails.logger.info "Usuário não encontrado com o email \"#{email}\". Criando..."
55
+ User.create!({ email: email }.merge(attributes_to_update))
39
56
  end
40
57
  end
41
58
  end
data/lib/eac_users_support/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacUsersSupport
4
- VERSION = '0.11.0'
4
+ VERSION = '0.11.2'
5
5
  end
data/lib/eac_users_support.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'active_record'
4
+ require 'rails'
3
5
  require 'recordselect'
4
6
  require 'eac_users_support/engine'
5
7
 
data/lib/tasks/eac_users_support.rake CHANGED
@@ -14,6 +14,6 @@ namespace :eac_users_support do
14
14
  bin/rake eac_users_support:password_reset[fulano@example.com,1]
15
15
  DESCRIPTION
16
16
  task :password_reset, %i[email administrator] => :environment do |_t, args|
17
- ::EacUsersSupport::Tasks::PasswordReset.new(args.email, args.administrator.present?).run
17
+ EacUsersSupport::Tasks::PasswordReset.new(args.email, args.administrator.present?).run
18
18
  end
19
19
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eac_users_support
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.0
4
+ version: 0.11.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Esquilo Azul Company
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-18 00:00:00.000000000 Z
11
+ date: 2026-07-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: devise
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: '4.9'
20
20
  - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: 4.9.2
22
+ version: 4.9.4
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: '4.9'
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: 4.9.2
32
+ version: 4.9.4
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: devise_invitable
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: '2.0'
40
40
  - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: 2.0.8
42
+ version: 2.0.12
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,75 +49,81 @@ dependencies:
49
49
  version: '2.0'
50
50
  - - ">="
51
51
  - !ruby/object:Gem::Version
52
- version: 2.0.8
52
+ version: 2.0.12
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: eac_active_scaffold
55
55
  requirement: !ruby/object:Gem::Requirement
56
56
  requirements:
57
57
  - - "~>"
58
58
  - !ruby/object:Gem::Version
59
- version: '0.5'
59
+ version: '0.8'
60
60
  - - ">="
61
61
  - !ruby/object:Gem::Version
62
- version: 0.5.1
62
+ version: 0.8.1
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '0.5'
69
+ version: '0.8'
70
70
  - - ">="
71
71
  - !ruby/object:Gem::Version
72
- version: 0.5.1
72
+ version: 0.8.1
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: eac_rails_utils
75
75
  requirement: !ruby/object:Gem::Requirement
76
76
  requirements:
77
77
  - - "~>"
78
78
  - !ruby/object:Gem::Version
79
- version: '0.22'
79
+ version: '0.29'
80
80
  type: :runtime
81
81
  prerelease: false
82
82
  version_requirements: !ruby/object:Gem::Requirement
83
83
  requirements:
84
84
  - - "~>"
85
85
  - !ruby/object:Gem::Version
86
- version: '0.22'
86
+ version: '0.29'
87
87
  - !ruby/object:Gem::Dependency
88
88
  name: eac_ruby_utils
89
89
  requirement: !ruby/object:Gem::Requirement
90
90
  requirements:
91
91
  - - "~>"
92
92
  - !ruby/object:Gem::Version
93
- version: '0.119'
93
+ version: '0.131'
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: 0.119.2
96
+ version: 0.131.2
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '0.119'
103
+ version: '0.131'
104
104
  - - ">="
105
105
  - !ruby/object:Gem::Version
106
- version: 0.119.2
106
+ version: 0.131.2
107
107
  - !ruby/object:Gem::Dependency
108
108
  name: rails
109
109
  requirement: !ruby/object:Gem::Requirement
110
110
  requirements:
111
+ - - "~>"
112
+ - !ruby/object:Gem::Version
113
+ version: 6.1.7
111
114
  - - ">="
112
115
  - !ruby/object:Gem::Version
113
- version: 4.2.11.3
116
+ version: 6.1.7.10
114
117
  type: :runtime
115
118
  prerelease: false
116
119
  version_requirements: !ruby/object:Gem::Requirement
117
120
  requirements:
121
+ - - "~>"
122
+ - !ruby/object:Gem::Version
123
+ version: 6.1.7
118
124
  - - ">="
119
125
  - !ruby/object:Gem::Version
120
- version: 4.2.11.3
126
+ version: 6.1.7.10
121
127
  - !ruby/object:Gem::Dependency
122
128
  name: recordselect
123
129
  requirement: !ruby/object:Gem::Requirement
@@ -127,7 +133,7 @@ dependencies:
127
133
  version: '3.10'
128
134
  - - ">="
129
135
  - !ruby/object:Gem::Version
130
- version: 3.10.4
136
+ version: 3.10.9
131
137
  type: :runtime
132
138
  prerelease: false
133
139
  version_requirements: !ruby/object:Gem::Requirement
@@ -137,29 +143,29 @@ dependencies:
137
143
  version: '3.10'
138
144
  - - ">="
139
145
  - !ruby/object:Gem::Version
140
- version: 3.10.4
146
+ version: 3.10.9
141
147
  - !ruby/object:Gem::Dependency
142
148
  name: eac_rails_gem_support
143
149
  requirement: !ruby/object:Gem::Requirement
144
150
  requirements:
145
151
  - - "~>"
146
152
  - !ruby/object:Gem::Version
147
- version: '0.4'
153
+ version: '0.12'
148
154
  - - ">="
149
155
  - !ruby/object:Gem::Version
150
- version: 0.4.1
156
+ version: 0.12.2
151
157
  type: :development
152
158
  prerelease: false
153
159
  version_requirements: !ruby/object:Gem::Requirement
154
160
  requirements:
155
161
  - - "~>"
156
162
  - !ruby/object:Gem::Version
157
- version: '0.4'
163
+ version: '0.12'
158
164
  - - ">="
159
165
  - !ruby/object:Gem::Version
160
- version: 0.4.1
161
- description:
162
- email:
166
+ version: 0.12.2
167
+ description:
168
+ email:
163
169
  executables: []
164
170
  extensions: []
165
171
  extra_rdoc_files: []
@@ -176,8 +182,8 @@ files:
176
182
  - app/views/devise/sessions/_login_form.html.erb
177
183
  - app/views/devise/sessions/new.html.erb
178
184
  - app/views/eac_users_support/users/edit.html.erb
185
+ - config/after_initializers/menus.rb
179
186
  - config/initializers/devise.rb
180
- - config/initializers/menus.rb
181
187
  - config/locales/devise.en.yml
182
188
  - config/locales/devise.pt-BR.yml
183
189
  - config/locales/devise_invitable.en.yml
@@ -201,11 +207,11 @@ files:
201
207
  - lib/eac_users_support/tasks/password_reset.rb
202
208
  - lib/eac_users_support/version.rb
203
209
  - lib/tasks/eac_users_support.rake
204
- homepage:
210
+ homepage:
205
211
  licenses:
206
212
  - MIT
207
213
  metadata: {}
208
- post_install_message:
214
+ post_install_message:
209
215
  rdoc_options: []
210
216
  require_paths:
211
217
  - lib
@@ -213,15 +219,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
213
219
  requirements:
214
220
  - - ">="
215
221
  - !ruby/object:Gem::Version
216
- version: '0'
222
+ version: '3.2'
217
223
  required_rubygems_version: !ruby/object:Gem::Requirement
218
224
  requirements:
219
225
  - - ">="
220
226
  - !ruby/object:Gem::Version
221
227
  version: '0'
222
228
  requirements: []
223
- rubygems_version: 3.1.6
224
- signing_key:
229
+ rubygems_version: 3.4.19
230
+ signing_key:
225
231
  specification_version: 4
226
232
  summary: Ready-to-use support for users registration, login, logout, etc, for Rails.
227
233
  test_files: []
data/config/initializers/menus.rb DELETED
@@ -1,8 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'eac_rails_utils/patches/application'
4
-
5
- ::Rails.application.root_menu.group(:admin).group(:eac_users_support, :eac_users_support)
6
- .within do |g|
7
- g.action(:admin_users).label(-> { ::EacUsersSupport::User.plural_name })
8
- end