effective_resources 1.8.31 → 1.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cac8ab4956bad6e580c5edfe77d2040d13430b327acff13874f0d447e2cb154
-  data.tar.gz: 9d2aeb097b2a71715aec44af86b49628549c0083ecd757f742047ae17842207b
+  metadata.gz: 889c24801967683844b62d1e659862a39e47bfc99cf184ff77b9ecb9f0dbc16a
+  data.tar.gz: a39a146b713bc41482f35df016f3309c8afedef75531c5066479fe8d3ca6100c
 SHA512:
-  metadata.gz: c04ecb8170f56016f354a93dd1be925ac08cef0f9dc77b93027457fa30b3382907943083877f47daa6dc000e700be9594a69e52a69fe63a0846a1d988413876c
-  data.tar.gz: 73e362b25cc6acbc6c9abf0c8e8c87ad1a9b19d4a2d4c4e5f0a21cdc9f4071e8084ec15685fcb29a8d96bd1d9241c36f4d2569c79244247c3df8cd77eca2c333
+  metadata.gz: ac2de13588b807efd3fb9c048c0e180701d9b0dff54bf4ff1c44a86eb211b4ab9fc17da5fbea84725ce4c6cdc17fc9d242e749d257dd778209a7127655cc22bc
+  data.tar.gz: a7dd80308162e111383edb92c5964e32c7397116b574df8c20460e9571a705985f3b1d8ef6be28b9d743c08a89500fd34f2a830fa37751452db058fc34918c88

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/effective/resources/init.rb

@@ -56,7 +56,11 @@ module Effective
         when ActiveRecord::Relation
           input.klass
         when (ActiveRecord::Reflection::AbstractReflection rescue :nil)
-          ((input.klass rescue nil).presence || _klass_by_name(input.class_name)) unless input.options[:polymorphic]
+          if input.options[:polymorphic]
+            _klass_by_name(input.class_name)
+          else
+            (input.klass rescue nil) || _klass_by_name(input.class_name)
+          end
         when ActiveRecord::Reflection::MacroReflection
           ((input.klass rescue nil).presence || _klass_by_name(input.class_name)) unless input.options[:polymorphic]
         when ActionDispatch::Journey::Route

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
@@ -289,7 +293,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.31'.freeze
+  VERSION = '1.8.35'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.31
+  version: 1.8.35
 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