invisible_record 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e72f11da44f9f26a2bdb59d3ad4c141a03213c4879283ddb77fa16e0601ada23
-  data.tar.gz: b13ded4cf1304d6fc467c809cf1bc26a5ea3aa5b54e73214253178d26fbec4aa
+  metadata.gz: 348e376c69c70a25be9552144601bb87c486d4c43da5f1d7d0baa9ec1e64b459
+  data.tar.gz: 4880ab1e4c89a1525a529da2004b5147fa918241f97a17966871974270ac8368
 SHA512:
-  metadata.gz: b9badeaeb8d1ebb13053bc4112735e8d4f749bc87f248c508a437df2ecc42b387590c933bed268231b289458785932efbc1bc4ec75d2e7580431ef85c19a5e37
-  data.tar.gz: dc93e16661ad86b4191b4a237d51dfd581bf50fe050963b301324282373887048180089424eb8b32eb6b364bf18874ab4a15b30ea3ed8c31efb34c5d739a7764
+  metadata.gz: 8ce93f839707533489f85284cd4efdd2a6f70d418541e535bcb9821ce2247c3730e25b053a3289d804784d299f51929a9629495d27f2cf9858e04a98d8216405
+  data.tar.gz: 342fd0ecec940b99e213318255ffc2259a43cb295c13f0894649f769042e2e74ffcabed14a3324dcd11db487fe0b4169517570253771cec5113595d305313d00

data/Gemfile.lock

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

data/lib/invisible_record/model.rb

@@ -1,29 +1,30 @@
 # frozen_string_literal: true
 
 require "invisible_record/helper"
+require "invisible_record/scopes"
 
 module InvisibleRecord
   # Add invisible behavior to an ActiveRecord Model
   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?)
 
+      include Scopes
+
+      define_default_scopes(deleted_ts_attr: deleted_timestamp_attr)
+
       class_eval do
         class << self
           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/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.5"
+  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.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Rejón
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-23 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: