rails_admin_draft 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96122c2d58423d2a963678b8fc06a923ff234f9ca7b6b038901acca099c8993e
-  data.tar.gz: 6a5557f4e8dbb370ed79553fde57e65c1421583c82e9a6ea19ebb45ae6d3b061
+  metadata.gz: 50f58bc7bf92dc6416841d6c1f6d45ec06d10c08c8c2c73c6ef44d9a992c0fc0
+  data.tar.gz: e9c3a67f666a61995fd37c687b9b2a1b35d0cfde738e905b6f2d5af2e47a19b6
 SHA512:
-  metadata.gz: ada57b779764918b92cfc142d926935e6efd74bae1f5987cd4c440d32ae0e89769d82000c401749e5243e5c216e7f031fa996861e7a90f6fff53d3a9d65f229f
-  data.tar.gz: 5aeb25e7a722359a25133bd8656fd7d0e3104f854c4e4cc159e6918d4af96eedd3fa013eda69e556e0c67c450a5bb0c88a6baee43d84749d162fef772ee2c978
+  metadata.gz: d727b538cd1d7c1ee072fd03575215df9c651f9396f31dc5f58af2c2246e55f13ff49f5741f460a37351221351877dc0dfbbc6693def7bde51607b996b50b639
+  data.tar.gz: 845c88469340f36465b6b71f91dbd2e5ca1b7afc69edb15e06b0a22e3fd5abd4ca4dfc35edd7f1a324d63c9c1255db67ffd1bae83532a18cc170ce69462f4451

data/lib/rails_admin_draft/concern/draft_concern.rb

@@ -55,22 +55,27 @@ module DraftConcern
       return if !self.is_draft?
       model_to_publish = self
 
-      ActiveRecord::Base.transaction do
-        if self.draft_source_id.present?
-          model_to_publish = Draft::OverwriteService.new(source: self, destination: self.draft_source).perform
-          model_to_publish.slug = self.slug # Keep same slug
-          if Object.const_defined?('DiscardConcern') && self.class.include?('DiscardConcern'.constantize)
-            self.destroy(true)
-          else
-            self.destroy
-          end
-          remove_draft_on_unique_text_fields(model_to_publish)
+      if self.draft_source_id.present?
+        # Save new image if we publish directly the draft
+        self.image.store! if self.image.present?
+        self.save!
+
+        model_to_publish = Draft::OverwriteService.new(source: self, destination: self.draft_source).perform
+        model_to_publish.slug = self.slug # Keep same slug
+
+        if Object.const_defined?('DiscardConcern') && self.class.include?('DiscardConcern'.constantize)
+          self.image.remove!
+          self.destroy(true)
+        else
+          self.image.remove!
+          self.destroy
         end
-
-        model_to_publish.draft_status = DraftStatus::PUBLISHED
-        model_to_publish.save!
+        remove_draft_on_unique_text_fields(model_to_publish)
       end
 
+      model_to_publish.draft_status = DraftStatus::PUBLISHED
+      model_to_publish.save!
+
       return model_to_publish
     end
 

data/lib/rails_admin_draft/services/draft/overwrite_service.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Draft
   class OverwriteService
     DRAFT_ASSOCIATIONS = [:draft, :draft_source]
@@ -46,8 +48,26 @@ module Draft
         return if attributes.blank?
 
         attributes.each do |attribute|
-          @destination.send(attribute).remove! if @destination.send(attribute).present?
+          if @destination.send(attribute).present?
+            destination_path = File.dirname(File.open(@destination.send(attribute).file.path))
+            @destination.send(attribute).remove!
+
+          end
+
           new_upload = @source.send(attribute).present? ? File.open(@source.send(attribute).file.path) : nil
+
+          if @source.image.present?
+            dir_source = @source.send(attribute).file.path.remove(@source.send(attribute).identifier)
+
+            Dir[File.join(dir_source, "*#{@source.send(attribute).identifier}")].each do | filename |
+              # copy if image destination is present
+              FileUtils.mv(filename, destination_path) if destination_path.present?
+            end
+          end
+
+          # Delete folder
+          FileUtils.remove_dir(dir_source, true) if dir_source.present?
+
           @destination.send("#{attribute}=", new_upload)
         end
       end

data/lib/rails_admin_draft/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminDraft
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_draft
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Grégory Huet
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails