concerns_on_rails 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0679c4f78651169ae85fbf3f27d0a301d6ca33c148eb3e01c766252145c5be4c'
-  data.tar.gz: cec6963e3ba583e9072b03de751adbd1362dc100b041d5addf8cb37ebacd1d41
+  metadata.gz: 603d571510be78d62d3d71f071b703dbf70bf505e6463e1766e4a99c4c039012
+  data.tar.gz: eefa6a75c74a0ff0db01e129cc85c73af7ae3b16fb38c2ceab757ff5fc1e2656
 SHA512:
-  metadata.gz: c2ffaa1b86bd6c7952857c88e326009a85699bb77364e0b42e6cd8bfa11614917c3cf2fbae94af08bf2262210968878b65c37b22856bb8bac95345d81533fa57
-  data.tar.gz: e387756b366d70efff292dd40b1a8cf34dfeb04321140c2e4e03833c754975afb1686df499fd6ddefc4e83e7c7347851e62c1bc2a8f7d1f9e51d0c7f3cae50ca
+  metadata.gz: 01b37a0a698df95131be947ebc0874c970dc1f4cadf591aca2de84b1bc4da8075967cc5d469a45713165d07c763e55c7296b34a621248bffa82e7af127c5b5b0
+  data.tar.gz: e0978b66b4208ef653563602e9b153f10f56867cd2ad821ae8323f12fad8eff9c917127f64ae567a0ffa62945b562c5244aed72e743419e47a22a1de8f121ad1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 <!-- CHANGELOG.md -->
 
+## 1.1.0 (2025-04-17)
+
+### Added
+- SoftDeletable: Add soft delete concern with configurable field, scopes, callbacks, and default_scope support
+
 ## 1.0.0 (2025-04-12)
 
 ### Added

data/README.md

@@ -1,18 +1,19 @@
-# ConcernsOnRails
+# 🧩 ConcernsOnRails
 
-**Note: Hoàng Sa and Trường Sa belong to Việt Nam.** 🇻🇳
+**🇻🇳 Note: Hoàng Sa and Trường Sa belong to Việt Nam.**
 
 A simple collection of reusable Rails concerns to keep your models clean and DRY.
 
-## Features
+## ✨ Features
 
 - ✅ `Sluggable`: Generate friendly slugs from a specified field
-- ✅ `Sortable`: Sort records based on a field using `acts_as_list`, with flexible sorting field and direction
-- ✅ `Publishable`: Easily manage published/unpublished records using a simple `published_at` field
+- 🔢 `Sortable`: Sort records based on a field using `acts_as_list`, with flexible sorting field and direction
+- 📤 `Publishable`: Easily manage published/unpublished records using a simple `published_at` field
+- ❌ `SoftDeletable`: Soft delete records using a configurable timestamp field (e.g., `deleted_at`) with automatic scoping
 
 ---
 
-## Installation
+## 📦 Installation
 
 Add this line to your application's Gemfile:
 
@@ -28,9 +29,9 @@ bundle install
 
 ---
 
-## Usage
+## 🚀 Usage
 
-### 1. Sluggable
+### 1. 📝 Sluggable
 
 Add slugs based on a specified attribute.
 
@@ -49,7 +50,7 @@ If the slug source is changed, the slug will auto-update.
 
 ---
 
-### 2. Sortable
+### 2. 🔢 Sortable
 
 Use for models that need ordering.
 
@@ -76,16 +77,16 @@ end
 ```
 
 Additional features:
-- Automatically sets `acts_as_list` on the configured column
-- Adds default sorting scope to your model
-- Supports custom direction: `:asc` or `:desc`
-- Validates that the sortable field exists in the table schema
-- Compatible with scopes and ActiveRecord queries
-- Can be reconfigured dynamically within the model using `sortable_by`
+- 📌 Automatically sets `acts_as_list` on the configured column
+- 📋 Adds default sorting scope to your model
+- ↕️ Supports custom direction: `:asc` or `:desc`
+- 🔍 Validates that the sortable field exists in the table schema
+- 🧠 Compatible with scopes and ActiveRecord queries
+- 🔄 Can be reconfigured dynamically within the model using `sortable_by`
 
 ---
 
-### 3. Publishable
+### 3. 📤 Publishable
 
 Manage published/unpublished records using a `published_at` field.
 
@@ -108,17 +109,92 @@ article.published? # => false
 ```
 
 Additional features:
