invisible_record 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d70c2835b8f94f922df18a8bec3033a3dda6cfbcbbaf91520e6e4a34e2d32b4
-  data.tar.gz: 30ef867d5777a27f1d8ba84e3ffa3b5108114a74ab28b50a0b29a168d660f11a
+  metadata.gz: e72f11da44f9f26a2bdb59d3ad4c141a03213c4879283ddb77fa16e0601ada23
+  data.tar.gz: b13ded4cf1304d6fc467c809cf1bc26a5ea3aa5b54e73214253178d26fbec4aa
 SHA512:
-  metadata.gz: 6be0ba5a6f8deb7e4ccf880bfb97b73242003bc230bd1f46e55667abaa002d7caff73311cb30f4f68cc7af4d8682362108e5adc27a711da44064bec9313420e4
-  data.tar.gz: 1fa1c02848b3d208b8f593a02f18e40992a6c27429c0fce2351b1914ec396c2855f06e250e7604f6ee205738687a6a1d89e9cfb46017f77a3953bd3e8f09d6a6
+  metadata.gz: b9badeaeb8d1ebb13053bc4112735e8d4f749bc87f248c508a437df2ecc42b387590c933bed268231b289458785932efbc1bc4ec75d2e7580431ef85c19a5e37
+  data.tar.gz: dc93e16661ad86b4191b4a237d51dfd581bf50fe050963b301324282373887048180089424eb8b32eb6b364bf18874ab4a15b30ea3ed8c31efb34c5d739a7764

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    invisible_record (0.1.1)
+    invisible_record (0.1.5)
       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

@@ -7,7 +7,7 @@ module InvisibleRecord
   module Model
     def acts_as_invisible(**options)
       options.deep_symbolize_keys!
-      deleted_timestamp_attr = options[:deleted_timestamp_attribute] || "deleted_at"
+      @_deleted_timestamp_attr = options[:deleted_timestamp_attribute] || "deleted_at"
       raise "Only call acts_as_invisible once per model" if respond_to?(:invisible_record_model?)
 
       class_eval do
@@ -15,11 +15,15 @@ module InvisibleRecord
           def invisible_record_model?
             true
           end
+
+          def without_deleted
+            where(@_deleted_timestamp_attr => nil)
+          end
         end
 
-        Helper.define_hidden_attributes self, deleted_ts_attr: deleted_timestamp_attr
+        Helper.define_hidden_attributes self, deleted_ts_attr: @_deleted_timestamp_attr
 
-        Helper.define_actions self, deleted_ts_attr: deleted_timestamp_attr
+        Helper.define_actions self, deleted_ts_attr: @_deleted_timestamp_attr
       end
     end
   end

data/lib/invisible_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_record
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Rejón
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel