sequel_bitemporal 0.6.7 → 0.6.8

data/lib/sequel/plugins/bitemporal.rb

@@ -132,11 +132,11 @@ module Sequel
           super
           pending_version.errors.each do |key, key_errors|
             key_errors.each{|error| errors.add key, error}
-          end if pending_version && !pending_version.valid?
+          end if pending_version_holds_changes? && !pending_version.valid?
         end
 
         def pending_or_current_version
-          pending_version || current_version
+          pending_version || current_version || initial_version
         end
 
         def attributes
@@ -145,22 +145,20 @@ module Sequel
           elsif current_version
             current_version.values
           else
-            {}
+            initial_version.values
           end
         end
 
         def attributes=(attributes)
-          if attributes_hold_changes? attributes
-            @pending_version ||= begin
-              current_attributes = {master_id: id}
-              current_version.keys.each do |key|
-                next if excluded_columns.include? key
-                current_attributes[key] = current_version.send key
-              end if current_version?
-              model.version_class.new current_attributes
-            end
-            pending_version.set attributes
+          @pending_version ||= begin
+            current_attributes = {master_id: id}
+            current_version.keys.each do |key|
+              next if excluded_columns.include? key
+              current_attributes[key] = current_version.send key
+            end if current_version?
+            model.version_class.new current_attributes
           end
+          pending_version.set attributes
         end
 
         def update_attributes(attributes={})
@@ -170,13 +168,13 @@ module Sequel
 
         def after_create
           super
-          if pending_version
+          if pending_version_holds_changes?
             return false unless save_pending_version
           end
         end
 
         def before_update
-          if pending_version
+          if pending_version_holds_changes?
             expire_previous_versions
             return false unless save_pending_version
           end
@@ -249,13 +247,14 @@ module Sequel
           @last_version = nil
           @current_version_values = nil
           @pending_version = nil
+          @initial_version = nil
           super
         end
 
       private
 
         def prepare_pending_version
-          return unless pending_version
+          return unless pending_version_holds_changes?
           now = ::Sequel::Plugins::Bitemporal.now
           point_in_time = ::Sequel::Plugins::Bitemporal.point_in_time
           pending_version.created_at = point_in_time
@@ -369,10 +368,11 @@ module Sequel
           !new? && current_version
         end
 
-        def attributes_hold_changes?(attributes)
+        def pending_version_holds_changes?
+          return false unless pending_version
           return true unless current_version?
           @current_version_values = current_version.values
-          attributes.detect do |key, new_value|
+          pending_version.values.detect do |key, new_value|
             case key
             when :id, :master_id, :created_at, :expired_at
               false
@@ -399,6 +399,10 @@ module Sequel
           Sequel::Plugins::Bitemporal.bitemporal_excluded_columns
         end
 
+        def initial_version
+          @initial_version ||= model.version_class.new
+        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.7"
+  s.version     = "0.6.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

@@ -390,15 +390,21 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.attributes.should == {}
     master.pending_version.should be_nil
-    master.pending_or_current_version.should be_nil
+    master.current_version.should be_nil
+    master.name.should be_nil
+
+    master.pending_or_current_version.name.should be_nil
     master.update_attributes name: "Single Standard", price: 98
     master.attributes[:name].should == "Single Standard"
     master.pending_version.should be_nil
     master.pending_or_current_version.name.should == "Single Standard"
+    master.name.should == "Single Standard"
+
     master.attributes = {name: "King Size"}
     master.attributes[:name].should == "King Size"
     master.pending_version.should be
     master.pending_or_current_version.name.should == "King Size"
+    master.name.should == "King Size"
   end
   it "allows to go back in time" do
     master = @master_class.new

data/spec/bitemporal_time_spec.rb

@@ -313,15 +313,21 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.attributes.should == {}
     master.pending_version.should be_nil
-    master.pending_or_current_version.should be_nil
+    master.current_version.should be_nil
+    master.pending_or_current_version.name.should be_nil
+    master.name.should be_nil
+
     master.update_attributes name: "Single Standard", price: 98
     master.attributes[:name].should == "Single Standard"
     master.pending_version.should be_nil
     master.pending_or_current_version.name.should == "Single Standard"
+    master.name.should == "Single Standard"
+
     master.attributes = {name: "King Size"}
     master.attributes[:name].should == "King Size"
     master.pending_version.should be
     master.pending_or_current_version.name.should == "King Size"
+    master.name.should == "King Size"
   end
   it "allows to go back in time" do
     master = @master_class.new

metadata

@@ -2,7 +2,7 @@
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Joseph HALTER
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 186878115490887272
+      hash: 4539624897102282475
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 186878115490887272
+      hash: 4539624897102282475
       version: '0'
   none: false
 requirements: []