-- `published?` returns true if `published_at` is present and in the past
-- `publish!` sets `published_at` to current time
-- `unpublish!` sets `published_at` to `nil`
-- Add scopes: `.published`, `.unpublished`, and a default scope (optional)
-- Ideal for blog posts, articles, or any content that toggles visibility
-- Lightweight and non-invasive
-- Easy to test and override in custom implementations
+- ✅ `published?` returns true if `published_at` is present and in the past
+- 🕒 `publish!` sets `published_at` to current time
+- 🚫 `unpublish!` sets `published_at` to `nil`
+- 🔎 Add scopes: `.published`, `.unpublished`, and a default scope (optional)
+- 📰 Ideal for blog posts, articles, or any content that toggles visibility
+- 🧩 Lightweight and non-invasive
+- 🧪 Easy to test and override in custom implementations
 
 ---
 
-## Development
+### 4. ❌ SoftDeletable
+
+Soft delete records using a timestamp field (default: `deleted_at`).
+
+```ruby
+class User < ApplicationRecord
+  include ConcernsOnRails::SoftDeletable
+
+  # Optional: customize field and touch behavior
+  soft_deletable_by :deleted_at, touch: true
+end
+```
+
+#### Scopes
+```ruby
+User.without_deleted   # => returns only active users
+User.soft_deleted      # => returns soft-deleted users
+User.active            # => same as without_deleted
+User.all               # => returns only non-deleted by default (default_scope applied)
+```
+
+#### Soft delete and restore
+```ruby
+user.soft_delete!      # Soft delete the user (sets deleted_at)
+user.deleted?          # => true
+user.soft_deleted?     # => true (alias)
+user.is_soft_deleted?  # => true (alias)
+
+user.restore!          # Restore the user (sets deleted_at to nil)
+user.deleted?          # => false
+```
+
+#### Permanently delete
+```ruby
+user.really_delete!    # Hard delete the record from DB
+```
+
+#### Soft delete/hard delete all records
+```ruby
+User.destroy_all           # Soft delete all users (sets deleted_at)
+User.really_destroy_all    # Hard delete ALL users (removes from DB)
+```
+
+#### Callbacks (Hooks)
+You can use the following hooks to run logic before/after soft delete or restore:
+```ruby
+class User < ApplicationRecord
+  include ConcernsOnRails::SoftDeletable
+
+  def before_soft_delete
+    # Code to run before soft delete
+  end
+
+  def after_soft_delete
+    # Code to run after soft delete
+  end
+
+  def before_restore
+    # Code to run before restore
+  end
+
+  def after_restore
+    # Code to run after restore
+  end
+end
+```
+
+#### Notes
+- Default field is `deleted_at`, can be changed with `soft_deletable_by :your_field`
+- `touch: false` to skip updating updated_at when soft deleting/restoring
+- Aliases for `deleted?`: `soft_deleted?`, `is_soft_deleted?`
+- All scopes and methods work seamlessly with ActiveRecord
+
+---
+
+## 🛠️ Development
 
 To build the gem:
 
@@ -134,13 +210,13 @@ gem install ./concerns_on_rails-1.0.0.gem
 
 ---
 
-## Contributing
+## 🤝 Contributing
 
 Bug reports and pull requests are welcome!
 
 ---
 
-## License
+## 📄 License
 
 This project is licensed under the MIT License.
 
@@ -150,11 +226,11 @@ This project is licensed under the MIT License.
 
 ---
 
-### 📦 Source Code
+### 🔗 Source Code
 
 The source code is available on GitHub:
 
