sequel_bitemporal 0.4.7 → 0.4.8

data/lib/sequel/plugins/bitemporal.rb

@@ -77,8 +77,11 @@ module Sequel
             valid_from.to_time<=n &&
             valid_to.to_time>n
           end
-          def destroy
-            master.destroy_version self
+          def destroy(opts={})
+            expand_previous_version = opts.fetch(:expand_previous_version){
+              valid_from.to_time>::Sequel::Plugins::Bitemporal.now
+            }
+            master.destroy_version self, expand_previous_version
           end
         end
         unless opts[:delegate]==false
@@ -173,20 +176,27 @@ module Sequel
           versions_dataset.where(expired_at: nil).where("valid_to>valid_from").update expired_at: Time.now
         end
 
-        def destroy_version(version)
+        def destroy_version(version, expand_previous_version)
           point_in_time = Time.now
           return false if version.valid_to.to_time<=point_in_time
           model.db.transaction do
             success = true
-            previous = versions_dataset.where({
-              expired_at: nil,
-              valid_to: version.valid_from,
-            }).where("valid_to>valid_from").first
-            if previous
-              success &&= save_fossil previous, created_at: point_in_time, valid_to: version.valid_to
-              success &&= previous.update expired_at: point_in_time
+            version_was_valid = point_in_time>=version.valid_from.to_time
+            if expand_previous_version
+              previous = versions_dataset.where({
+                expired_at: nil,
+                valid_to: version.valid_from,
+              }).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
+                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 point_in_time>=version.valid_from.to_time
+            success &&= save_fossil version, created_at: point_in_time, valid_to: point_in_time 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.7"
+  s.version     = "0.4.8"
   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

@@ -197,18 +197,37 @@ describe "Sequel::Plugins::Bitemporal" do
   end
   it "allows deleting current version" do
     master = @master_class.new
+    master.update_attributes name: "Single Standard", price: 92, valid_from: Date.today-2, valid_to: Date.today
     master.update_attributes name: "Single Standard", price: 98
     master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
     Timecop.freeze Date.today+1
     master.current_version.destroy.should be_true
     master.should have_versions %Q{
       | name            | price | created_at | expired_at | valid_from | valid_to   | current |
+      | Single Standard | 92    | 2009-11-28 |            | 2009-11-26 | 2009-11-28 |         |
       | Single Standard | 98    | 2009-11-28 | 2009-11-28 | 2009-11-28 | MAX DATE   |         |
       | Single Standard | 98    | 2009-11-28 | 2009-11-29 | 2009-11-28 | 2009-11-30 |         |
       | Single Standard | 94    | 2009-11-28 |            | 2009-11-30 | MAX DATE   |         |
       | Single Standard | 98    | 2009-11-29 |            | 2009-11-28 | 2009-11-29 |         |
     }
   end
+  it "allows deleting current version to restore the previous one" do
+    master = @master_class.new
+    master.update_attributes name: "Single Standard", price: 92, valid_from: Date.today-2, valid_to: Date.today
+    master.update_attributes name: "Single Standard", price: 98
+    master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
+    Timecop.freeze Date.today+1
+    master.current_version.destroy(expand_previous_version: true).should be_true
+    master.should have_versions %Q{
+      | name            | price | created_at | expired_at | valid_from | valid_to   | current |
+      | Single Standard | 92    | 2009-11-28 |            | 2009-11-26 | 2009-11-28 |         |
+      | Single Standard | 98    | 2009-11-28 | 2009-11-28 | 2009-11-28 | MAX DATE   |         |
+      | Single Standard | 98    | 2009-11-28 | 2009-11-29 | 2009-11-28 | 2009-11-30 |         |
+      | Single Standard | 94    | 2009-11-28 |            | 2009-11-30 | MAX DATE   |         |
+      | Single Standard | 92    | 2009-11-29 |            | 2009-11-29 | 2009-11-30 | true    |
+      | Single Standard | 98    | 2009-11-29 |            | 2009-11-28 | 2009-11-29 |         |
+    }
+  end
   it "allows deleting a future version" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98
@@ -223,6 +242,19 @@ describe "Sequel::Plugins::Bitemporal" do
       | Single Standard | 98    | 2009-11-29 |            | 2009-11-28 | MAX DATE   | true    |
     }
   end
+  it "allows deleting a future version without expanding the current one" 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
+    Timecop.freeze Date.today+1
+    master.versions.last.destroy(expand_previous_version: false).should be_true
+    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-28 | MAX DATE   |         |
+      | Single Standard | 98    | 2009-11-28 |            | 2009-11-28 | 2009-11-30 | true    |
+      | Single Standard | 94    | 2009-11-28 | 2009-11-29 | 2009-11-30 | MAX DATE   |         |
+    }
+  end
   it "allows deleting all versions" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70102092111400 !ruby/object:Gem::Requirement
+  requirement: &2160168600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.30.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102092111400
+  version_requirements: *2160168600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70102092109880 !ruby/object:Gem::Requirement
+  requirement: &2160167460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102092109880
+  version_requirements: *2160167460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102092127900 !ruby/object:Gem::Requirement
+  requirement: &2160166300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.8.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *70102092127900
+  version_requirements: *2160166300
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70102092125440 !ruby/object:Gem::Requirement
+  requirement: &2160165300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102092125440
+  version_requirements: *2160165300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70102092123640 !ruby/object:Gem::Requirement
+  requirement: &2160164540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102092123640
+  version_requirements: *2160164540
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2437842052147877954
+      hash: -1570782327247228228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2437842052147877954
+      hash: -1570782327247228228
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10