active_admin_paranoia 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cec3ccee649c706e1af5a3886157a05724d49c6e
-  data.tar.gz: 3b032c0e20e70919ee52239b4d5fa28d6c35b251
+SHA256:
+  metadata.gz: 055f9b72d90db702ba38dd087081760cda800b33a9879ae1df282c7557176913
+  data.tar.gz: 129ed49e2a62ca78b0292682cae42bad0560f333207cac8e4c9042eb2c325f80
 SHA512:
-  metadata.gz: 3ccd4997e8c4725618b57111682ba767eb8f33b1260cfa9f4e8c9c4db9cec8ec9be35183138f27b04a18e33bc2c2edd27459b4eba38935e1ec771166c3aef783
-  data.tar.gz: 0f12c674b89af8789e83ee36ffe02df227c25c348e548309bf6703d6a9a410923dbe720b53ac1c26e31bc7d7f4de6c3dedca00f6c88db221edf54f65585d21aa
+  metadata.gz: 69bb0814bad755e5550fff43ab190ceb939058a460c9eed5d19b32082a73ed0e0d62fc47a29567e41c069538deabb99baa4b8fb2660b14fa9de91d01cdc57ae8
+  data.tar.gz: 7ec37543fb199d9afb1cc3fb444918cef7af4c2da1f97b8a84870759a50d4441dcebea59da6b1ad4eb0b2c3a52e36833187ab9760c85be093337de9d77d63294

data/README.md

@@ -20,3 +20,17 @@ ActiveAdmin.register Post do
   active_admin_paranoia
 end
 ```
+
+# Archiving (soft delete) vs Deleting (hard delete)
+
+The "Archive" button will call `#destroy` to soft delete the resource by setting the `deleted_at` column to the current time. 
+The "Delete" button will call `#really_destroy!` to hard delete the resource (by removing the records from the database).
+
+You can disable hard deletion by removing the `:destroy` action:
+
+```ruby
+ActiveAdmin.register Post do
+  active_admin_paranoia
+  actions :all, except: [:destroy]
+end
+```

data/config/locales/en.yml

@@ -1,17 +1,13 @@
 en:
-  active_admin:
-    delete_model: "Archive %{model}"
-    delete: "Archive"
-    delete_confirmation: "Are you sure you want to archive this?"
+  active_admin_paranoia:
+    archive_model: "Archive %{model}"
+    archive: "Archive"
+    archive_confirmation: "Are you sure you want to archive this?"
     batch_actions:
-      delete_confirmation: "Are you sure you want to archive these %{plural_model}?"
-      succesfully_destroyed:
+      archive_confirmation: "Are you sure you want to archive these %{plural_model}?"
+      succesfully_archived:
         one: "Successfully archived 1 %{model}"
         other: "Successfully archived %{count} %{plural_model}"
-      labels:
-        destroy: "Archive"
-  active_admin_paranoia:
-    batch_actions:
       restore_confirmation: "Are you sure you want to restore these %{plural_model}?"
       succesfully_restored:
         one: "Successfully restored 1 %{model}"

data/lib/active_admin_paranoia/authorization.rb

@@ -1,6 +1,7 @@
 module ActiveAdminParanoia
   # Default Authorization permission for ActiveAdminParanoia
   module Authorization
+    ARCHIVE = :do_archive
     RESTORE = :restore
     PERMANENT_DELETE = :permanent_delete
   end

data/lib/active_admin_paranoia/dsl.rb

@@ -1,51 +1,76 @@
 module ActiveAdminParanoia
   module DSL
     def active_admin_paranoia
-      controller do
-        def find_resource
-          resource_class.to_s.camelize.constantize.with_deleted.where(id: params[:id]).first!
-        end
-      end
+      archived_at_column = config.resource_class.paranoia_column
+      not_archived_value = config.resource_class.paranoia_sentinel_value
 
-      batch_action :destroy, confirm: proc{ I18n.t('active_admin.batch_actions.delete_confirmation', plural_model: resource_class.to_s.downcase.pluralize) }, if: proc{ authorized?(ActiveAdmin::Auth::DESTROY, resource_class) && params[:scope] != 'archived' } do |ids|
-        resource_class.to_s.camelize.constantize.where(id: ids).destroy_all
-        options = { notice: I18n.t('active_admin.batch_actions.succesfully_destroyed', count: ids.count, model: resource_class.to_s.camelize.constantize.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
+      do_archive = proc do |ids, resource_class, controller|
+        resource_class.where(id: ids).destroy_all
+        options = { notice: I18n.t('active_admin_paranoia.batch_actions.succesfully_archived', count: ids.count, model: resource_class.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
         # For more info, see here: https://github.com/rails/rails/pull/22506
         if Rails::VERSION::MAJOR >= 5
-          redirect_back({ fallback_location: ActiveAdmin.application.root_to }.merge(options))
+          controller.redirect_back(**{ fallback_location: ActiveAdmin.application.root_to }.merge(options))
         else
-          redirect_to :back, options
+          controller.redirect_to :back, options
+        end
+      end
+
+      controller do
+        def find_resource
+          resource_class.with_deleted.public_send(method_for_find, params[:id])
         end
+
+        # The "Delete" button should now really destroy the resource. (Click "Archive" to soft delete.)
+        # Remove the delete button with the following line:
+        #   actions :all, except: [:destroy]
+        def destroy_resource(object)
+          object.really_destroy!
+        end
+      end
+
+      batch_action :archive, confirm: proc{ I18n.t('active_admin_paranoia.batch_actions.archive_confirmation', plural_model: resource_class.to_s.downcase.pluralize) }, if: proc{ authorized?(ActiveAdminParanoia::Auth::ARCHIVE, resource_class) && params[:scope] != 'archived' } do |ids|
+        do_archive.call(ids, resource_class, self)
+      end
+
+      batch_action :destroy, if: proc { false } do
       end
 
       batch_action :restore, confirm: proc{ I18n.t('active_admin_paranoia.batch_actions.restore_confirmation', plural_model: resource_class.to_s.downcase.pluralize) }, if: proc{ authorized?(ActiveAdminParanoia::Auth::RESTORE, resource_class) && params[:scope] == 'archived' } do |ids|
-        resource_class.to_s.camelize.constantize.restore(ids, recursive: true)
-        options = { notice: I18n.t('active_admin_paranoia.batch_actions.succesfully_restored', count: ids.count, model: resource_class.to_s.camelize.constantize.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
+        resource_class.restore(ids, recursive: true)
+        options = { notice: I18n.t('active_admin_paranoia.batch_actions.succesfully_restored', count: ids.count, model: resource_class.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
         # For more info, see here: https://github.com/rails/rails/pull/22506
         if Rails::VERSION::MAJOR >= 5
-          redirect_back({ fallback_location: ActiveAdmin.application.root_to }.merge(options))
+          redirect_back(**{ fallback_location: ActiveAdmin.application.root_to }.merge(options))
         else
           redirect_to :back, options
         end
       end
 
-      action_item :restore, only: :show do
+      action_item :archive, only: :show, if: proc { !resource.send(archived_at_column) } do
+        link_to(I18n.t('active_admin_paranoia.archive_model', model: resource_class.to_s.titleize), "#{resource_path(resource)}/archive", method: :put, data: { confirm: I18n.t('active_admin_paranoia.archive_confirmation') }) if authorized?(ActiveAdminParanoia::Auth::ARCHIVE, resource)
+      end
+
+      action_item :restore, only: :show, if: proc { resource.send(archived_at_column) } do
         link_to(I18n.t('active_admin_paranoia.restore_model', model: resource_class.to_s.titleize), "#{resource_path(resource)}/restore", method: :put, data: { confirm: I18n.t('active_admin_paranoia.restore_confirmation') }) if authorized?(ActiveAdminParanoia::Auth::RESTORE, resource)
       end
 
+      member_action :archive, method: :put, confirm: proc{ I18n.t('active_admin_paranoia.archive_confirmation') }, if: proc{ authorized?(ActiveAdminParanoia::Auth::ARCHIVE, resource_class) } do
+        do_archive.call([resource.id], resource_class, self)
+      end
+
       member_action :restore, method: :put, confirm: proc{ I18n.t('active_admin_paranoia.restore_confirmation') }, if: proc{ authorized?(ActiveAdminParanoia::Auth::RESTORE, resource_class) } do
         resource.restore(recursive: true)
-        options = { notice: I18n.t('active_admin_paranoia.batch_actions.succesfully_restored', count: 1, model: resource_class.to_s.camelize.constantize.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
+        options = { notice: I18n.t('active_admin_paranoia.batch_actions.succesfully_restored', count: 1, model: resource_class.model_name, plural_model: resource_class.to_s.downcase.pluralize) }
         # For more info, see here: https://github.com/rails/rails/pull/22506
         if Rails::VERSION::MAJOR >= 5
-          redirect_back({ fallback_location: ActiveAdmin.application.root_to }.merge(options))
+          redirect_back(**{ fallback_location: ActiveAdmin.application.root_to }.merge(options))
         else
           redirect_to :back, options
         end
       end
 
-      scope(I18n.t('active_admin_paranoia.non_archived'), default: true) { |scope| scope.where(resource_class.to_s.camelize.constantize.paranoia_column => resource_class.to_s.camelize.constantize.paranoia_sentinel_value) }
-      scope(I18n.t('active_admin_paranoia.archived')) { |scope| scope.unscope(:where => resource_class.to_s.camelize.constantize.paranoia_column).where.not(resource_class.to_s.camelize.constantize.paranoia_column => resource_class.to_s.camelize.constantize.paranoia_sentinel_value) }
+      scope(I18n.t('active_admin_paranoia.non_archived'), default: true, show_count: false) { |scope| scope.unscope(:where => archived_at_column).where(archived_at_column => not_archived_value) }
+      scope(I18n.t('active_admin_paranoia.archived'), show_count: false) { |scope| scope.unscope(:where => archived_at_column).where.not(archived_at_column => not_archived_value) }
     end
   end
 end
@@ -56,7 +81,7 @@ module ActiveAdmin
       class IndexTableFor < ::ActiveAdmin::Views::TableFor
         alias_method :orig_defaults, :defaults
 
-        def defaults(resource, options = {})
+        def defaults(resource, **options)
           if resource.respond_to?(:deleted?) && resource.deleted?
             if controller.action_methods.include?('restore') && authorized?(ActiveAdminParanoia::Auth::RESTORE, resource)
               # TODO: find a way to use the correct path helper

data/lib/active_admin_paranoia/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminParanoia
-  VERSION = '1.0.11'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_paranoia
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Miah Raihan Mahmud Arman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,7 +64,7 @@ homepage: https://github.com/raihan2006i/active_admin_paranoia
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -79,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Paranoia extension for ActiveAdmin
 test_files: []