effective_resources 1.18.5 → 1.18.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567d72c04873550e68210d5d632d9f6b28581fd9ad7ecafd3869c474e8e01d98
-  data.tar.gz: f573678744280a397793530d76f74a9509191b1bb872a29464148591005d3f9e
+  metadata.gz: 05cb089260386fe9f72bc8837a10fd8cdfe16abd4414c5deb2f06268fa069c45
+  data.tar.gz: c1c15c971c728c5d0fdaec7fa571661bce9722fc429b7b8a2345772528be43e5
 SHA512:
-  metadata.gz: 28c8e863d89bc6ffe40b1df04d373e4f500adc1afe913750962a2e7cb7804257ece906f9da25972825f365ba883398279fd17000d87841279a04d53ceddbb029
-  data.tar.gz: 7f93cb245d4b556bca714a46b4bcf760ed0a30b29bbd7eddc681657216989f777b71b6ff0db88f7afb6e433e08b84dea7a63a706bda2c5ebe3a1885388ef6fe1
+  metadata.gz: 9f7f1220362e03077e200fe6e9d9cc807b03ce0dce317803278a58b28676f6a936e219c5ba430cbcbe420c04f79cb6decc126d0abdd59e4b3760c7020f5b69ad
+  data.tar.gz: f35de510ebb41af0722a975939c99ea0c637324282a931846be21f6fe2bcd1a341d0985c7c4c9f2f449f68c3068c168f0ee0a6d7b3f18e9ad035f19e99369d36

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -21,6 +21,11 @@ module Effective
         self.resource ||= find_wizard_resource
       end
 
+      def assign_resource_current_user
+        return unless respond_to?(:current_user)
+        resource.current_user ||= current_user
+      end
+
       # before_action :authorize_resource, only: [:show, :update]
       # Authorize the resource
       def authorize_resource
@@ -70,10 +75,6 @@ module Effective
       # before_action :assign_current_step, only: [:show, :update]
       # Assign the current step to resource
       def assign_current_step
-        if respond_to?(:current_user) && resource.respond_to?(:current_user=)
-          resource.current_user = current_user
-        end
-
         resource.current_step = step.to_sym
       end
 

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

@@ -22,6 +22,8 @@ module Effective
         before_action :redirect_if_blank_step
 
         before_action :assign_resource
+        before_action :assign_resource_current_user
+
         before_action :authorize_resource
         before_action :assign_required_steps
 
@@ -59,10 +61,14 @@ module Effective
       if params[resource_name_id] && params[resource_name_id] != 'new'
         resource_scope.find(params[resource_name_id])
       else
-        resource_scope.new
+        build_wizard_resource
       end
     end
 
+    def build_wizard_resource
+      resource_scope.new
+    end
+
     def resource_wizard_step_title(resource, step)
       return if step == 'wicked_finish'
       resource.wizard_step_title(step)

data/app/models/effective/resources/sql.rb

@@ -64,7 +64,7 @@ module Effective
           :effective_obfuscation
         elsif name == 'roles' && defined?(EffectiveRoles) && klass.respond_to?(:with_role)
           :effective_roles
-        elsif (name.include?('_address') || name.include?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(:effective_addresses)
+        elsif (name.ends_with?('_address') || name.ends_with?('_addresses')) && defined?(EffectiveAddresses) && (klass.new rescue nil).respond_to?(name)
           :effective_addresses
         elsif name.ends_with?('_id')
           :integer

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.5'.freeze
+  VERSION = '1.18.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.18.5
+  version: 1.18.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails