chrono_model 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf80e2ead7e4bd268485039492504007f1bef1d
-  data.tar.gz: ec80e086d0723533e8f7bb06e78ec58e1a9edd39
+  metadata.gz: 69a13f407cf20b6ffbf08382a831c49085158b7d
+  data.tar.gz: 9461316b8a2b3b0498e8d1fc8dc45b15e5492905
 SHA512:
-  metadata.gz: eea3f10b7f18fd38718716ef4c90fc3a65ac4e789a6ae6a888080d655a1b2fae6761830242cf03bb911e9e7f090706c66ddf71bab20b76fb2f76ff3a68caf25e
-  data.tar.gz: fa5936bc34ca7820eefceb3064af13c12d5e323f0f8bede5e01062936b5ae7003bbe104b162a61469e95825a2b74b1580e05a21e5591dd537185842bb75d50d8
+  metadata.gz: 81ef0ab38b9d33cd457bd33c869128e480d2493120e66fe50624aae94a8a6899df462285ec8003f5f9413f5ccf6d362b53699f20cc5be3b83d9d92ccbdcb65bb
+  data.tar.gz: e3673608283f66ecb82808f9b4ee64e7da9c7c76a44e297e826284755607e38194ebf2a8aad12bbd92bbb5ac7cd91c5d11fb91b72dabd2431671cc22307914b4

data/gemfiles/rails_4.2.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "rails", "~> 4.2.0"
+gem "pg", "~> 0.18"
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 gem "rails", "~> 5.0.0"
+gem "pg", "~> 0.18"
 
 gemspec :path => "../"

data/gemfiles/rails_5.1.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
 gem "rails", "~> 5.1.0"
+gem "pg", "~> 0.18"
 
 gemspec :path => "../"

data/lib/chrono_model/adapter.rb

@@ -914,7 +914,7 @@ module ChronoModel
 
       def translate_exception(exception, message)
         if exception.message =~ /conflicting key value violates exclusion constraint/
-          ActiveRecord::RecordNotUnique.new(message, exception)
+          ActiveRecord::RecordNotUnique.new(message)
         else
           super
         end

data/lib/chrono_model/patches.rb

@@ -109,9 +109,9 @@ module ChronoModel
       # See +ActiveRecord::Associations::Preloader::NULL_RELATION+
       NULL_RELATION = ActiveRecord::Associations::Preloader::NULL_RELATION
 
-      # Extension of +NULL_RELATION+ adding an +as_of_time+ property. See
-      # +preload+.
-      AS_OF_PRELOAD_SCOPE = Struct.new(:as_of_time, *NULL_RELATION.members)
+      # Extend +NULL_RELATION+ by adding the +as_of_time!+ method.
+      # See +preload+ and +AsOfTimeHolder+.
+      NULL_RELATION.class.instance_eval { include AsOfTimeHolder }
 
       # Patches the AR Preloader (lib/active_record/associations/preloader.rb)
       # in order to carry around the +as_of_time+ of the original invocation.
@@ -119,8 +119,8 @@ module ChronoModel
       # * The +records+ are the parent records where the association is defined
       # * The +associations+ are the association names involved in preloading
       # * The +given_preload_scope+ is the preloading scope, that is used only
-      # in the :through association and it holds the intermediate records
-      # _through_ which the final associated records are eventually fetched.
+      #   in the :through association and it holds the intermediate records
+      #   _through_ which the final associated records are eventually fetched.
       #
       # As the +preload_scope+ is passed around to all the different
       # incarnations of the preloader strategies, we are using it to pass
@@ -129,42 +129,26 @@ module ChronoModel
       #
       # The +preload_scope+ is not nil only for through associations, but the
       # preloader interfaces expect it to be always defined, for consistency.
+      #
       # So, AR defines a +NULL_RELATION+ constant to pass around for the
       # association types that do not have a preload_scope. It quacks like a
       # Relation, and it contains only the methods that are used by the other
-      # preloader methods. We extend AR's +NULL_RELATION+ with an `as_of_time`
-      # property.
+      # preloader methods. We use this +NULL_RELATION+ to which we have added
+      # the `as_of_time!` holder method.
       #
       # For `:through` associations, the +given_preload_scope+ is already a
       # +Relation+, that already has the +as_of_time+ getters and setters,
-      # so we use them here.
+      # so we use it directly.
       #
       def preload(records, associations, given_preload_scope = nil)
-        if (as_of_time = options[:as_of_time])
-          preload_scope = if given_preload_scope.respond_to?(:as_of_time!)
-            given_preload_scope.as_of_time!(as_of_time)
-          else
-            null_relation_preload_scope(as_of_time, given_preload_scope)
-          end
+        if options.key?(:as_of_time)
+          preload_scope = given_preload_scope || NULL_RELATION.dup
+          preload_scope.as_of_time!(options[:as_of_time])
         end
 
         super records, associations, preload_scope
       end
 
-      private
-        def null_relation_preload_scope(as_of_time, given_preload_scope)
-          preload_scope = AS_OF_PRELOAD_SCOPE.new
-
-          preload_scope.as_of_time = as_of_time
-          given_preload_scope ||= NULL_RELATION
-
-          NULL_RELATION.members.each do |member|
-            preload_scope[member] = given_preload_scope[member]
-          end
-
-          return preload_scope
-        end
-
       module Association
         # Builds the preloader scope taking into account a potential
         # +as_of_time+ set above in +Preloader#preload+ and coming from the

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord