sequel_bitemporal 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6daa2d7f025cd1281e8cbfc7235d0a6ddd85d2251f8d9195d85cc5340aafb3
-  data.tar.gz: 5d5de257ee011436a1c3959206c31c985d6b11597d63fcab468876865394f9ee
+  metadata.gz: 8d522ca4aed441f88c808ee0af6f54aa18bd873fc4742f11fd0e890b2c611b01
+  data.tar.gz: eb3f8873178c6db5b69f6c5a2b2cc42582c21777ae92e94bda268b25873ea254
 SHA512:
-  metadata.gz: '0309ac260a37ec550e417efb01eaa72120583a5c26c6306f52c15910d36c8dc24f9e74d39319f763e3a566192ddd5887b0b022ce747f820beee388a444726dc8'
-  data.tar.gz: f4f61ba42c6510bcc744f96a27ca9a91fe965762ce4ec6206720441346ec1e5402475e27e87a7b838d342898c47df99a1e8025abf5ebce59691250417bc0015f
+  metadata.gz: f16ee4864135847b45f8782b5926329dad9a21d150da5c9bd4d4e1ac4f568046595f768bad38a716b4316113e498fffd7eb91ccb94918dceba3724a073281cfb
+  data.tar.gz: 737bac4d58bca9f678ef95fb0851fc82dc49f33eef19e91beb3c87ff34be2c2f2d5edb0417aac9ac709114e3d3b97bc1dbe32a0017cbf1d9adcc1d6dce81e119

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
+
 cache:
   bundler: true
-sudo: false
+
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.2
-  - jruby-9.1.13.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+  - jruby-9.1.17.0
+  - jruby-9.2.5.0
 before_script:
   - psql  -c 'create database sequel_bitemporal_test;' -U postgres
 env:
@@ -18,7 +21,11 @@ gemfile:
   - ci/sequel.gemfile
 matrix:
   allow_failures:
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.1.17.0
       env: PG=1 SEQUEL='~> 4.0'
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.1.17.0
+      env: PG=1 SEQUEL='~> 5.0'
+    - rvm: jruby-9.2.5.0
+      env: PG=1 SEQUEL='~> 4.0'
+    - rvm: jruby-9.2.5.0
       env: PG=1 SEQUEL='~> 5.0'

data/README.md

@@ -14,29 +14,37 @@ Dependencies
 Usage
 -----
 
-* Declare bitemporality inside your model:
+Declare bitemporality inside your model:
 
-        class HotelPriceVersion < Sequel::Model
-        end
+```ruby
+class HotelPriceVersion < Sequel::Model
+end
 
-        class HotelPrice < Sequel::Model
-          plugin :bitemporal, version_class: HotelPriceVersion
-        end
+class HotelPrice < Sequel::Model
+  plugin :bitemporal, version_class: HotelPriceVersion
+end
+```
 
-* You can now create a hotel price with bitemporal versions:
+You can now create a hotel price with bitemporal versions:
 
-        price = HotelPrice.new
-        price.update_attributes price: 18
+```ruby
+price = HotelPrice.new
+price.update_attributes price: 18
+```
 
-* To show all versions:
+To show all versions:
 
-        price.versions
+```ruby
+price.versions
+```
 
-* To get current version:
+To show current version:
 
-        price.current_version
+```ruby
+price.current_version
+```
 
-* Look at the specs for more usage patterns.
+Look at the specs for more usage patterns.
 
 Thanks
 ------
@@ -48,7 +56,17 @@ Thanks to Ksenia Zalesnaya (@ksenia-zalesnaya) for her contributions:
 - define setter methods for versioned columns
 
 Thanks to Denis Kalesnikov (@DenisKem) for his contributions:
-- allow composite primary key
+- add support for composite primary key
+  [#8](https://github.com/TalentBox/sequel_bitemporal/pull/8)
+
+Thanks to Olle Jonsson (@olleolleolle) for his contributions:
+- update specs to work with RSpec: `config.disable_monkey_patching!`
+  [#10](https://github.com/TalentBox/sequel_bitemporal/pull/10)
+- update TravisCI matrix to include more Ruby versions
+  [#11](https://github.com/TalentBox/sequel_bitemporal/pull/10)
+- README improvements
+  [#9](https://github.com/TalentBox/sequel_bitemporal/pull/9)
+  [#12](https://github.com/TalentBox/sequel_bitemporal/pull/12)
 
 License
 -------

data/lib/sequel/plugins/bitemporal.rb

@@ -334,7 +334,7 @@ module Sequel
 
             current_version.keys.each do |key|
               next if excluded_columns.include? key
-              current_attributes[key] = current_version.send key
+              current_attributes[key] = current_version.public_send key
             end if current_version?
             model.version_class.new current_attributes
           end
@@ -469,7 +469,7 @@ module Sequel
           last_version_attributes = if last_version
             last_version.columns.each_with_object({}) do |column, hash|
               unless excluded_columns.include? column
-                hash[column] = last_version.send column
+                hash[column] = last_version.public_send column
               end
             end
           else
@@ -539,33 +539,28 @@ module Sequel
           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 || {}
-          current_version_values = {}
-          columns = pending_version.columns - excluded_columns_for_changes
-          columns.each do |column|
-            current_version_values[column] = pending_version.public_send(column)
-          end
-
+          current_values = values_for_changes pending_version
           futures.each do |future_version|
             attrs = {}
             to_check_columns.each do |col|
               if previous_values[col]==future_version[col] &&
-                  previous_values[col]!=current_version_values[col]
-                attrs[col] = current_version_values[col]
+                  previous_values[col]!=current_values[col]
+                attrs[col] = current_values[col]
               end
             end
             if attrs.any?
               propagated = save_propagated future_version, attrs
+              previous_values = values_for_changes future_version
+              current_values = values_for_changes propagated
               if !propagated.new? && audited? && updated_by
                 self.class.audit_class.audit(
                   self,
-                  future_version.values,
-                  propagated.values,
+                  previous_values,
+                  current_values,
                   propagated.valid_from,
                   updated_by
                 )
               end
-              previous_values = future_version.values.dup
-              current_version_values = propagated.values
               future_version.this.update :expired_at => Sequel::Plugins::Bitemporal.point_in_time
             else
               break
@@ -583,7 +578,7 @@ module Sequel
               self.class.audit_class.audit(
                 self,
                 current_values_for_audit,
-                pending_version.values,
+                values_for_changes(pending_version),
                 pending_version.valid_from,
                 updated_by
               ) if updated_by
@@ -598,7 +593,7 @@ module Sequel
         def save_fossil(expired, attributes={})
           fossil = model.version_class.new
           expired_attributes = expired.keys.each_with_object({}) do |key, hash|
-            hash[key] = expired.send key
+            hash[key] = expired.public_send key
           end
           expired_attributes.delete :id
           fossil.set_all expired_attributes.merge(attributes)
@@ -609,7 +604,7 @@ module Sequel
         def save_propagated(version, attributes={})
           propagated = model.version_class.new
           version_attributes = version.keys.each_with_object({}) do |key, hash|
-            hash[key] = version.send key
+            hash[key] = version.public_send key
           end
           version_attributes.delete :id
           version_attributes[:created_at] = Sequel::Plugins::Bitemporal.point_in_time
@@ -627,10 +622,8 @@ module Sequel
         def pending_version_holds_changes?
           return false unless @pending_version
           return true unless current_version?
-          @current_version_values = current_version.values
-          columns = pending_version.columns - excluded_columns_for_changes
-          columns.detect do |column|
-            new_value = pending_version.send column
+          @current_version_values = values_for_changes current_version
+          values_for_changes(pending_version).any? do |column, new_value|
             case column
             when :id, :created_at, :expired_at, *version_foreign_keys
               false
@@ -653,7 +646,7 @@ module Sequel
                   new_value = model.version_class.input_transformers[:string_nilifier].call(new_value)
                 end
               end
-              current_version.send(column)!=new_value
+              current_version.public_send(column)!=new_value
             end
           end
         end
@@ -670,6 +663,14 @@ module Sequel
           @initial_version ||= model.version_class.new
         end
 
+        def values_for_changes(version)
+          values = {}
+          (version.columns - excluded_columns_for_changes).each do |column|
+            values[column] = version.public_send column
+          end
+          values
+        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.9.1"
+  s.version     = "0.10.0"
   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_serialization_spec.rb

@@ -72,4 +72,42 @@ RSpec.describe "Sequel::Plugins::Bitemporal", :skip_jdbc_sqlite do
     end
   end
 
+  it "can propage changes to future version per column with defaults" do
+    propagate_per_column = @master_class.propagate_per_column
+    begin
+      @master_class.instance_variable_set :@propagate_per_column, true
+      @version_class.class_eval do
+        define_method :name do
+          super() || {}
+        end
+      end
+      master = @master_class.new
+      expect( master.name ).to eql({})
+      expect( master.save ).to be_truthy
+      @version_class.create master_id: master.id, valid_from: Date.parse("2016-01-01"), valid_to: Date.parse("2017-01-01"), price: 0
+      @version_class.create master_id: master.id, valid_from: Date.parse("2017-01-01"), valid_to: Date.parse("2018-01-01"), price: 0, length: 10
+      @version_class.create master_id: master.id, valid_from: Date.parse("2018-01-01"), valid_to: Date.parse("2019-01-01"), price: 0, length: 20
+      @version_class.create master_id: master.id, valid_from: Date.parse("2019-01-01"), valid_to: Date.parse("2020-01-01"), price: 10, length: 20
+      expect(
+        master.update_attributes valid_from: Date.parse("2016-01-01"), price: 10
+      ).to be_truthy
+      result = master.versions_dataset.order(:expired_at, :valid_from).all.map do |version|
+        [!!version.expired_at, version.valid_from.year, version.valid_to.year, version.price, version.length, version.width, version[:name]]
+      end
+      expect(result).to eql [
+        [false, 2016, 2017, 10, nil, nil, nil],
+        [false, 2017, 2018, 0, 10, nil, "{}"],
+        [false, 2018, 2019, 0, 20, nil, nil],
+        [false, 2019, 2020, 10, 20, nil, nil],
+        [true, 2016, 2017, 0, nil, nil, nil],
+        [true, 2017, 2018, 0, 10, nil, nil],
+      ]
+    ensure
+      @version_class.class_eval do
+        undef_method :name
+      end
+      @master_class.instance_variable_set :@propagate_per_column, propagate_per_column
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel