invisible_record 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ac4450dcab5420d45df80a3b43cc4832c9aa65fd9d7203b8c5a7d2190bd591
-  data.tar.gz: f3fe66959227813ce9f5e29c230ee385472aae5e041012b0e60033f88352ab9d
+  metadata.gz: 348e376c69c70a25be9552144601bb87c486d4c43da5f1d7d0baa9ec1e64b459
+  data.tar.gz: 4880ab1e4c89a1525a529da2004b5147fa918241f97a17966871974270ac8368
 SHA512:
-  metadata.gz: e1a71ee0832cd81b8c00657f08ce83e3fa08ac412cdb562b2548c261f7720636f6a8e59a38f24912b1dc4daf8b1cb0274696ab42bcfa85392fbf55687330658f
-  data.tar.gz: c5cd6aec9d2204a15b592938f12063231ecdd5f048a80683072a3ad43469a70231d945a184fc4031f44e63bda5b90582438f0e528d2371ce69484ea8b0ee656d
+  metadata.gz: 8ce93f839707533489f85284cd4efdd2a6f70d418541e535bcb9821ce2247c3730e25b053a3289d804784d299f51929a9629495d27f2cf9858e04a98d8216405
+  data.tar.gz: 342fd0ecec940b99e213318255ffc2259a43cb295c13f0894649f769042e2e74ffcabed14a3324dcd11db487fe0b4169517570253771cec5113595d305313d00

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    invisible_record (0.1.2)
+    invisible_record (0.2.0)
       activemodel (>= 5)
       activerecord (>= 5)
 

data/lib/invisible_record/helper.rb

@@ -21,8 +21,10 @@ module InvisibleRecord
         send(assign_timestamp, options[:datetime])
       end
 
-      klass.define_method "soft_delete!" do |*_args|
-        soft_delete
+      klass.define_method "soft_delete!" do |*args|
+        options = args.last || {}
+        options[:datetime] ||= DateTime.now
+        soft_delete(datetime: options[:datetime])
         save!
       end
     end
@@ -30,7 +32,10 @@ module InvisibleRecord
     def self.define_hidden_attributes(klass, deleted_ts_attr:)
       klass.attribute_names.each do |attribute|
         klass.define_method attribute do |*_args|
-          return attributes[deleted_ts_attr] if attribute == deleted_ts_attr
+          protected_attributes = ["id", deleted_ts_attr]
+          protected_attributes.each do |protected_attr_name|
+            return attributes[protected_attr_name] if attribute == protected_attr_name
+          end
 
           if attributes[deleted_ts_attr].present?
             nil

data/lib/invisible_record/model.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "invisible_record/helper"
+require "invisible_record/scopes"
 
 module InvisibleRecord
   # Add invisible behavior to an ActiveRecord Model
@@ -10,6 +11,10 @@ module InvisibleRecord
       deleted_timestamp_attr = options[:deleted_timestamp_attribute] || "deleted_at"
       raise "Only call acts_as_invisible once per model" if respond_to?(:invisible_record_model?)
 
+      include Scopes
+
+      define_default_scopes(deleted_ts_attr: deleted_timestamp_attr)
+
       class_eval do
         class << self
           def invisible_record_model?

data/lib/invisible_record/scopes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module InvisibleRecord
+  # Define scopes for the invisible record
+  module Scopes
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    # Define methods for Scopes
+    module ClassMethods
+      protected
+
+      def define_default_scopes(deleted_ts_attr:)
+        default_scope { where(deleted_ts_attr => nil) }
+        scope :include_deleted, -> { unscoped.all }
+        scope :deleted, -> { unscoped.where.not(deleted_ts_attr => nil) }
+      end
+    end
+  end
+end

data/lib/invisible_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InvisibleRecord
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_record
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Rejón
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -92,6 +92,7 @@ files:
 - lib/invisible_record.rb
 - lib/invisible_record/helper.rb
 - lib/invisible_record/model.rb
+- lib/invisible_record/scopes.rb
 - lib/invisible_record/version.rb
 homepage: https://github.com/FirstRootInc/invisible-record
 licenses: