deleted_at 0.6.0.pre.2 → 0.6.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9cf5aea9d0f1df96b7fd9d30396733d8d523a8cf6076abb7c8b79b8c4c9c2e8
-  data.tar.gz: 014e280a3bf095389b40d3b4f87f19335f4a1a4d538e08e60a95ced387ded595
+  metadata.gz: 661d2ca255bbab054db044f56237cc8fa6119dd86777f133d55952ad7e9951cf
+  data.tar.gz: e58379a9130a4e9b1bbd30672b659469171a254eddffd4f4b2734329c759cd0d
 SHA512:
-  metadata.gz: 2fcbea0f8620db2ee9ad31e6e278647acfeb1511f0f03e88a00e9669dcdd6de2e669f79e8838a2070477c5a6597957baf02f6ebfefabedeca46c3274da66c972
-  data.tar.gz: 6a998e6ba5e99f43d9c81923ada798670da76aaed3040fa83b24cf14f7a1088e2f3880bc34b985f431bfaf2be77f1ceb6b023a6da97f01cde106fc1bcb2e3934
+  metadata.gz: 2a488a453bef0c8fbc14694f88458a5ddb8fb24c7384ee528a16a31c2e72d6d7dd3e61596444391e26bfba802245cb75be83a9dc8d08cb28922ab3f35376d53f
+  data.tar.gz: 3949f4a143aedd3f0158888b8b07d53d011777750c7d2c672c65102a7880926b17c59fca055a1bd4e53f3ef8fdd8dc366d3ba391727fb2daa9c8425243f51ad3

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Dale Stevens
+Copyright (c) 2019 Dale Stevens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/deleted_at.rb

@@ -3,7 +3,7 @@ require 'deleted_at/railtie' if defined?(Rails::Railtie)
 
 module DeletedAt
 
