effective_resources 1.8.33 → 1.8.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cb47028d5031c44e6a833fd1750d6e9435ace75de88ffec3756378079ba13c
-  data.tar.gz: 9ceb601f1fdf5ab0784abe83b6f7d8071f66e079d7c5a3c7352dee0dda9b1abb
+  metadata.gz: 0717144b74cef2f8c9371376473c80c7777ed62ae65678cfa4335a32736896d7
+  data.tar.gz: 7c6965480ed359392c576e95ce651585a6c5c5169b50e41d5ab16c13b964cc8b
 SHA512:
-  metadata.gz: 9fe4309ff79c01a66217aee696f3bfa45d11d429d7a3dad84977351be8e0f9efd1091b6bc8398fcc46d131cc69a57d2251a2b365ddbd7fd4f0a4576c51ba6a5f
-  data.tar.gz: a88750936ed0d46ee4a8faa8a591fbd04dd9eef2eeedaa7f36c01a80bbeaff72690eed324974cdbaf12ed68b2f156ea91058c5250d5b415e80040f4edf0d9060
+  metadata.gz: 31160ec3013825ae35a28359229f2fa02306776412a0fe333c5f7e2738327ad563fb525faaae64fc5db0130377ee8edc3010113514902e99a496a33d9f4701ea
+  data.tar.gz: ee2846f65473cd2c917c54b428cbd467531a5fa91967c8896a2b489c659c2d1250db374382f941a8af747a0e5b39c5b30be8aedf35fdee29475f133354513e1a

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

@@ -12,7 +12,13 @@ module Effective
           @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))
+          if @redirect_to
+            redirect_to(@redirect_to)
+          elsif @skip_to
+            redirect_to(wizard_path(@skip_to))
+          else
+            redirect_to_finish_wizard(options, params)
+          end
         else
           flash.now[:danger] = options.delete(:error) || resource_flash(:danger, resource, action)
           render_step(wizard_value(step), options)

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.33'.freeze
+  VERSION = '1.8.37'.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.33
+  version: 1.8.37
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails