effective_resources 2.7.1 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a66af4a785aeb664dcd50caa4d838c301f6d8652475a35278dc4580c527ad74
-  data.tar.gz: 77058779dd017ad9cfb78b01299f321af5de6eb5f5bcb95878f7b57e256ec9d6
+  metadata.gz: 5e36a25d824db2b9794dd755ee4311385e59e0061448ce72f6e018c37ae2dc09
+  data.tar.gz: a9ac9af3756f705d50a545810e22e5179f2febdd9754fbbdf2e0b825e12bc149
 SHA512:
-  metadata.gz: 7282c9e47327b814f1c8a5bbf4291aa5956ad2fcd13bafadeecbd33d2ce49a19c6dbb89c8d585b12b2a1988e3e32e22bc56340643f536251fd31f3c4c7854d20
-  data.tar.gz: d17c9a25dc8c09992eea1d640ecf9eaa103747ef338745e27d44595300ebfddbd021c6657c56931a7d80b0816c5ff25f9ef209c062cbb3a02469d6b24bfaec71
+  metadata.gz: 6acf08c36bf3ce4c15c225a1605594d1d2e6b19c20c3cb199bb13e9f312ce8a0edaff5c8665811c71491802c5a53cee2f6dab383e92de4485a8217c9eb4f9004
+  data.tar.gz: b94c04b3a8e3512af8f3f554091b604f2317511e9575900d3c8fc541a56b16729f620e02a5ad60b8b3b598a1bee4cdd9a2fb94d7597e4330af87ec10503b4dc4

data/app/controllers/concerns/effective/crud_controller.rb

@@ -74,16 +74,16 @@ module Effective
       super
     end
 
+    def resource_klass # Thing
+      effective_resource.klass
+    end
+
     private
 
     def resource_scope
       effective_resource.relation
     end
 
-    def resource_klass # Thing
-      effective_resource.klass
-    end
-
     def resource_name # 'thing'
       effective_resource.name
     end

data/app/helpers/effective_resources_helper.rb

@@ -274,7 +274,7 @@ module EffectiveResourcesHelper
     title = resource.wizard_step_title(step)
     raise("expected a title for step #{step}") unless title.present?
 
-    link = if edit_effective_wizard? && resource.can_visit_step?(step)
+    link = if edit_effective_wizard? && resource.is_a?(controller.resource_klass) && resource.can_visit_step?(step)
       link_to('Edit', wizard_path(step), title: "Edit #{title}")
     end
 

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -53,7 +53,7 @@ module ActsAsPurchasableWizard
 
     # Make sure all Fees are valid
     fees.each do |fee|
-      raise('expected a valid fee') unless fee.valid?
+      raise("expected a valid fee but #{fee.id} had errors #{fee.errors.inspect}") unless fee.valid?
     end
 
     # A membership could go from individual to organization

data/app/models/concerns/acts_as_wizard.rb

@@ -57,6 +57,10 @@ module ActsAsWizard
       self.class.const_get(:WIZARD_STEPS).keys
     end
 
+    def completed_steps
+      wizard_steps.keys
+    end
+
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
 
@@ -85,7 +89,7 @@ module ActsAsWizard
     # For use in the summary partials. Does not include summary.
     def render_steps
       blacklist = [:start, :billing, :checkout, :submitted, :summary]
-      (required_steps - blacklist).select { |step| has_completed_step?(step) }
+      (required_steps + completed_steps - blacklist).select { |step| has_completed_step?(step) }
     end
 
     def wizard_step_title(step)

data/app/models/concerns/effective_devise_user.rb

@@ -72,6 +72,38 @@ module EffectiveDeviseUser
       [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]
     end
 
+    def filter_parameters
+      [
+        :encrypted_password,
+        :reset_password_token,
+        :reset_password_sent_at,
+        :remember_created_at,
+        :sign_in_count,
+        :current_sign_in_at,
+        :last_sign_in_at,
+        :current_sign_in_ip,
+        :last_sign_in_ip,
+        :invitation_token,
+        :invitation_created_at,
+        :invitation_sent_at,
+        :invitation_accepted_at,
+        :invitation_limit,
+        :invited_by_type,
+        :invited_by_id,
+        :invitations_count,
+        :uid,
+        :provider,
+        :access_token,
+        :refresh_token,
+        :token_expires_at,
+        :avatar_url,
+        :roles_mask,
+        :confirmation_sent_at,
+        :confirmed_at,
+        :unconfirmed_email
+      ]
+    end
+
     def from_omniauth(auth, params)
       invitation_token = (params.presence || {})['invitation_token']
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.1'.freeze
+  VERSION = '2.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails