sequel_bitemporal 0.6.2 → 0.6.3

data/lib/sequel/plugins/bitemporal.rb

@@ -35,6 +35,10 @@ module Sequel
         @bitemporal_version_columns ||= [:master_id, :valid_from, :valid_to, :created_at, :expired_at]
       end
 
+      def self.bitemporal_excluded_columns
+        @bitemporal_excluded_columns ||= [:id, *bitemporal_version_columns]
+      end
+
       def self.configure(master, opts = {})
         version = opts[:version_class]
         raise Error, "please specify version class to use for bitemporal plugin" unless version
@@ -149,11 +153,8 @@ module Sequel
             @pending_version ||= begin
               current_attributes = {}
               current_version.keys.each do |key|
-                case key
-                when :id, :valid_from, :valid_to, :created_at, :expired_at
-                else
-                  current_attributes[key] = current_version.send key
-                end
+                next if excluded_columns.include? key
+                current_attributes[key] = current_version.send key
               end if current_version?
               model.version_class.new current_attributes
             end
@@ -214,6 +215,42 @@ module Sequel
           end
         end
 
+        def deleted?
+          !new? && !current_version
+        end
+
+        def last_version
+          @last_version ||= begin
+            return if new?
+            t = ::Sequel::Plugins::Bitemporal.point_in_time
+            n = ::Sequel::Plugins::Bitemporal.now
+            versions_dataset.where do
+              (created_at <= t) & ({expired_at=>nil} | (expired_at > t)) &
+              (valid_from <= n)
+            end.order(:valid_to.desc).first
+          end
+        end
+
+        def restore(attrs={})
+          return false unless deleted?
+          last_version_attributes = if last_version
+            last_version.values.reject do |column, _|
+              excluded_columns.include? column
+            end
+          else
+            {}
+          end
+          update_attributes last_version_attributes.merge attrs
+          @last_version = nil
+        end
+
+        def reload
+          @last_version = nil
+          @current_version_values = nil
+          @pending_version = nil
+          super
+        end
+
       private
 
         def prepare_pending_version
@@ -254,7 +291,6 @@ module Sequel
           futures = futures.where "valid_from>?", pending_version.valid_from
           futures = futures.order(:valid_from).all
 
-          excluded_columns = Sequel::Plugins::Bitemporal.bitemporal_version_columns + [:id]
           to_check_columns = self.class.version_class.columns - excluded_columns
           updated_by = (send(self.class.audit_updated_by_method) if audited?)
           previous_values = @current_version_values
@@ -340,7 +376,13 @@ module Sequel
             when :id, :master_id, :created_at, :expired_at
               false
             when :valid_from
-              new_value && new_value<current_version.valid_from
+              new_value && (
+                new_value<current_version.valid_from ||
+                (
+                  current_version.valid_to &&
+                  new_value>current_version.valid_to
+                )
+              )
             when :valid_to
               new_value || new_value!=current_version.valid_to
             else
@@ -349,6 +391,10 @@ module Sequel
           end
         end
 
+        def excluded_columns
+          Sequel::Plugins::Bitemporal.bitemporal_excluded_columns
+        end
+
       end
     end
   end

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.6.2"
+  s.version     = "0.6.3"
   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

@@ -582,6 +582,51 @@ describe "Sequel::Plugins::Bitemporal" do
       | King Size       | 98    | 2009-11-29 |            | 2009-11-27 | 2009-11-28 |         |
     }
   end
+  context "#deleted?" do
+    subject{ @master_class.new }
+    it "is false unless persisted" do
+      subject.should_not be_deleted
+    end
+    it "is false when persisted with a current version" do
+      subject.update_attributes(name: "Single Standard", price: 94).should_not be_deleted
+    end
+    it "is true when persisted without a current version" do
+      subject.update_attributes(name: "Single Standard", price: 94, valid_from: Date.today+1).should be_deleted
+    end
+  end
+  context "#last_version" do
+    subject{ @master_class.new }
+    it "is nil unless persisted" do
+      subject.last_version.should be_nil
+    end
+    it "is current version when persisted with a current version" do
+      subject.update_attributes name: "Single Standard", price: 94
+      subject.last_version.should == subject.current_version
+    end
+    it "is nil with future version but no current version" do
+      subject.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+1
+      subject.last_version.should be_nil
+    end
+    it "is last version with previous version but no current version" do
+      subject.update_attributes name: "Single Standard", price: 94, valid_from: Date.today-2, valid_to: Date.today-1
+      subject.current_version.should be_nil
+      subject.last_version.should == subject.versions.last
+    end
+  end
+  context "#restore" do
+    subject{ @master_class.new }
+    it "make last version current" do
+      subject.update_attributes name: "Single Standard", price: 94, valid_from: Date.today-2, valid_to: Date.today-1
+      subject.restore
+      subject.current_version.should == subject.last_version
+    end
+    it "can add additional attributes to apply" do
+      subject.update_attributes name: "Single Standard", price: 94, valid_from: Date.today-2, valid_to: Date.today-1
+      subject.restore name: "New Standard"
+      subject.current_version.name.should == "New Standard"
+      subject.current_version.price.should == 94
+    end
+  end
 end
 
 describe "Sequel::Plugins::Bitemporal", "with audit" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3142511012562917394
+      hash: 2205031577835886321
 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: 3142511012562917394
+      hash: 2205031577835886321
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23