sequel_bitemporal 0.1.8 → 0.1.9

data/lib/sequel/plugins/bitemporal.rb

@@ -52,6 +52,11 @@ module Sequel
       module InstanceMethods
         attr_reader :pending_version
 
+        def before_validation
+          prepare_pending_version
+          super
+        end
+
         def validate
           super
           pending_version.errors.each do |key, key_errors|
@@ -82,6 +87,7 @@ module Sequel
           attributes.delete :id
           @pending_version ||= model.version_class.new
           pending_version.set attributes
+          pending_version.master_id = id unless new?
         end
 
         def update_attributes(attributes={})
@@ -92,15 +98,12 @@ module Sequel
         def after_create
           super
           if pending_version
-            prepare_pending_version
             return false unless save_pending_version
           end
         end
 
         def before_update
           if pending_version
-            lock!
-            prepare_pending_version
             expire_previous_versions
             return false unless save_pending_version
           end
@@ -134,19 +137,14 @@ module Sequel
       private
 
         def prepare_pending_version
+          return unless pending_version
           point_in_time = Time.now
           pending_version.created_at = point_in_time
           pending_version.valid_from ||= point_in_time
         end
 
-        def save_pending_version
-          pending_version.valid_to ||= Time.utc 9999
-          success = add_version pending_version
-          @pending_version = nil if success
-          success
-        end
-
         def expire_previous_versions
+          lock!
           expired = versions_dataset.where expired_at: nil
           expired = expired.exclude "valid_from=valid_to"
           expired = expired.exclude "valid_to<=?", pending_version.valid_from
@@ -164,6 +162,13 @@ module Sequel
           versions_dataset.where(id: expired.collect(&:id)).update expired_at: pending_version.created_at
         end
 
+        def save_pending_version
+          pending_version.valid_to ||= Time.utc 9999
+          success = add_version pending_version
+          @pending_version = nil if success
+          success
+        end
+
         def save_fossil(expired, attributes={})
           fossil = model.version_class.new
           expired_attributes = expired.values.dup

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.8"
+  s.version     = "0.1.9"
   s.authors     = ["Joseph HALTER"]
   s.email       = ["joseph.halter@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2152436900 !ruby/object:Gem::Requirement
+  requirement: &2160905800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152436900
+  version_requirements: *2160905800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152385280 !ruby/object:Gem::Requirement
+  requirement: &2160905360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152385280
+  version_requirements: *2160905360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152384260 !ruby/object:Gem::Requirement
+  requirement: &2160904940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152384260
+  version_requirements: *2160904940
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152383300 !ruby/object:Gem::Requirement
+  requirement: &2160904520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152383300
+  version_requirements: *2160904520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152382540 !ruby/object:Gem::Requirement
+  requirement: &2160904100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152382540
+  version_requirements: *2160904100
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com
@@ -97,21 +97,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -617172649856506715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -617172649856506715
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Bitemporal versioning for sequel.