deleted_at 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b044ffad6653348c6202362b5894d01311dc3e16
-  data.tar.gz: d3f41c1fe35254b1b779d351330376a91ff0919a
+  metadata.gz: bc6d9d446fa6477a7eb22388a7a668a0f4871d79
+  data.tar.gz: de7b054ea2f46a01753866b88d84bc8184e449f1
 SHA512:
-  metadata.gz: ec94212c15a7538dfcde0a22ea4320944fc42d6332aae8b8bc5f850fd5f91a79694829eac276b4693167c88d52ccf4d400fec75011b2a073ce9d8beafe68938c
-  data.tar.gz: 0df63d894dcb07be2a8f460fd8b898b4cdbcd0f32d14d5f221fad52ebe40fe71019fcfe2eb104422ae396723b745d3ea7f2c7721ba9fd8c48b7e0919f1ab0d5a
+  metadata.gz: 9915eebda6fc0c1309f201b5b88f77f65b8e898cd21a1053c3afb75bcd9ae3169b5c6e3fcdada8cafb7fb2c9518602aef847d1124576bf1c2864dcf0d95455d1
+  data.tar.gz: 6bcfda4d08f1f875d783b2958c2e63260e2dd9c91a30693a3f5c46b7465fe2b86cc0ddc488159da3def7ca0571a4c8bbd17ca37c308ab2668ea83da413cc8e5f

data/lib/deleted_at/active_record/base.rb

@@ -7,7 +7,7 @@ module DeletedAt
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :deleted_at_column,
+        class_attribute :deleted_at_column, :original_table_name,
           :deleted_by_column, :deleted_by_class, :deleted_by_primary_key
 
         class << self
@@ -25,12 +25,6 @@ module DeletedAt
 
           parse_options(options)
 
-          # Just gotta ask for it once, so the class knows it before inheritence
-          # NOTE: This needs to happen regardless of whether the views have been installed
-          # yet or not. This is because to install the views, this needs to have been done!
-          primary_key = self.primary_key
-          table_name = self.table_name
-
           unless ::DeletedAt::Views.all_table_exists?(self) && ::DeletedAt::Views.deleted_view_exists?(self)
             return warn("You're trying to use `with_deleted_at` on #{name} but you have not installed the views, yet.")
           end
@@ -47,6 +41,17 @@ module DeletedAt
             BBB
           end
 
+
+          # We are confident at this point that the tables and views have been setup.
+          # We need to do a bit of wizardy by setting the table name to the actual table
+          # (at this point: model/all), such that the model has all the information
+          # regarding its structure and intended behavior. Calling primary_key loads the
+          # table data into the class.
+          self.original_table_name = self.table_name
+          self.table_name = ::DeletedAt::Views.all_table(self)
+          primary_key = self.primary_key
+          self.table_name = self.original_table_name
+
           setup_class_views
           with_deleted_by
 

data/lib/deleted_at/version.rb

@@ -1,3 +1,3 @@
 module DeletedAt
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deleted_at
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dale Stevens