effective_resources 1.8.35 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889c24801967683844b62d1e659862a39e47bfc99cf184ff77b9ecb9f0dbc16a
-  data.tar.gz: a39a146b713bc41482f35df016f3309c8afedef75531c5066479fe8d3ca6100c
+  metadata.gz: e170a1dbe4e16bf76c3048540a98601f3944fb624ba7f6dc50a25d31d0c6b528
+  data.tar.gz: 3e0c48d4caa389595a6b77f7ab7f6ad00c469d397e0962d443ec04a8129d73cb
 SHA512:
-  metadata.gz: ac2de13588b807efd3fb9c048c0e180701d9b0dff54bf4ff1c44a86eb211b4ab9fc17da5fbea84725ce4c6cdc17fc9d242e749d257dd778209a7127655cc22bc
-  data.tar.gz: a7dd80308162e111383edb92c5964e32c7397116b574df8c20460e9571a705985f3b1d8ef6be28b9d743c08a89500fd34f2a830fa37751452db058fc34918c88
+  metadata.gz: ea9eefce2138894165ba88a81f5fbefa0edd500046aed321bd11ad6b93181b5cc9a36ba51668d869b59043e629c71577e026a97dd9667117f864db7b3199eaa9
+  data.tar.gz: f01e4bcef353c0fd5865b4cb046eb3814acf7172c357b8f2b6b7a9f9456f3209d1a13f0931ed67bb7804e891e6a79aab7ef774b85996d7f07e5872e0b84069db

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/lib/effective_resources/effective_gem.rb

@@ -8,22 +8,23 @@ 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
 
   module ClassMethods
     def config(namespace = nil)
       namespace ||= Tenant.current if defined?(Tenant)
-      @config.dig(namespace) || @config
+      @config.dig(namespace) || @config.dig(:effective)
     end
 
     def setup(namespace = nil, &block)
       @config ||= ActiveSupport::OrderedOptions.new
+
       namespace ||= Tenant.current if defined?(Tenant)
+      namespace ||= :effective
 
-      if namespace
-        @config[namespace] ||= ActiveSupport::OrderedOptions.new
-      end
+      @config[namespace] ||= ActiveSupport::OrderedOptions.new
 
       yield(config(namespace))
 

data/lib/effective_resources/version.rb

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