temporal_tables 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751b39e906ea31cee28a7146afa577cc5788bbeb164bd4f9f0e5e04dc1a0d024
-  data.tar.gz: 697070c46cd1c4997f98a995044623784eb5cbe46d969f7d5a3a2622c23b4f3e
+  metadata.gz: ff585572728100114c403af9f97e723d0c1d1760e73c46e7127d86849941cf0d
+  data.tar.gz: c3f7f8d672c1d549c378be20996ed8594f51c53bf215c820d864fa936e4f572e
 SHA512:
-  metadata.gz: 973f379f3a886ed938d5bbd169401b752c22a8ce0ba3dead9a9dad480e63dcad563e2515ca593ae119a7280cd7cd53c0be55972c8d4114875fe5e09ae85d5c1d
-  data.tar.gz: a0a3483633ee91925e195e4e706d4d201f0af9f844fc92d0837e7282f17fc5a071a8058fdf33bd34bd8b870162f1819fb5852c5b0903f47934357a3e44868d42
+  metadata.gz: 39d574fec08e359020dc88b2b7ef9d03ac6206da04517643d0686dbf02e1ecf6834d03742afadffd564bd7573076863bd82b3259059f0697b25594f9261f4f69
+  data.tar.gz: 5493b7f16dd8cb2db633529037711ffb78224c5c42ab6e836f43901dacea20ade306e0103e09cc66f9349350e87da336032098cd7abb38430de18b5eb408a71e

data/gemfiles/Gemfile.5.0.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.1.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.2.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.6)
+    temporal_tables (0.6.7)
       rails (~> 5.0)
 
 GEM

data/lib/temporal_tables/relation_extensions.rb

@@ -40,12 +40,7 @@ module TemporalTables
 
 			at_clauses = []
 			if historical?
-				at_clauses << where_clause_factory.build(
-					arel_table[:eff_to].gteq(at_value).and(
-						arel_table[:eff_from].lteq(at_value)
-					),
-					[]
-				)
+				at_clauses << where_clause_factory.build(build_temporal_constraint(at_value), [])
 			end
 
 			[s, *at_clauses.compact].sum
@@ -139,8 +134,19 @@ module TemporalTables
 		end
 	end
 
+	# This is required for eager_load to work in Rails 5.0.x
+	module JoinDependencyExtensions
+		def build_constraint(klass, table, key, foreign_table, foreign_key)
+			constraint = super
+			if at_value = Thread.current[:at_time]
+				constraint = constraint.and(klass.build_temporal_constraint(at_value))
+			end
+			constraint
+		end
+	end
 end
 
 ActiveRecord::Relation.send :prepend, TemporalTables::RelationExtensions
 ActiveRecord::Associations::Association.send :prepend, TemporalTables::AssociationExtensions
 ActiveRecord::Associations::Preloader::Association.send :prepend, TemporalTables::PreloaderExtensions
+ActiveRecord::Associations::JoinDependency::JoinAssociation.send :prepend, TemporalTables::JoinDependencyExtensions

data/lib/temporal_tables/temporal_class.rb

@@ -68,6 +68,12 @@ module TemporalTables
 			def descends_from_active_record?
 				superclass.descends_from_active_record?
 			end
+
+			def build_temporal_constraint(at_value)
+				arel_table[:eff_to].gteq(at_value).and(
+					arel_table[:eff_from].lteq(at_value)
+				)
+			end
 		end
 
 		def orig_class

data/lib/temporal_tables/version.rb

@@ -1,3 +1,3 @@
 module TemporalTables
-	VERSION = "0.6.6"
+	VERSION = "0.6.7"
 end

data/lib/temporal_tables.rb

@@ -5,7 +5,6 @@ require "temporal_tables/whodunnit"
 require "temporal_tables/temporal_class"
 require "temporal_tables/history_hook"
 require "temporal_tables/relation_extensions"
-require "temporal_tables/scope_extensions"
 require "temporal_tables/version"
 
 module TemporalTables

data/spec/basic_history_spec.rb

@@ -92,5 +92,21 @@ describe Person do
 				expect(historical_emily.is_a?(PersonHistory)).to eq(true)
 			end
 		end
+
+		describe "when checking current state" do
+			it "should have correct information" do
+				# ie. we shouldn't break regular ActiveRecord behaviour
+				expect(Person.count).to eq(1)
+				expect(Wart.count).to eq(1)
+
+				emily = Person.first
+				expect(emily.warts.count).to eq(1)
+				expect(emily.warts.first.hairiness).to eq(3)
+
+				emily = Person.where(id: emily.id).eager_load(:warts).first
+				expect(emily.warts.count).to eq(1)
+				expect(emily.warts.first.hairiness).to eq(3)
+			end
+		end
 	end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ end
 DatabaseCleaner.strategy = :deletion
 
 RSpec.configure do |config|
-	config.before(:all) do
+	config.before(:each) do
 		DatabaseCleaner.clean
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temporal_tables
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Brent Kroeker
@@ -101,7 +101,6 @@ files:
 - lib/temporal_tables/connection_adapters/postgresql_adapter.rb
 - lib/temporal_tables/history_hook.rb
 - lib/temporal_tables/relation_extensions.rb
-- lib/temporal_tables/scope_extensions.rb
 - lib/temporal_tables/temporal_adapter.rb
 - lib/temporal_tables/temporal_class.rb
 - lib/temporal_tables/version.rb

data/lib/temporal_tables/scope_extensions.rb

@@ -1,13 +0,0 @@
-module TemporalTables
-	module NamedExtensionsWithHistory
-		def scope(name, body, &block)
-			if history
-				history_body = -> { history.instance_exec &body }
-				history.scope_without_history name, history_body, &block
-			end
-			super name, body, &block
-		end
-	end
-end
-
-ActiveRecord::Scoping::Named::ClassMethods.send :prepend, TemporalTables::NamedExtensionsWithHistory