-🔗 [https://github.com/VSN2015/concerns_on_rails](https://github.com/VSN2015/concerns_on_rails)
+[👉 https://github.com/VSN2015/concerns_on_rails](https://github.com/VSN2015/concerns_on_rails)
 
 Feel free to star ⭐️, fork 🍴, or contribute with issues and PRs.
 

data/lib/concerns_on_rails/publishable.rb

@@ -4,28 +4,22 @@ module ConcernsOnRails
   module Publishable
     extend ActiveSupport::Concern
 
-    # instance methods
     included do
-      # declare class attributes and set default values
-      class_attribute :publishable_field
-      self.publishable_field ||= :published_at
+      class_attribute :publishable_field, instance_accessor: false, default: :published_at
+
+      scope :published, -> { where(arel_table[publishable_field].lteq(Time.zone.now)) }
+      scope :unpublished, -> {
+        where(arel_table[publishable_field].eq(nil).or(arel_table[publishable_field].gt(Time.zone.now)))
+      }
     end
 
-    # class methods
     class_methods do
-      # Define publishable field
-      # Example:
-      #   publishable_by :published_at
       def publishable_by(field = nil)
         self.publishable_field = field || :published_at
 
-        # validate publishable_field exists in database
         unless column_names.include?(publishable_field.to_s)
           raise ArgumentError, "ConcernsOnRails::Publishable: publishable_field '#{publishable_field}' does not exist in the database"
         end
-
-        scope :published, -> { where(arel_table[publishable_field].not_eq(nil)) }
-        scope :unpublished, -> { where(arel_table[publishable_field].eq(nil)) }
       end
     end
 
@@ -48,7 +42,9 @@ module ConcernsOnRails
     # Example:
     #   record.published?
     def published?
-      self[self.class.publishable_field].present?
+      value = self[self.class.publishable_field]
+      return false unless value.present?
+      value.respond_to?(:<=) ? value <= Time.zone.now : true
     end
 
     # Check if the record is unpublished

data/lib/concerns_on_rails/sluggable.rb

@@ -8,7 +8,7 @@ module ConcernsOnRails
     # instance methods
     included do
       # declare class attributes and set default values
-      class_attribute :sluggable_field
+      class_attribute :sluggable_field, instance_accessor: false
       self.sluggable_field ||= :name
 
       extend FriendlyId
@@ -51,13 +51,8 @@ module ConcernsOnRails
     # Example:
     #   record.slug_source
     def slug_source
-      if self.class.sluggable_field.present? && respond_to?(self.class.sluggable_field)
-        send(self.class.sluggable_field)
-      elsif respond_to?(:title)
-        title
-      else
-        to_s
-      end
+      field = self.class.sluggable_field
+      respond_to?(field) ? send(field) : to_s
     end
   end
 end

data/lib/concerns_on_rails/soft_deletable.rb

@@ -0,0 +1,100 @@
+require "active_support/concern"
+
+module ConcernsOnRails
+  module SoftDeletable
+    extend ActiveSupport::Concern
+
+    included do
+      # declare class attributes and set default values
+      class_attribute :soft_delete_field, instance_accessor: false, default: :deleted_at
+      class_attribute :soft_delete_touch, instance_accessor: false, default: true
+      
+      # scopes
+      scope :active, -> { unscope(where: soft_delete_field).where(soft_delete_field => nil) }
+      scope :without_deleted, -> { unscope(where: soft_delete_field).where(soft_delete_field => nil) }
+      scope :soft_deleted, -> { unscope(where: soft_delete_field).where.not(soft_delete_field => nil) }
+      # Optionally, uncomment to hide deleted by default:
+      default_scope { without_deleted }
+
+    end
+
+    class_methods do
+      # Define soft delete field and options
+      # Example:
+      #   soft_deletable_by :deleted_at, touch: false
+      def soft_deletable_by(field = nil, touch: true)
+        self.soft_delete_field = field || :deleted_at
+        self.soft_delete_touch = touch
+
+        unless column_names.include?(soft_delete_field.to_s)
+          raise ArgumentError, "ConcernsOnRails::SoftDeletable: soft_delete_field '#{soft_delete_field}' does not exist in the database"
+        end
+      end
+
+      # Override destroy_all to perform soft delete on all records
+      def destroy_all
+        all.each(&:soft_delete!)
+      end
+
+      # Provide really_destroy_all to hard delete all records
+      def really_destroy_all
+        unscoped.delete_all
+      end
+    end
+
+    # Soft delete hooks
+    def before_soft_delete; end
+    def after_soft_delete; end
+    def before_restore; end
+    def after_restore; end
+
+    def soft_delete!
+      return true if deleted?
+      before_soft_delete
+      result = if self.class.soft_delete_touch
+        update(self.class.soft_delete_field => Time.zone.now)
+      else
+        update_column(self.class.soft_delete_field, Time.zone.now)
+      end
+      after_soft_delete if result
+      result
+    end
+
+    def restore!
+      return true unless deleted?
+      before_restore
+      result = if self.class.soft_delete_touch
+        update(self.class.soft_delete_field => nil)
+      else
+        update_column(self.class.soft_delete_field, nil)
+      end
+      after_restore if result
+      result
+    end
+
+    # bypasses AR callbacks and validations — use when you want a true hard delete
+    def really_delete!
+      self.class.unscoped.where(self.class.primary_key => id).delete_all
+      freeze
+    end
+  
+    def deleted?
+      self[self.class.soft_delete_field].present?
+    end
+
+    # alias methods
+    # define here to avoid issue: undefined method `deleted?' for module `ConcernsOnRails::SoftDeletable'
+    alias_method :is_soft_deleted?, :deleted?
+    alias_method :soft_deleted?, :deleted?
+
+    def is_really_deleted?
+      !self.class.unscoped.exists?(id)
+    end
+  end
+end
+
+# Usage Example:
+# class MyModel < ApplicationRecord
+#   include ConcernsOnRails::SoftDeletable
+#   soft_deletable_by :deleted_at
+# end

data/lib/concerns_on_rails/sortable.rb

@@ -14,15 +14,20 @@ module ConcernsOnRails
     #   end
     included do
       # declare class attributes
-      class_attribute :sortable_field
-      class_attribute :sortable_direction
+      class_attribute :sortable_field, instance_accessor: false
+      class_attribute :sortable_direction, instance_accessor: false
 
       # set default values
       self.sortable_field ||= :position
       self.sortable_direction ||= :asc
 
       # we cannot use acts_as_list here
-      default_scope { order(sortable_field => sortable_direction) }
+      default_scope do
+        unless column_names.include?(sortable_field.to_s)
+          raise ArgumentError, "#{name}: '#{sortable_field}' column not found. Call `sortable_by :your_column` to configure the sort field."
+        end
+        order(sortable_field => sortable_direction)
+      end
     end
 
     # class methods
@@ -48,12 +53,7 @@ module ConcernsOnRails
 
         validate_sortable_field!
 
-        # add acts_as_list and default scope
-        # Setup sorting behaviors
         acts_as_list column: sortable_field if use_acts_as_list
-
-        # add default scope: position => asc
-        default_scope { order(sortable_field => sortable_direction) }
       end
 
       private

data/lib/concerns_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ConcernsOnRails
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/concerns_on_rails.rb

@@ -3,6 +3,7 @@ require "concerns_on_rails/version"
 require "concerns_on_rails/sortable"
 require "concerns_on_rails/publishable"
 require "concerns_on_rails/sluggable"
+require "concerns_on_rails/soft_deletable"
 
 module ConcernsOnRails
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: concerns_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ethan Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-12 00:00:00.000000000 Z
+date: 2026-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,7 @@ files:
 - lib/concerns_on_rails.rb
 - lib/concerns_on_rails/publishable.rb
 - lib/concerns_on_rails/sluggable.rb
+- lib/concerns_on_rails/soft_deletable.rb
 - lib/concerns_on_rails/sortable.rb
 - lib/concerns_on_rails/version.rb
 homepage: https://github.com/VSN2015/concerns_on_rails
@@ -90,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Reusable Rails concerns like Sortable, Publishable, and Sluggable