effective_resources 1.8.32 → 1.8.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4947c3721a74b21dbbda376785836f0ee3555615d56ff0f4850525b17f49d8c
-  data.tar.gz: c70ce7a422d7c99e0ec304955cb33d528ad9d7ab0466222e94d8ec9a958442a0
+  metadata.gz: 06f8572e4cacab573ff3121145f120c1844e81af1c35d57d3fa9d42ffd819338
+  data.tar.gz: c168aa140a18323a17132c25d16edd3fb88329738f63c1a4dcfe7d66bde6ec6d
 SHA512:
-  metadata.gz: 690b5ebefd83b651f35e586d596ebc470c05beb4bc871e71cbc711ad331ddf004cf2a22d825c37d03d25ce5edc290c14fe00d8785b2881a6557f21edf6b34c73
-  data.tar.gz: 0c727005edcc162ffe64c8368fd5ba95ca2ff84e5d0073f24177cf521a9540343bd82897efee8d43c09917d111a74b58e51b767c434bd4f044963fc3b4c2b3c5
+  metadata.gz: 5043556b5414776fd0ad50ee9a298cede2ae403da26eb6cbacc4d2ccf418c71db71c22671fc5e52f378d2a0db244dd14ee45ecbf21756edcd468d0b8b22f07f2
+  data.tar.gz: eb2538b9526d60153db7faa8bd37eee9080001bcf268070ba2b754333213142ec90d98ba3067cb76c643f2eff988cad395d9353bdadc0a1910ed304388626054

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/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.32'.freeze
+  VERSION = '1.8.36'.freeze
 end

data/lib/effective_resources.rb

@@ -64,4 +64,36 @@ module EffectiveResources
     date.wday != 0 && date.wday != 6 && Holidays.on(date, *holidays).blank?
   end
 
+  # https://stackoverflow.com/questions/66103388/attach-activestorage-blob-with-a-different-filename
+  def self.clone_blob(blob, options = {})
+    raise('expected an ActiveStorage::Blob') unless blob.kind_of?(ActiveStorage::Blob)
+
+    atts = {
+      filename: blob.filename,
+      byte_size: blob.byte_size,
+      checksum: blob.checksum,
+      content_type: blob.content_type,
+      metadata: blob.metadata,
+    }.merge(options)
+
+    service = blob.service
+    duplicate = ActiveStorage::Blob.create_before_direct_upload!(**atts)
+
+    case service.class.name
+    when 'ActiveStorage::Service::S3Service'
+      bucket = service.bucket
+      object = bucket.object(blob.key)
+      object.copy_to(bucket.object(duplicate.key))
+    when 'ActiveStorage::Service::DiskService'
+      path = service.path_for(blob.key)
+      duplicate_path = service.path_for(duplicate.key)
+      FileUtils.mkdir_p(File.dirname(duplicate_path))
+      FileUtils.ln(path, duplicate_path) if File.exists?(path)
+    else
+      raise "unknown storage service #{service.class.name}"
+    end
+
+    duplicate
+  end
+
 end

metadata

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