effective_resources 1.10.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536afe56ae331c14920c56f2eb625812127f0b0ad9f57696b8dce9cc198b6840
-  data.tar.gz: 99afc3984fd065ae8014bb031ea16a9138fce77e3ec0861b140a7d18e6f5e5fd
+  metadata.gz: 708a6f264932790398c9a14aac69e4755d828a85510724358b3b007b18cf2acc
+  data.tar.gz: 6b1617fd635ca5c208b211e4c87b86a2445e0f644b493a66f95e46de615dd8b0
 SHA512:
-  metadata.gz: dd3e83bde7a2a01e86e9588d1998249c5e1f8882bceb679e4c32d4bafbb409b419125cc7bcca2ab4fe358bce0e707f79f7f1a5f1ef4628228dc897a9c74ca510
-  data.tar.gz: 659aab8c923fd9a5b33cb21335251c038f7af37e141c5312fea317bf0a2a9fbb2f673a12cec5b8170a3e57a50e27dcaec21a76af4b69bfdb0143ea7fdcced82b
+  metadata.gz: b84ed8b1ebdac3e4a342c1447be127ad5d3a68b3afcdfe01d7e8c2e5e6d54f829ba1a0908a8a783c20f43d817ca0c9abceb77c88448d731451953e7812f7031a
+  data.tar.gz: 8c7a42aa944f20c7a0eab0f2a9c46f37963b794e5afee932f590211a866e633a1e6349b54c3ba5ec1f61aff2b33ac7ab392dba81b69c246b3a30918b9b9d9b3a

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

@@ -35,6 +35,20 @@ module Effective
 
       # setup_wizard from Wicked called now
 
+      # Allow only 1 in-progress wizard at a time
+      def redirect_if_existing
+        return if step == 'wicked_finish'
+        return if resource.blank?
+        return if resource.try(:done?)
+        return unless resource_scope.respond_to?(:in_progress)
+
+        existing = resource_scope.in_progress.where.not(id: resource).first
+        return unless existing.present?
+
+        flash[:success] = "You have been redirected to your in-progress wizard"
+        redirect_to resource_wizard_path(existing, existing.next_step)
+      end
+
       # before_action :enforce_can_visit_step, only: [:show, :update]
       # Make sure I have permission for this step
       def enforce_can_visit_step
@@ -76,6 +90,10 @@ module Effective
         resource.ready!
       end
 
+      def clear_flash_success
+        @_delete_flash_success = true
+      end
+
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Effective
+  module WizardController
+    module PermittedParams
+      BLACKLIST = [
+        :created_at, :updated_at,
+        :token, :slug, :price,
+        :logged_change_ids, :orders, :purchased_order_id,
+        :status, :status_steps, :wizard_steps,
+        :submitted_at, :completed_at, :reviewed_at, :approved_at, :declined_at, :purchased_at,
+        :declined_reason
+      ]
+
+      def resource_permitted_params
+        permitted_name = params.key?(effective_resource.name) ? effective_resource.name : effective_resource.resource_name
+        params.require(permitted_name).except(BLACKLIST).permit!
+      end
+    end
+  end
+end

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

@@ -7,9 +7,14 @@ module Effective
 
     include Effective::WizardController::Actions
     include Effective::WizardController::BeforeActions
+    include Effective::WizardController::PermittedParams
     include Effective::WizardController::Save
     include Effective::WizardController::WickedOverrides
 
+    module ClassMethods
+      def effective_wizard_controller?; true; end
+    end
+
     included do
       raise("please install gem 'wicked' to use Effective::WizardController") unless defined?(Wicked)
 
@@ -19,10 +24,14 @@ module Effective
         before_action :assign_resource
         before_action :authorize_resource
         before_action :assign_required_steps
+
         before_action :setup_wizard # Wicked
 
         before_action :enforce_can_visit_step
 
+        before_action :redirect_if_existing, only: [:show, :new]
+        before_action :clear_flash_success, only: [:update]
+
         before_action :assign_current_step
         before_action :assign_page_title
 
@@ -38,6 +47,12 @@ module Effective
         flash[:danger] = "Unknown step. You have been moved to the #{resource_wizard_steps.first} step."
         redirect_to wizard_path(resource_wizard_steps.first)
       end
+
+      # effective_resources on save callback
+      after_action do
+        flash.clear if @_delete_flash_success
+      end
+
     end
 
     def find_wizard_resource

data/app/helpers/effective_resources_helper.rb

@@ -244,4 +244,8 @@ module EffectiveResourcesHelper
     simple_format(sanitize(value.to_s, tags: @format_resource_tags, attributes: @format_resource_atts), {}, sanitize: false)
   end
 
+  def edit_effective_wizard?
+    controller.class.try(:effective_wizard_controller?) && defined?(resource) && resource.draft?
+  end
+
 end

data/app/models/concerns/acts_as_wizard.rb

@@ -59,6 +59,12 @@ module ActsAsWizard
       wizard_step_keys()
     end
 
+    # 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) }
+    end
+
     def wizard_step_title(step)
       self.class.const_get(:WIZARD_STEPS).fetch(step)
     end
@@ -134,6 +140,11 @@ module ActsAsWizard
 
   module ClassMethods
     def acts_as_wizard?; true; end
+
+    def all_wizard_steps
+      const_get(:WIZARD_STEPS).keys
+    end
+
   end
 
 end

data/app/models/effective/after_commit.rb

@@ -28,8 +28,10 @@ module Effective
     def self.register_callback(connection:, name:, callback:)
       raise ArgumentError, "#{name} expected a block" unless callback
 
-      raise("#{name} is useless outside transaction") unless connection.transaction_open?
-      raise("#{name} is useless outside transaction") unless connection.current_transaction.joinable?
+      in_transaction = (connection.transaction_open? && connection.current_transaction.joinable?)
+
+      # Execute immediately when outside transaction
+      return callback.call unless in_transaction
 
       after_commit = Effective::AfterCommit.new("#{name}": callback)
       connection.add_transaction_record(after_commit)

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

@@ -95,8 +95,6 @@ module Effective
             relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
           elsif type.present? && id.present? # This was from a polymorphic select
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
-          elsif name == :user # Polymorphic user
-            relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
             collection = relation.none
 
@@ -106,7 +104,7 @@ module Effective
               resource = Effective::Resource.new(klass_name)
               next unless resource.klass.present?
 
-              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term, fuzzy: fuzzy), "#{name}_type": klass_name))
             end
 
             collection

data/config/effective_resources.rb

@@ -38,7 +38,7 @@ EffectiveResources.setup do |config|
   # config.parent_mailer = '::ApplicationMailer'
 
   # Default deliver method
-  # config.deliver_method = :deliver_now
+  # config.deliver_method = :deliver_later
 
   # Default layout
   # config.mailer_layout = 'effective_mailer_layout'

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.12.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - app/controllers/concerns/effective/wizard_controller.rb
 - app/controllers/concerns/effective/wizard_controller/actions.rb
 - app/controllers/concerns/effective/wizard_controller/before_actions.rb
+- app/controllers/concerns/effective/wizard_controller/permitted_params.rb
 - app/controllers/concerns/effective/wizard_controller/save.rb
 - app/controllers/concerns/effective/wizard_controller/wicked_overrides.rb
 - app/helpers/effective_acts_as_email_form_helper.rb