rails_admin_draft 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0536b226a2009c0cea3563c66e3eb6e200a7b006cc211206a71c311f00e3964
-  data.tar.gz: ac2c6be6868bb2099ee3b8d68a3cb19efa5ce4e6e76850d164a1959cd9c17527
+  metadata.gz: 50f58bc7bf92dc6416841d6c1f6d45ec06d10c08c8c2c73c6ef44d9a992c0fc0
+  data.tar.gz: e9c3a67f666a61995fd37c687b9b2a1b35d0cfde738e905b6f2d5af2e47a19b6
 SHA512:
-  metadata.gz: 0c539d9f9642a1e39aff7fae1f90d406b30380f1b0d52392cb4ad9e447fcc2a9bf9693d3386454814340ef98404f843108b096acb05ac7f61acb53e27781c4eb
-  data.tar.gz: 78dd9721239eb16052a5f44ba685d37d9f915c6b923945b7dfa0ac7b379139ed2259644bf5213b6bf9abe2fe3b68119467ef78637a84f4969a2ec946ea4853fc
+  metadata.gz: d727b538cd1d7c1ee072fd03575215df9c651f9396f31dc5f58af2c2246e55f13ff49f5741f460a37351221351877dc0dfbbc6693def7bde51607b996b50b639
+  data.tar.gz: 845c88469340f36465b6b71f91dbd2e5ca1b7afc69edb15e06b0a22e3fd5abd4ca4dfc35edd7f1a324d63c9c1255db67ffd1bae83532a18cc170ce69462f4451

data/README.md

@@ -43,7 +43,7 @@ $ rake db:migrate
 ```ruby
 class MyModel < ApplicationRecord
   include DraftConcern
-  set_draft_relation(klass_name: "MyModel")
+  has_draft
 end
 ```
 

data/app/views/rails_admin/main/edit.html.erb

@@ -1,6 +1,9 @@
 <% if @draft_conf.draft? && @object.is_draft? %>
   <div class="alert alert-dark">
-    <b><%=I18n.t('admin.form.draft_header')%></b>
+    <b><%= I18n.t('admin.form.draft_header') %></b>
+    <% if @object.draft_source_id.present? %>
+      <%= I18n.t('admin.form.of' )%> <%= link_to "#{@object.class.name} ID:1", edit_path(@abstract_model, @object.draft_source_id) %>
+    <% end %>
   </div>
 <% end %>
 

data/config/locales/rails_admin_draft/en.yml

@@ -18,6 +18,7 @@ en:
 
     form:
       draft_header: Draft
+      of: of
       buttons:
         save_draft:
           title: Save as draft

data/config/locales/rails_admin_draft/fr.yml

@@ -18,6 +18,7 @@ fr:
 
     form:
       draft_header: Brouillon
+      of: de
       buttons:
         save_draft:
           title: Enregistrer au statut brouillon. Ne sera pas visible sur le site public.

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
 
@@ -98,8 +103,8 @@ module DraftConcern
 
   class_methods do
     # Creates bi-directional association for draft source.
-    def set_draft_relation(klass_name:)
-      association_class_name = klass_name.to_s
+    def has_draft
+      association_class_name = self.name.to_s
       class_eval do
         has_one :draft, class_name: "#{association_class_name}", foreign_key: :draft_source_id, inverse_of: :draft_source
         belongs_to :draft_source, class_name: "#{association_class_name}", optional: true

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.1'.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.1
+  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