sequel_bitemporal 0.1.10 → 0.1.11

data/lib/sequel/plugins/bitemporal.rb

@@ -3,13 +3,26 @@ module Sequel
     module Bitemporal
       def self.as_we_knew_it(time)
         raise ArgumentError, "requires a block" unless block_given?
-        previous_point_in_time, @point_in_time = @point_in_time, time
+        key = :sequel_plugins_bitemporal_point_in_time
+        previous, Thread.current[key] = Thread.current[key], time.to_time
         yield
-        @point_in_time = previous_point_in_time
+        Thread.current[key] = previous
       end
       
       def self.point_in_time
-        @point_in_time || Time.now
+        Thread.current[:sequel_plugins_bitemporal_point_in_time] || Time.now
+      end
+
+      def self.at(time)
+        raise ArgumentError, "requires a block" unless block_given?
+        key = :sequel_plugins_bitemporal_now
+        previous, Thread.current[key] = Thread.current[key], time.to_time
+        yield
+        Thread.current[key] = previous
+      end
+
+      def self.now
+        Thread.current[:sequel_plugins_bitemporal_now] || Time.now
       end
 
       def self.configure(master, opts = {})
@@ -21,34 +34,40 @@ module Sequel
         master.one_to_many :versions, class: version, key: :master_id
         master.one_to_one :current_version, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
+          n = ::Sequel::Plugins::Bitemporal.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)
+          (:created_at.qualify(j) <= t) & ({e=>nil} | (e > t)) & (:valid_from.qualify(j) <= n) & (:valid_to.qualify(j) > n)
         end) do |ds|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
-          ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_from <= t) & (valid_to > t)}
+          n = ::Sequel::Plugins::Bitemporal.now
+          ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_from <= n) & (valid_to > n)}
         end
         master.def_dataset_method :with_current_version do
           eager_graph(:current_version).where({current_version__id: nil}.sql_negate)
         end
         master.one_to_many :current_or_future_versions, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
+          n = ::Sequel::Plugins::Bitemporal.now
           e = :expired_at.qualify(j)
-          (:created_at.qualify(j) <= t) & ({e=>nil} | (e > t)) & (:valid_to.qualify(j) > t)
+          (:created_at.qualify(j) <= t) & ({e=>nil} | (e > t)) & (:valid_to.qualify(j) > n)
         end) do |ds|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
-          ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_to > t)}
+          n = ::Sequel::Plugins::Bitemporal.now
+          ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_to > n)}
         end
         master.def_dataset_method :with_current_or_future_versions do
           eager_graph(:current_or_future_versions).where({current_or_future_versions__id: nil}.sql_negate)
         end
         version.many_to_one :master, class: master, key: :master_id
         version.class_eval do
-          def current?(now = Time.now)
+          def current?
+            t = ::Sequel::Plugins::Bitemporal.point_in_time
+            n = ::Sequel::Plugins::Bitemporal.now
             !new? &&
-            created_at.to_time<=now &&
-            (expired_at.nil? || expired_at.to_time>now) &&
-            valid_from.to_time<=now &&
-            valid_to.to_time>now
+            created_at.to_time<=t &&
+            (expired_at.nil? || expired_at.to_time>t) &&
+            valid_from.to_time<=n &&
+            valid_to.to_time>n
           end
           def destroy
             master.destroy_version self
@@ -96,6 +115,7 @@ module Sequel
           if !new? && attributes.delete(:partial_update) && current_version
             current_attributes = current_version.values.dup
             current_attributes.delete :valid_from
+            current_attributes.delete :valid_to
             attributes = current_attributes.merge attributes
           end
           attributes.delete :id

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.10"
+  s.version     = "0.1.11"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"

data/spec/bitemporal_date_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe "Sequel::Plugins::Bitemporal" do
   before :all do
+    DB.drop_table(:room_versions) if DB.table_exists?(:room_versions)
+    DB.drop_table(:rooms) if DB.table_exists?(:rooms)
     DB.create_table! :rooms do
       primary_key :id
     end
@@ -31,8 +33,8 @@ describe "Sequel::Plugins::Bitemporal" do
   end
   before do
     Timecop.freeze 2009, 11, 28
-    @master_class.truncate
     @version_class.truncate
+    @master_class.truncate
   end
   after do
     Timecop.return
@@ -325,13 +327,45 @@ describe "Sequel::Plugins::Bitemporal" do
   end
   it "allows to go back in time" do
     master = @master_class.new
-    master.update_attributes name: "Single Standard", price: 98
+    master.update_attributes name: "Single Standard", price: 98, valid_to: Date.today+1
+    master.update_attributes name: "Single Standard", price: 95, valid_from: Date.today+1, valid_to: Date.today+2
+    master.update_attributes name: "Single Standard", price: 93, valid_from: Date.today+2, valid_to: Date.today+3
+    master.update_attributes name: "Single Standard", price: 91, valid_from: Date.today+3
     Timecop.freeze Date.today+1
     master.update_attributes price: 94, partial_update: true
+    master.update_attributes price: 96, partial_update: true, valid_from: Date.today+2
+    master.should have_versions %Q{
+      | name            | price | created_at | expired_at | valid_from | valid_to   | current |
+      | Single Standard | 98    | 2009-11-28 |            | 2009-11-28 | 2009-11-29 |         |
+      | Single Standard | 95    | 2009-11-28 | 2009-11-29 | 2009-11-29 | 2009-11-30 |         |
+      | Single Standard | 93    | 2009-11-28 |            | 2009-11-30 | 2009-12-01 |         |
+      | Single Standard | 91    | 2009-11-28 | 2009-11-29 | 2009-12-01 | MAX DATE   |         |
+      | Single Standard | 94    | 2009-11-29 |            | 2009-11-29 | 2009-11-30 | true    |
+      | Single Standard | 96    | 2009-11-29 |            | 2009-12-01 | MAX DATE   |         |
+    }
     master.current_version.price.should == 94
-    Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today-1) do
+    Sequel::Plugins::Bitemporal.at(Date.today-1) do
       master.current_version(true).price.should == 98
     end
+    Sequel::Plugins::Bitemporal.at(Date.today+1) do
+      master.current_version(true).price.should == 93
+    end
+    Sequel::Plugins::Bitemporal.at(Date.today+2) do
+      master.current_version(true).price.should == 96
+    end
+    Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today-1) do
+      master.current_version(true).price.should == 95
+      master.current_version.should be_current
+      Sequel::Plugins::Bitemporal.at(Date.today-1) do
+        master.current_version(true).price.should == 98
+      end
+      Sequel::Plugins::Bitemporal.at(Date.today+1) do
+        master.current_version(true).price.should == 93
+      end
+      Sequel::Plugins::Bitemporal.at(Date.today+2) do
+        master.current_version(true).price.should == 91
+      end
+    end
   end
   it "allows eager loading with conditions on current or future versions" do
     master = @master_class.new

data/spec/bitemporal_time_spec.rb

@@ -3,6 +3,8 @@ require "spec_helper"
 describe "Sequel::Plugins::Bitemporal" do
   let(:hour){ 3600 }
   before :all do
+    DB.drop_table(:room_versions) if DB.table_exists?(:room_versions)
+    DB.drop_table(:rooms) if DB.table_exists?(:rooms)
     DB.create_table! :rooms do
       primary_key :id
     end
@@ -32,11 +34,11 @@ describe "Sequel::Plugins::Bitemporal" do
   end
   before do
     Timecop.freeze 2009, 11, 28, 10
+    @version_class.truncate
+    @master_class.truncate
   end
   after do
     Timecop.return
-    @master_class.truncate
-    @version_class.truncate
   end
   it "checks version class is given" do
     lambda{
@@ -300,6 +302,16 @@ describe "Sequel::Plugins::Bitemporal" do
     master.destroy
     @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should be_nil
   end
+  it "allows loading masters with a current version" do
+    master_destroyed = @master_class.new
+    master_destroyed.update_attributes name: "Single Standard", price: 98
+    master_destroyed.destroy
+    master_with_current = @master_class.new
+    master_with_current.update_attributes name: "Single Standard", price: 94
+    master_with_future = @master_class.new
+    master_with_future.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
+    @master_class.with_current_version.all.should have(1).item
+  end
   it "gets pending or current version attributes" do
     master = @master_class.new
     master.attributes.should == {}
@@ -314,4 +326,42 @@ describe "Sequel::Plugins::Bitemporal" do
     master.pending_version.should be
     master.pending_or_current_version.name.should == "King Size"
   end
+  it "allows to go back in time" do
+    master = @master_class.new
+    master.update_attributes name: "Single Standard", price: 98
+    Timecop.freeze Time.now+1*hour
+    master.update_attributes price: 94, partial_update: true
+    master.current_version.price.should == 94
+    Sequel::Plugins::Bitemporal.as_we_knew_it(Time.now-1*hour) do
+      master.current_version(true).price.should == 98
+    end
+  end
+  it "allows eager loading with conditions on current or future versions" do
+    master = @master_class.new
+    master.update_attributes name: "Single Standard", price: 98
+    Timecop.freeze Time.now+1*hour
+    master.update_attributes name: "Single Standard", price: 99
+    master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
+    res = @master_class.eager_graph(:current_or_future_versions).where({current_or_future_versions__id: nil}.sql_negate & {price: 99}).all.first
+    res.should be
+    res.current_or_future_versions.should have(1).item
+    res.current_or_future_versions.first.price.should == 99
+    res = @master_class.eager_graph(:current_or_future_versions).where({current_or_future_versions__id: nil}.sql_negate & {price: 94}).all.first
+    res.should be
+    res.current_or_future_versions.should have(1).item
+    res.current_or_future_versions.first.price.should == 94
+    Timecop.freeze Time.now+1*hour
+    master.destroy
+    @master_class.eager_graph(:current_or_future_versions).where({current_or_future_versions__id: nil}.sql_negate).all.should be_empty
+  end
+  it "allows loading masters with current or future versions" do
+    master_destroyed = @master_class.new
+    master_destroyed.update_attributes name: "Single Standard", price: 98
+    master_destroyed.destroy
+    master_with_current = @master_class.new
+    master_with_current.update_attributes name: "Single Standard", price: 94
+    master_with_future = @master_class.new
+    master_with_future.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
+    @master_class.with_current_or_future_versions.all.should have(2).item
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2158291240 !ruby/object:Gem::Requirement
+  requirement: &2165638640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158291240
+  version_requirements: *2165638640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2158290800 !ruby/object:Gem::Requirement
+  requirement: &2165638200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158290800
+  version_requirements: *2165638200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158290380 !ruby/object:Gem::Requirement
+  requirement: &2165637780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158290380
+  version_requirements: *2165637780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2158289960 !ruby/object:Gem::Requirement
+  requirement: &2165637360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158289960
+  version_requirements: *2165637360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158289540 !ruby/object:Gem::Requirement
+  requirement: &2165636940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158289540
+  version_requirements: *2165636940
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com
@@ -99,18 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2412870867383750431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2412870867383750431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10