chrono_model 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6372b41af69ba073bf8d6ea27f34c238ce3c1426
-  data.tar.gz: 9bda73df3fa2d169da83fedd4d499521745a61b8
+  metadata.gz: d582aa6350f8fac1d88f06a216447a309215479b
+  data.tar.gz: aaabf96f89bb5aad1af0e6f2425978ac484b855d
 SHA512:
-  metadata.gz: a04bfe04096c15f977c0972458e53508c81bccbf84b81df79e990f3174152af5f788f1564acf27ace77e3721ba9717a30ec8e5d68f813aaa2761528bed57da52
-  data.tar.gz: 66289e54ef6511b1ff005705386585f82ce5571a99763b37d522d1208dcd87c738c7a2b2d004e205ed5438ff53d28cf8cc076bf29eb5657be318f326953efd1b
+  metadata.gz: 0c5b541b0e8dfed9958e4ecab0b49adafeee077f7e8aca27f3d85e356cfa282f8247d890e0b06751d18da1d83c02570ff1dc6492e7fe404dd49d3c35d7a3eb74
+  data.tar.gz: df5f7d097d783efe86bc8b05d4d9736a81cab3222fd1f291e7e7f3101224b9f2a4d47c6b5789f222b7bbfbd97929ac6b386b7b33a9f17227c6d425ff2de9735c

data/lib/chrono_model/patches.rb

@@ -23,6 +23,33 @@ module ChronoModel
       end
     end
 
+    # This class supports the AR 4.2 code that expects to receive an
+    # Arel::Table as the left join node. We need to replace the node
+    # with a virtual table that fetches from the history at a given
+    # point in time, we replace the join node with a SqlLiteral node
+    # that does not respond to the methods that AR expects.
+    #
+    # This class provides AR with an object implementing the methods
+    # it expects, yet producing SQL that fetches from history tables
+    # as-of-time.
+    #
+    class JoinNode < Arel::Nodes::SqlLiteral
+      attr_reader :name, :table_name, :table_alias, :as_of_time
+
+      def initialize(join_node, history_model, as_of_time)
+        @name        = join_node.table_name
+        @table_name  = join_node.table_name
+        @table_alias = join_node.table_alias
+
+        @as_of_time  = as_of_time
+
+        virtual_table = history_model.
+          virtual_table_at(@as_of_time, @table_alias || @table_name)
+
+        super(virtual_table)
+      end
+    end
+
     module Relation
       include AsOfTimeHolder
 
@@ -44,13 +71,15 @@ module ChronoModel
         super.tap do |arel|
 
           arel.join_sources.each do |join|
+            # This case happens with nested includes, where the below
+            # code has already replaced the join.left with a JoinNode.
+            #
+            next if join.left.respond_to?(:as_of_time)
+
             model = TimeMachine.chrono_models[join.left.table_name]
             next unless model
 
-            join.left = Arel::Nodes::SqlLiteral.new(
-              model.history.virtual_table_at(@_as_of_time,
-                join.left.table_alias || join.left.table_name)
-            )
+            join.left = JoinNode.new(join.left, model.history, @_as_of_time)
           end
 
         end
@@ -180,27 +209,15 @@ module ChronoModel
           scope = scope.from(klass.history.virtual_table_at(owner.as_of_time))
         elsif respond_to?(:through_reflection) && through_reflection.klass.chrono?
 
-          # For through associations, replace the joined table name instead.
+          # For through associations, replace the joined table name instead
+          # with a virtual table that selects records from the history at
+          # the given +as_of_time+.
           #
           scope.join_sources.each do |join|
             if join.left.name == through_reflection.klass.table_name
-              v_table = through_reflection.klass.history.virtual_table_at(
-                owner.as_of_time, join.left.table_alias || join.left.table_name)
-
-              # avoid problems in Rails when code down the line expects the
-              # join.left to respond to the following methods. we modify
-              # the instance of SqlLiteral to do just that.
-              table_name  = join.left.table_name
-              table_alias = join.left.table_alias
-              join.left   = Arel::Nodes::SqlLiteral.new(v_table)
-
-              class << join.left
-                attr_accessor :name, :table_name, :table_alias
-              end
-
-              join.left.name        = table_name
-              join.left.table_name  = table_name
-              join.left.table_alias = table_alias
+              history_model = through_reflection.klass.history
+
+              join.left = JoinNode.new(join.left, history_model, owner.as_of_time)
             end
           end
         end

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/support/helpers.rb

@@ -74,7 +74,7 @@ module ChronoTest::Helpers
           t.references :foo
         end
 
-        adapter.create_table 'sub_bars' do |t|
+        adapter.create_table 'sub_bars', :temporal => true do |t|
           t.string     :name
           t.references :bar
         end
@@ -123,7 +123,7 @@ module ChronoTest::Helpers
         end
 
         class ::SubBar < ActiveRecord::Base
-          include ChronoModel::TimeGate
+          include ChronoModel::TimeMachine
 
           belongs_to :bar
 

data/spec/time_machine_spec.rb

@@ -85,7 +85,8 @@ describe ChronoModel::TimeMachine do
       'foos'     => Foo::History,
       'defoos'   => Defoo::History,
       'bars'     => Bar::History,
-      'elements' => Element::History
+      'elements' => Element::History,
+      'sub_bars' => SubBar::History,
     ) }
   end
 
@@ -183,6 +184,9 @@ describe ChronoModel::TimeMachine do
       it { expect(Bar.as_of(bar.ts[2]).includes(foo: :sub_bars).first.foo.name).to eq 'new foo' }
       it { expect(Bar.as_of(bar.ts[3]).includes(foo: :sub_bars).first.foo.name).to eq 'new foo' }
 
+      it { expect(Foo.as_of(foo.ts[0]).includes(bars: :sub_bars).first.sub_bars.count).to eq 0 }
+      it { expect(Foo.as_of(foo.ts[1]).includes(bars: :sub_bars).first.sub_bars.count).to eq 0 }
+      it { expect(Foo.as_of(foo.ts[2]).includes(bars: :sub_bars).first.sub_bars.count).to eq 1 }
     end
 
     it 'doesn\'t raise RecordNotFound when no history records are found' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord