effective_resources 1.8.34 → 1.8.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3ce02ada5c7878e2c6fab4642ba84c4ba7dbb7fb5986c7f8bc135ea8e3258c
-  data.tar.gz: 375b538d786b4730626c5b7fb64a522ec04c789b750b25b2d4235f4617398e46
+  metadata.gz: a0ef8a137a53e9e2c1aa64630dfb9e90b0ae9bf3e5da8bcbc3e2f184b3273906
+  data.tar.gz: a467531f9b59542bdb1703b01ee8f5839019a1e540d7b0b35ecbe690a635ab11
 SHA512:
-  metadata.gz: 65954757632e43d089f173c0e09e421c8c6528d4aa7da4fe70c7b2f24ce0f4ee90646ec8908a778e356846643cfe9d8b924dc7af2fb800a1b4040b8876a05889
-  data.tar.gz: a1c6e51cba33a5489746a1d0954d547f4065fc75c69a87adaae35faca338c51ba91b36788c34729af74394b5d29ceeb9532b1d6acd7b8ffae06bf1ff29374f2b
+  metadata.gz: f2aa7368664b69915f1323908f096ced6228b98debdddc81afabca6cd6e73fcb5cb0a2e8e3fbf216a178448b4e038729836195fea5846f1b209f8b3cccd15210
+  data.tar.gz: 6f3138d9e04b9bd1de179211e12b71b5b338ea8324fab434bee70d6c6fdb30a67cf70f4ad06a7b2ecc3b4d7c033c994c2c85de0971a34989014a31006fea501e

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

@@ -55,10 +55,12 @@ 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]
+          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

@@ -293,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/effective_gem.rb

@@ -8,6 +8,7 @@ module EffectiveGem
 
     config_keys.each do |key|
       self.singleton_class.define_method(key) { config()[key] }
+      self.singleton_class.define_method("#{key}=") { |value| config()[key] = value }
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.34'.freeze
+  VERSION = '1.8.38'.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.34
+  version: 1.8.38
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails