sequel_bitemporal 0.4.19 → 0.5.0

data/lib/sequel/plugins/bitemporal.rb

@@ -46,7 +46,7 @@ module Sequel
           @versions_alias = "#{base_alias}_versions".to_sym
           @current_version_alias = "#{base_alias}_current_version".to_sym
           @audit_class = opts[:audit_class]
-          @audit_updated_by_method = opts[:audit_updated_by_method] || :updated_by_id
+          @audit_updated_by_method = opts.fetch(:audit_updated_by_method){ :updated_by }
           @propagate_per_column = opts.fetch(:propagate_per_column, false)
         end
         master.one_to_many :versions, class: version, key: :master_id, graph_alias_base: master.versions_alias
@@ -272,13 +272,13 @@ module Sequel
             end
             if attrs.any?
               propagated = save_propagated future_version, attrs
-              if !propagated.new? && audited?
+              if !propagated.new? && audited? && updated_by
                 self.class.audit_class.audit(
                   self,
                   future_version.values,
                   propagated.values,
                   propagated.valid_from,
-                  send(self.class.audit_updated_by_method)
+                  updated_by
                 )
               end
               previous_values = future_version.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.4.19"
+  s.version     = "0.5.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_date_spec.rb

@@ -574,41 +574,42 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
   after do
     Timecop.return
   end
+  let(:author){ mock :author, audit_kind: "user" }
   it "generates a new audit on creation" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).and_return author
     @audit_class.should_receive(:audit).with(
       master,
       {},
       hash_including({name: "Single Standard", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes name: "Single Standard", price: 98
   end
   it "generates a new audit on full update" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).twice.and_return author
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
       master,
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes name: "King size", price: 98 
   end
   it "generates a new audit on partial update" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).twice.and_return author
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
       master,
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes partial_update: true, name: "King size", price: 98 
   end
@@ -617,7 +618,7 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
     begin
       @master_class.instance_variable_set :@propagate_per_column, true
       master = @master_class.new
-      master.should_receive(:updated_by_id).exactly(9).times.and_return(updated_by_id = stub)
+      master.should_receive(:updated_by).exactly(8).times.and_return author
 
       master.update_attributes name: "Single Standard", price: 12, length: nil, width: 1
       initial_today = Date.today
@@ -636,14 +637,14 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
         hash_including({name: "Single Standard", price: 12, length: nil, width: 1}),
         hash_including({name: "Single Standard", price: 12, length: 3, width: 4}),
         initial_today+2,
-        updated_by_id
+        author
       )
       @audit_class.should_receive(:audit).with(
         master,
         hash_including({name: "Single Standard", price: 12, length: 1, width: 1}),
         hash_including({name: "Single Standard", price: 12, length: 1, width: 4}),
         initial_today+3,
-        updated_by_id
+        author
       )
       Timecop.freeze initial_today+3 do
         Sequel::Plugins::Bitemporal.at initial_today+2 do
@@ -655,14 +656,15 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
     end
   end
 end
-describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the updated id" do
+describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the author" do
   include DbHelpers
   before :all do
     @audit_class = Class.new do
       def self.audit(*args); end
     end
-    db_setup audit_class: @audit_class, audit_updated_by_method: :author_id
+    db_setup audit_class: @audit_class, audit_updated_by_method: :author
   end
+  let(:author){ mock :author, audit_kind: "user" }
   before do
     Timecop.freeze 2009, 11, 28
   end
@@ -671,39 +673,39 @@ describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the u
   end
   it "generates a new audit on creation" do
     master = @master_class.new
-    master.should_receive(:author_id).and_return(updated_by_id = stub)
+    master.should_receive(:author).and_return author
     @audit_class.should_receive(:audit).with(
       master,
       {},
       hash_including({name: "Single Standard", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes name: "Single Standard", price: 98
   end
   it "generates a new audit on full update" do
     master = @master_class.new
-    master.should_receive(:author_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:author).twice.and_return author
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
       master,
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes name: "King size", price: 98 
   end
   it "generates a new audit on partial update" do
     master = @master_class.new
-    master.should_receive(:author_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:author).twice.and_return author
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
       master,
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Date.today,
-      updated_by_id
+      author
     )
     master.update_attributes partial_update: true, name: "King size", price: 98 
   end

data/spec/bitemporal_time_spec.rb

@@ -365,21 +365,22 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
   after do
     Timecop.return
   end
+  let(:author){ mock :author, audit_kind: "user" }
   it "generates a new audit on creation" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).and_return author
     @audit_class.should_receive(:audit).with(
       master,
       {},
       hash_including({name: "Single Standard", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes name: "Single Standard", price: 98
   end
   it "generates a new audit on full update" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).twice.and_return author
     @audit_class.stub(:audit)
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
@@ -387,13 +388,13 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes name: "King size", price: 98 
   end
   it "generates a new audit on partial update" do
     master = @master_class.new
-    master.should_receive(:updated_by_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:updated_by).twice.and_return author
     @audit_class.stub(:audit)
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
@@ -401,17 +402,17 @@ describe "Sequel::Plugins::Bitemporal", "with audit" do
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes partial_update: true, name: "King size", price: 98 
   end
 end
 
-describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the updated id" do
+describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the author" do
   include DbHelpers
   before :all do
     @audit_class = Class.new
-    db_setup use_time: true, audit_class: @audit_class, audit_updated_by_method: :author_id
+    db_setup use_time: true, audit_class: @audit_class, audit_updated_by_method: :author
   end
   before do
     Timecop.freeze 2009, 11, 28, 10
@@ -419,21 +420,22 @@ describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the u
   after do
     Timecop.return
   end
+  let(:author){ mock :author, audit_kind: "user" }
   it "generates a new audit on creation" do
     master = @master_class.new
-    master.should_receive(:author_id).and_return(updated_by_id = stub)
+    master.should_receive(:author).and_return author
     @audit_class.should_receive(:audit).with(
       master,
       {},
       hash_including({name: "Single Standard", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes name: "Single Standard", price: 98
   end
   it "generates a new audit on full update" do
     master = @master_class.new
-    master.should_receive(:author_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:author).twice.and_return author
     @audit_class.stub(:audit)
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
@@ -441,13 +443,13 @@ describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the u
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes name: "King size", price: 98 
   end
   it "generates a new audit on partial update" do
     master = @master_class.new
-    master.should_receive(:author_id).twice.and_return(updated_by_id = stub)
+    master.should_receive(:author).twice.and_return author
     @audit_class.stub(:audit)
     master.update_attributes name: "Single Standard", price: 98
     @audit_class.should_receive(:audit).with(
@@ -455,7 +457,7 @@ describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the u
       hash_including({name: "Single Standard", price: 98}),
       hash_including({name: "King size", price: 98}),
       Time.now,
-      updated_by_id
+      author
     )
     master.update_attributes partial_update: true, name: "King size", price: 98
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 604884252736843056
+      hash: 4238333192851217509
 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: 604884252736843056
+      hash: 4238333192851217509
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24