effective_resources 1.8.30 → 1.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b8d6506c26087d165eeca64882b229e482a7f3fe6a9afff2eec37aaa815e77f
-  data.tar.gz: 5d18df3a0e9f53c9f454fae51bdf793c1e508d42bfe3d8e57c2613dc8cae0e59
+  metadata.gz: 3a3ce02ada5c7878e2c6fab4642ba84c4ba7dbb7fb5986c7f8bc135ea8e3258c
+  data.tar.gz: 375b538d786b4730626c5b7fb64a522ec04c789b750b25b2d4235f4617398e46
 SHA512:
-  metadata.gz: ddac7f1c308c8160b35d7dc0f5a33107e9f4ebe919aa38fbb13bfe5a059a1629634c7db4cf94535c9c18e8d3fa159932fd6443d774e24392049a2c18bf2f80ef
-  data.tar.gz: 07a27078f7638d1f802de67bd46503c872e6c3ee515cb19008d447f340126332c201c7e3738ff0080e8a53e84dff2e0de1eb4e17769efe6275e4b6a8c0097de4
+  metadata.gz: 65954757632e43d089f173c0e09e421c8c6528d4aa7da4fe70c7b2f24ce0f4ee90646ec8908a778e356846643cfe9d8b924dc7af2fb800a1b4040b8876a05889
+  data.tar.gz: a1c6e51cba33a5489746a1d0954d547f4065fc75c69a87adaae35faca338c51ba91b36788c34729af74394b5d29ceeb9532b1d6acd7b8ffae06bf1ff29374f2b

data/README.md

@@ -352,6 +352,8 @@ Here's `views/things/start.html.haml`:
 
 You can also call `render_wizard_sidebar(resource)` without the block syntax.
 
+If you add `f.hidden_field(:skip_to_step, value: 'stepc')` you can control the next step.
+
 ## Testing
 
 Run tests by:

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

@@ -9,7 +9,7 @@ module Effective
         if save_resource(resource, action)
           flash[:success] ||= options.delete(:success) || resource_flash(:success, resource, action)
 
-          @skip_to ||= resource.required_steps.find { |s| s == next_step } || resource.first_uncompleted_step
+          @skip_to ||= skip_to_step(resource)
           @redirect_to ||= resource_wizard_path(resource, @skip_to) if was_new_record
 
           redirect_to(@redirect_to || wizard_path(@skip_to))
@@ -19,6 +19,14 @@ module Effective
         end
       end
 
+      private
+
+      def skip_to_step(resource)
+        resource.skip_to_step ||
+        resource.required_steps.find { |s| s == next_step } ||
+        resource.first_uncompleted_step
+      end
+
     end
   end
 end

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

@@ -62,5 +62,19 @@ module Effective
       wizard_path(step, resource_name_id => param)
     end
 
+    private
+
+    def current_step_before?(nav_step)
+      index = wizard_steps.index(nav_step) || raise("step #{nav_step} not found in wizard_steps")
+      current = wizard_steps.index(step) || raise("current step not found in wizard_steps")
+      current < index
+    end
+
+    def current_step_after?(nav_step)
+      index = wizard_steps.index(nav_step) || raise("step #{nav_step} not found in wizard_steps")
+      current = wizard_steps.index(step) || raise("current step not found in wizard_steps")
+      current > index
+    end
+
   end
 end

data/app/helpers/effective_resources_wizard_helper.rb

@@ -2,8 +2,10 @@
 
 module EffectiveResourcesWizardHelper
 
-  def render_wizard_sidebar(resource, numbers: true, &block)
-    sidebar = content_tag(:div, class: 'nav list-group wizard-sidebar') do
+  def render_wizard_sidebar(resource, numbers: true, horizontal: false, &block)
+    klasses = ['wizard-sidebar', 'list-group', ('list-group-horizontal' if horizontal)].compact.join(' ')
+
+    sidebar = content_tag(:div, class: klasses) do
       resource.required_steps.map.with_index do |nav_step, index|
         render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
       end.join.html_safe

data/app/models/concerns/acts_as_slugged.rb

@@ -2,7 +2,7 @@
 #
 # This module automatically generates slugs based on the :to_s field using a before_validation filter
 #
-# Mark your model with 'acts_as_sluggable' make sure you have a string field :slug
+# Mark your model with 'acts_as_slugged' make sure you have a string field :slug
 
 module ActsAsSlugged
   extend ActiveSupport::Concern

data/app/models/concerns/acts_as_wizard.rb

@@ -25,6 +25,8 @@ module ActsAsWizard
     acts_as_wizard_options = @acts_as_wizard_options
 
     attr_accessor :current_step
+    attr_accessor :skip_to_step
+
     attr_accessor :current_user
 
     if Rails.env.test? # So our tests can override the required_steps method

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

@@ -55,6 +55,8 @@ module Effective
           input
         when ActiveRecord::Relation
           input.klass
+        when (ActiveRecord::Reflection::BelongsToReflection rescue :nil)
+          _klass_by_name(input.class_name)
         when (ActiveRecord::Reflection::AbstractReflection rescue :nil)
           ((input.klass rescue nil).presence || _klass_by_name(input.class_name)) unless input.options[:polymorphic]
         when ActiveRecord::Reflection::MacroReflection

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

@@ -91,9 +91,11 @@ module Effective
 
           if term == 'nil'
             relation.where(is_null("#{sql_column}_id")).where(is_null("#{sql_column}_type"))
-          elsif type.present? && id.present?
+          elsif type.present? && id.present? # This was from a polymorphic select
             relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
-          else
+          elsif name == :user # Polymorphic user
+            relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
+          else # Maybe from a string field
             id ||= Effective::Attribute.new(:integer).parse(term)
             relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
           end
@@ -213,8 +215,10 @@ module Effective
 
         # key: the id, or associated_id on my table
         # keys: the ids themselves as per the target table
-
-        if association.macro == :belongs_to
+        if association.macro == :belongs_to && association.options[:polymorphic]
+          key = sql_column(association.foreign_key)
+          keys = relation.pluck((relation.klass.primary_key rescue nil))
+        elsif association.macro == :belongs_to
           key = sql_column(association.foreign_key)
           keys = relation.pluck(association.klass.primary_key)
         elsif association.macro == :has_and_belongs_to_many

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.30'.freeze
+  VERSION = '1.8.34'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.30
+  version: 1.8.34
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails