sequel_bitemporal 0.1.3 → 0.1.4

data/lib/sequel/plugins/bitemporal.rb

@@ -8,8 +8,13 @@ module Sequel
         missing = required - version.columns
         raise Error, "bitemporal plugin requires the following missing column#{"s" if missing.size>1} on version class: #{missing.join(", ")}" unless missing.empty?
         master.one_to_many :versions, class: version, key: :master_id
-        master.one_to_one :current_version, class: version, key: :master_id do |ds|
-          ds.where "created_at<=:now AND (expired_at IS NULL OR expired_at>:now) AND valid_from<=:now AND valid_to>:now", now: Time.now
+        master.one_to_one :current_version, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
+          t = Time.now
+          e = :expired_at.qualify(j)
+          (:created_at.qualify(j) <= t) & ({e=>nil} | (e > t)) & (:valid_from.qualify(j) <= t) & (:valid_to.qualify(j) > t)
+        end) do |ds|
+          t = Time.now
+          ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_from <= t) & (valid_to > t)}
         end
         version.many_to_one :master, class: master, key: :master_id
         version.class_eval do

data/sequel_bitemporal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sequel_bitemporal"
-  s.version     = "0.1.3"
+  s.version     = "0.1.4"
   s.authors     = ["Joseph HALTER"]
   s.email       = ["joseph.halter@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"

data/spec/bitemporal_spec.rb

@@ -290,4 +290,13 @@ describe "Sequel::Plugins::Bitemporal" do
       | King Size       | 94    | 2009-11-29 |            | 2009-11-29 |            | true    |
     }
   end
+  it "allows eager loading with conditions on current version" do
+    master = @master_class.new
+    master.update_attributes name: "Single Standard", price: 98
+    master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
+    @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should_not be_nil
+    Timecop.freeze Date.today+1
+    master.destroy
+    @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2011-11-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2157973260 !ruby/object:Gem::Requirement
+  requirement: &2158312800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157973260
+  version_requirements: *2158312800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157972820 !ruby/object:Gem::Requirement
+  requirement: &2158312360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157972820
+  version_requirements: *2158312360
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2158000040 !ruby/object:Gem::Requirement
+  requirement: &2158311940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158000040
+  version_requirements: *2158311940
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2157999620 !ruby/object:Gem::Requirement
+  requirement: &2158311520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157999620
+  version_requirements: *2158311520
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com