sequel_bitemporal 0.4.12 → 0.4.13

data/lib/sequel/plugins/bitemporal.rb

@@ -26,7 +26,7 @@ module Sequel
       end
 
       def self.now
-        Thread.current[THREAD_NOW_KEY] || point_in_time
+        Thread.current[THREAD_NOW_KEY] || Time.now
       end
 
       def self.configure(master, opts = {})
@@ -182,11 +182,12 @@ module Sequel
         end
 
         def destroy_version(version, expand_previous_version)
+          now = ::Sequel::Plugins::Bitemporal.now
           point_in_time = ::Sequel::Plugins::Bitemporal.point_in_time
-          return false if version.valid_to.to_time<=point_in_time
+          return false if version.valid_to.to_time<=now
           model.db.transaction do
             success = true
-            version_was_valid = point_in_time>=version.valid_from.to_time
+            version_was_valid = now>=version.valid_from.to_time
             if expand_previous_version
               previous = versions_dataset.where({
                 expired_at: nil,
@@ -194,14 +195,14 @@ module Sequel
               }).where("valid_to>valid_from").first
               if previous
                 if version_was_valid
-                  success &&= save_fossil previous, created_at: point_in_time, valid_from: point_in_time, valid_to: version.valid_to
+                  success &&= save_fossil previous, created_at: point_in_time, valid_from: now, valid_to: version.valid_to
                 else
                   success &&= save_fossil previous, created_at: point_in_time, valid_to: version.valid_to
                   success &&= previous.update expired_at: point_in_time
                 end
               end
             end
-            success &&= save_fossil version, created_at: point_in_time, valid_to: point_in_time if version_was_valid
+            success &&= save_fossil version, created_at: point_in_time, valid_to: now if version_was_valid
             success &&= version.update expired_at: point_in_time
             raise Sequel::Rollback unless success
             success

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.4.12"
+  s.version     = "0.4.13"
   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

@@ -493,8 +493,7 @@ describe "Sequel::Plugins::Bitemporal" do
     master.should have_versions %Q{
       | name            | price | created_at | expired_at | valid_from | valid_to   | current |
       | Single Standard | 98    | 2009-11-28 | 2009-11-29 | 2009-11-28 | MAX DATE   | true    |
-      | Single Standard | 98    | 2009-11-29 |            | 2009-11-28 | 2009-11-29 |         |
-      | King Size       | 98    | 2009-11-29 |            | 2009-11-29 | MAX DATE   |         |
+      | King Size       | 98    | 2009-11-29 |            | 2009-11-28 | MAX DATE   |         |
     }
     Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today+2) do
       master.current_version(true).destroy
@@ -502,9 +501,8 @@ describe "Sequel::Plugins::Bitemporal" do
     master.should have_versions %Q{
       | name            | price | created_at | expired_at | valid_from | valid_to   | current |
       | Single Standard | 98    | 2009-11-28 | 2009-11-29 | 2009-11-28 | MAX DATE   | true    |
-      | Single Standard | 98    | 2009-11-29 |            | 2009-11-28 | 2009-11-29 |         |
-      | King Size       | 98    | 2009-11-29 | 2009-11-30 | 2009-11-29 | MAX DATE   |         |
-      | King Size       | 98    | 2009-11-30 |            | 2009-11-29 | 2009-11-30 |         |
+      | King Size       | 98    | 2009-11-29 | 2009-11-30 | 2009-11-28 | MAX DATE   |         |
+      | King Size       | 98    | 2009-11-30 |            | 2009-11-28 | 2009-11-28 |         |
     }
   end
   it "combines as_we_knew_it and at to set valid_from" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -574087538557051277
+      hash: 2261132615164155074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -574087538557051277
+      hash: 2261132615164155074
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24