-  MissingColumn = Class.new(StandardError)
+  MissingColumnError = Class.new(StandardError)
 
   DEFAULT_OPTIONS = {
     column: :deleted_at,

data/lib/deleted_at/active_record.rb

@@ -1,50 +1,73 @@
-require 'active_record'
-require 'deleted_at/relation'
-
 module DeletedAt
   module ActiveRecord
 
     def self.prepended(subclass)
-      subclass.init_deleted_at_relations
       subclass.extend(ClassMethods)
+
+      subclass.class_eval do
+        init_deleted_at_relations
+        default_frame { where(deleted_at[:column] => nil) }
+        frame :all, -> {}
+        frame :deleted, -> { where.not(deleted_at[:column] => nil) }
+      end
     end
 
     def initialize(*args)
-      super
-      @destroyed = !deleted_at.nil?
+      super.tap do
+        @destroyed = deleted_at_nil?
+      end
     end
 
     def destroy
-      soft_delete
-      super
+      run_callbacks(:destroy) do
+        soft_delete
+      end
     end
 
     def delete
       soft_delete
-      super
+    end
+
+    def destroy!
+      run_callbacks(:destroy) do
+        soft_delete
+      end
+    end
+
+    def delete!
+      soft_delete
     end
 
     private
 
     def soft_delete
+      return if destroyed?
       update_columns(self.class.deleted_at_attributes)
       @destroyed = true
+      freeze
+      self
+    end
+
+    def deleted_at_nil?
+      !read_attribute(self.class.deleted_at[:column]).nil?
     end
 
     module ClassMethods
 
       def inherited(subclass)
         super
-        subclass.init_deleted_at_relations
+        # subclass.init_deleted_at_relations if deleted_at[:inherit]
+      end
+
+      def deleted_at_attributes
+        attributes = {
+          deleted_at[:column] => deleted_at[:proc].call
+        }
       end
 
-      def const_missing(const)
-        case const
-        when :All, :Deleted
-          all.tap do |_query|
-            _query.deleted_at_scope = const
-          end
-        else super
+      def init_deleted_at_relations
+        instance_variable_get(:@relation_delegate_cache).each do |base, klass|
+          klass.send(:prepend, DeletedAt::Relation)
         end
       end
 

data/lib/deleted_at/core.rb

@@ -1,5 +1,4 @@
 require 'deleted_at/active_record'
-
 module DeletedAt
 
   module Core
@@ -15,39 +14,33 @@ module DeletedAt
 
     def self.raise_missing(klass)
       message = "Missing `#{klass.deleted_at[:column]}` in `#{klass.name}` when trying to employ `deleted_at`"
-      raise(DeletedAt::MissingColumn, message)
+      raise(DeletedAt::MissingColumnError, message)
     end
 
     def self.has_deleted_at_column?(klass)
       klass.columns.map(&:name).include?(klass.deleted_at.dig(:column).to_s)
     end
 
+    def self.deleted_at_ready?(klass)
+      !::DeletedAt.disabled? &&
+      klass != ::ActiveRecord::Base &&
+      !klass.abstract_class? &&
+      klass.connected? &&
+      klass.table_exists? &&
+      !(klass < DeletedAt::ActiveRecord)
+    end
+
     module ClassMethods
 
       def with_deleted_at(options={}, &block)
         self.deleted_at = DeletedAt::DEFAULT_OPTIONS.merge(options)
         self.deleted_at[:proc] = block if block_given?
 
-        return if ::DeletedAt.disabled?
-
+        return unless Core.deleted_at_ready?(self)
         DeletedAt::Core.raise_missing(self) unless Core.has_deleted_at_column?(self)
 
         self.prepend(DeletedAt::ActiveRecord)
-
       end
-
-      def deleted_at_attributes
-        attributes = {
-          deleted_at[:column] => deleted_at[:proc].call
-        }
-      end
-
-      def init_deleted_at_relations
-        instance_variable_get(:@relation_delegate_cache).each do |base, klass|
-          klass.send(:prepend, DeletedAt::Relation)
-        end
-      end
-
     end # End ClassMethods
 
   end

data/lib/deleted_at/railtie.rb

@@ -1,4 +1,6 @@
 require 'rails/railtie'
+require 'active_record/framing'
+require 'deleted_at/relation'
 require 'deleted_at/core'
 require 'deleted_at/table_definition'
 
@@ -8,6 +10,7 @@ module DeletedAt
       ActiveSupport.on_load(:active_record) do
         ::ActiveRecord::Base.prepend(DeletedAt::Core)
         ::ActiveRecord::ConnectionAdapters::TableDefinition.prepend(DeletedAt::TableDefinition)
+        # ::ActiveRecord::Associations::Association.prepend(DeletedAt::Association)
       end
     end
   end

data/lib/deleted_at/relation.rb

@@ -1,50 +1,5 @@
 module DeletedAt
   module Relation
-
-    def self.prepended(subclass)
-      subclass.class_eval do
-        attr_writer :deleted_at_scope
-      end
-    end
-
-    def deleted_at_scope
-      @deleted_at_scope ||= :Present
-    end
-
-    def deleted_at_select
-      scoped_arel = case deleted_at_scope
-      when :Deleted
-        vanilla.dup.where(table[klass.deleted_at[:column]].not_eq(nil))
-      when :Present
-        vanilla.dup.where(table[klass.deleted_at[:column]].eq(nil))
-      end
-    end
-
-    def vanilla
-      # @vanilla ||= klass.const_get(:All).unscope(:where).freeze
-      @vanilla ||= klass.unscoped.tap do |rel|
-        rel.deleted_at_scope = :All
-      end.freeze
-    end
-
-    # Rails 4.x
-    def from_value
-      if (subselect = deleted_at_select)
-        [subselect, ::ActiveRecord::Base.connection.quote_table_name(table_name)]
-      else
-        super
-      end
-    end
-
-    # Rails 5.x
-    def from_clause
-      if (subselect = deleted_at_select)
-        ::ActiveRecord::Relation::FromClause.new(subselect, ::ActiveRecord::Base.connection.quote_table_name(table_name))
-      else
-        super
-      end
-    end
-
     def delete_all(*args)
       if args.pop
         ActiveSupport::Deprecation.warn(<<~STR)

data/lib/deleted_at/table.rb

@@ -0,0 +1,23 @@
+module DeletedAt
+  class Table < Arel::Table
+
+    attr_accessor :shadow
+
+    def initialize(table_name, engine, shadow:)
+      super(table_name).tap do |table|
+        @engine = engine
+        @shadow = shadow
+      end
+    end
+
+    def name
+      case Thread.current[:selecting_deleted_at]
+      when nil, false
+        super
+      else
+        super + shadow.to_s
+      end
+    end
+
+  end
+end

data/lib/deleted_at/version.rb

@@ -1,3 +1,3 @@
 module DeletedAt
-  VERSION = "0.6.0-2"
+  VERSION = "0.6.0-3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deleted_at
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.2
+  version: 0.6.0.pre.3
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: active_record-framing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +76,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +130,7 @@ files:
 - lib/deleted_at/legacy.rb
 - lib/deleted_at/railtie.rb
 - lib/deleted_at/relation.rb
+- lib/deleted_at/table.rb
 - lib/deleted_at/table_definition.rb
 - lib/deleted_at/version.rb
 homepage: https://github.com/TwilightCoders/deleted_at
@@ -140,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Soft delete your data, but keep it clean.