sandthorn_driver_sequel 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733436ed1a28c227cd7f4af61f0e988d3596d4cc
-  data.tar.gz: 3fb7675715543044914b2490a5322855d4d3163b
+  metadata.gz: 0a1fe00053ffc5348f2d2f32af95a97a94a6c282
+  data.tar.gz: 67e545d052af2a9633970b469cbeb1c68287bc46
 SHA512:
-  metadata.gz: 1b8bdba85c255968f5c076780ee5f2de0ade21168d91ad3e45c8b2ee965d3c5b1fe14cb23cb3460bf4ee4b3dad2dd0b5ceb1cd59e8223e542e709cfee5e8ede7
-  data.tar.gz: 9850c19545a557071a6bb616d08e2d01fdfd281db913e41d1de1cf4c9ccfe5aa79f31b05a8eae2df3c3f9c86555c13e3fa98ba41d120f674f9cedbb1fa5269e1
+  metadata.gz: 0c154c8ca437483f418464fa3c5d6fa279153dc173d26634824269d4e982c7b45df7f28f24c849f6e68bc58ea37051b14e2a0cea7a83eef7642bb7a7c604066d
+  data.tar.gz: a808bcdefe4bbf12872d63ad1b28a03856d91e51d7a54d47654d8f7acacf9808e44d69214e0629a1a8a6ce7ffe4062cf8f1eb4ecdb67fdb89271c6de82ee65f6

data/lib/sandthorn_driver_sequel/access/event_access.rb

@@ -20,11 +20,12 @@ module SandthornDriverSequel
       aggregate.save
     end
 
-    def find_events_by_aggregate_id(aggregate_id)
+    def find_events_by_aggregate_id(aggregate_id, after_aggregate_version = 0)
       aggregate_version = Sequel.qualify(storage.events_table_name, :aggregate_version)
       wrap(storage.events
         .join(storage.aggregates_table_name, id: :aggregate_table_id)
         .where(aggregate_id: aggregate_id)
+        .where(aggregate_version > after_aggregate_version)
         .select(
           :sequence_number,
           :aggregate_id,

data/lib/sandthorn_driver_sequel/event_store.rb

@@ -36,8 +36,8 @@ module SandthornDriverSequel
       end
     end
 
-    def find aggregate_id, aggregate_type
-      aggregate_events(aggregate_id)
+    def find aggregate_id, aggregate_type, after_aggregate_version = 0
+      aggregate_events(aggregate_id, after_aggregate_version)
     end
 
     def get_events(*args)
@@ -49,10 +49,10 @@ module SandthornDriverSequel
 
     private
 
-    def aggregate_events(aggregate_id)
+    def aggregate_events(aggregate_id, after_aggregate_version = 0)
       driver.execute do |db|
         event_access = get_event_access(db)
-        event_access.find_events_by_aggregate_id(aggregate_id)
+        event_access.find_events_by_aggregate_id(aggregate_id, after_aggregate_version)
       end
     end
 

data/lib/sandthorn_driver_sequel/version.rb

@@ -1,3 +1,3 @@
 module SandthornDriverSequel
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/spec/benchmark_spec.rb

@@ -10,9 +10,9 @@ module Sandthorn
       before(:each) { prepare_for_test }
       let(:test_events_20_events) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {} }
         19.times do |i| 
-           e << {aggregate_version: i+2, event_name: "foo", event_data: "A2"}
+           e << {aggregate_version: i+2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "A2"}
         end
         e
       end
@@ -22,8 +22,8 @@ module Sandthorn
       end
       let(:test_events_two_events) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}}
-        e << {aggregate_version: 2, event_name: "foo", event_data: "A2"}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {} }
+        e << {aggregate_version: 2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "A2"}
       end
       let(:aggregate_id) {"c0456e26-2345-4f67-92fa-130b3a31a39a"}
       let(:es) { event_store }

data/spec/event_access_spec.rb

@@ -33,6 +33,11 @@ module SandthornDriverSequel
           event_name: "foo",
           event_data: "foo_data",
           event_metadata: nil
+        },{
+          aggregate_version: 3,
+          event_name: "foo2",
+          event_data: "foo_data2",
+          event_metadata: nil
         }
       ]
     end
@@ -80,10 +85,37 @@ module SandthornDriverSequel
           expect(stored_events.size).to eq(events.size)
           expect(stored_events).to all(respond_to(:merge))
         end
+
+        it "returns events in correct order" do
+          expect(stored_events.first[:aggregate_version] < stored_events.last[:aggregate_version]).to be_truthy
+          expect(stored_events.first[:sequence_number] < stored_events.last[:sequence_number]).to be_truthy
+        end
+
+      end
+
+      context "when using after_aggregate_version" do
+        before do
+          access.store_events(aggregate, events)
+        end
+
+        # exclude the first event
+        let(:stored_events) { access.find_events_by_aggregate_id(aggregate.aggregate_id, 1) }
+
+        it "returns correct events" do
+          expect(stored_events.map(&:aggregate_table_id)).to all(eq(aggregate.id))
+          expect(stored_events.size).to eq(events.size-1)
+          expect(stored_events).to all(respond_to(:merge))
+        end
+
         it "returns events in correct order" do
           expect(stored_events.first[:aggregate_version] < stored_events.last[:aggregate_version]).to be_truthy
           expect(stored_events.first[:sequence_number] < stored_events.last[:sequence_number]).to be_truthy
         end
+
+        it "should not return event with aggregate_version = 1" do
+          expect(stored_events.first[:aggregate_version]).not_to eq(1)
+        end
+        
       end
     end
 

data/spec/event_store_with_context_spec.rb

@@ -8,9 +8,9 @@ module SandthornDriverSequel
     context("when saving in one context and retrieving in another") do
       let(:test_events) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new",  event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: nil}
-        e << {aggregate_version: 2, event_name: "foo",  event_data: "noop", event_metadata: nil}
-        e << {aggregate_version: 3, event_name: "flubber",  event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new",  event_data: {}, event_metadata: nil}
+        e << {aggregate_version: 2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo",  event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 3, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "flubber",  event_data: "noop", event_metadata: nil}
       end
       let(:aggregate_id) {"c0456e26-e29a-4f67-92fa-130b3a31a39b"}
       it "should not find them" do

data/spec/get_events_spec.rb

@@ -5,25 +5,25 @@ module SandthornDriverSequel
     before(:each) { prepare_for_test }
     let(:test_events_a) do
       e = []
-      e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: {a: 1}}
-      e << {aggregate_version: 2, event_name: "foo", event_data: "A2", event_metadata: {a: 1}}
-      e << {aggregate_version: 3, event_name: "bard", event_data: "A3", event_metadata: {a: 1}}
+      e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {}, event_metadata: {a: 1}}
+      e << {aggregate_version: 2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "A2", event_metadata: {a: 1}}
+      e << {aggregate_version: 3, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "bard", event_data: "A3", event_metadata: {a: 1}}
     end
     let(:aggregate_id_a) {"c0456e26-e29a-4f67-92fa-130b3a31a39a"}
     let(:test_events_b) do
       e = []
-      e << {aggregate_version: 1, event_name: "new", event_data: "B1", event_metadata: 1}
-      e << {aggregate_version: 2, event_name: "foo", event_data: "B2", event_metadata: 2}
-      e << {aggregate_version: 3, event_name: "bar", event_data: "B3", event_metadata: 3}
+      e << {aggregate_version: 1, aggregate_id: "c0456e26-e29a-4f67-92fa-130b3a31a39a", event_name: "new", event_data: "B1", event_metadata: 1}
+      e << {aggregate_version: 2, aggregate_id: "c0456e26-e29a-4f67-92fa-130b3a31a39a", event_name: "foo", event_data: "B2", event_metadata: 2}
+      e << {aggregate_version: 3, aggregate_id: "c0456e26-e29a-4f67-92fa-130b3a31a39a", event_name: "bar", event_data: "B3", event_metadata: 3}
     end
     let(:aggregate_id_b) {"c0456e26-1234-4f67-92fa-130b3a31a39a"}
     let(:test_events_c) do
       e = []
-      e << {aggregate_version: 1, event_name: "new", event_data: "C1", event_metadata: 4}
+      e << {aggregate_version: 1, aggregate_id: "c0456e26-e29a-4f67-92fa-130b3a31a39a", event_name: "new", event_data: "C1", event_metadata: 4}
     end
     let(:test_events_c_2) do
       e = []
-      e << {aggregate_version: 2, event_name: "flubber", event_data: "C2", event_metadata: 6}
+      e << {aggregate_version: 2, aggregate_id: "c0456e26-e29a-4f67-92fa-130b3a31a39a", event_name: "flubber", event_data: "C2", event_metadata: 6}
     end
     let(:aggregate_id_c) {"c0456e26-2345-4f67-92fa-130b3a31a39a"}
     before(:each) do

data/spec/saving_events_spec.rb

@@ -6,9 +6,9 @@ module SandthornDriverSequel
     context "when saving a prefectly sane event stream" do
       let(:test_events) do
         e = []
-        e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: [1,2,3]}
-        e << {aggregate_version: 2, event_name: "foo", event_data: "noop", event_metadata: nil}
-        e << {aggregate_version: 3, event_name: "flubber", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {}, event_metadata: [1,2,3]}
+        e << {aggregate_version: 2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 3, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "flubber", event_data: "noop", event_metadata: nil}
       end
 
       let(:aggregate_id) { "c0456e26-e29a-4f67-92fa-130b3a31a39a" }
@@ -28,7 +28,7 @@ module SandthornDriverSequel
         expect(event[:event_name]).to eql("new")
         expect(event[:aggregate_id]).to eql aggregate_id
         expect(event[:aggregate_version]).to eql 1
-        expect(event[:sequence_number]).to be_a(Fixnum)
+        expect(event[:sequence_number]).to be_a(Integer)
         expect(event[:timestamp]).to be_a(Time)
       end
     end
@@ -36,13 +36,13 @@ module SandthornDriverSequel
     context "when saving two aggregate types" do
       let(:test_events_1) do
         e = []
-        e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: nil}
-        e << {aggregate_version: 2, event_name: "foo", event_data: "noop", event_metadata: nil}
-        e << {aggregate_version: 3, event_name: "flubber", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {}, event_metadata: nil}
+        e << {aggregate_version: 2, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: 3, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "flubber", event_data: "noop", event_metadata: nil}
       end
       let(:test_events_2) do
         e = []
-        e << {aggregate_version: 1, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: nil}
+        e << {aggregate_version: 1, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {}, event_metadata: nil}
       end
       let(:aggregate_id_1) {"c0456e26-e29a-4f67-92fa-130b3a31a39a"}
       let(:aggregate_id_2) {"c0456e26-e92b-4f67-92fa-130b3a31b93b"}
@@ -65,9 +65,9 @@ module SandthornDriverSequel
     context "when saving events that have no aggregate_version" do
       let(:test_events) do
         e = []
-        e << {aggregate_version: nil, event_name: "new", event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}, event_metadata: nil}
-        e << {aggregate_version: nil, event_name: "foo", event_data: "noop", event_metadata: nil}
-        e << {aggregate_version: nil, event_name: "flubber", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: nil, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "new", event_data: {}, event_metadata: nil}
+        e << {aggregate_version: nil, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "foo", event_data: "noop", event_metadata: nil}
+        e << {aggregate_version: nil, aggregate_id: "0a74e545-be84-4506-8b0a-73e947856327", event_name: "flubber", event_data: "noop", event_metadata: nil}
       end
 
       let(:aggregate_id) { "c0456e26-e29a-4f67-92fa-130b3a31a39a" }
@@ -87,7 +87,7 @@ module SandthornDriverSequel
         expect(event[:event_name]).to eql("new")
         expect(event[:aggregate_id]).to eql aggregate_id
         expect(event[:aggregate_version]).to eql 1
-        expect(event[:sequence_number]).to be_a(Fixnum)
+        expect(event[:sequence_number]).to be_a(Integer)
         expect(event[:timestamp]).to be_a(Time)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandthorn_driver_sequel
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Lars Krantz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,7 +223,6 @@ files:
 - spec/db/.keep
 - spec/driver_interface_spec.rb
 - spec/event_access_spec.rb
-- spec/event_store_spec.rb
 - spec/event_store_with_context_spec.rb
 - spec/get_events_spec.rb
 - spec/migration_specifying_domain_spec.rb
@@ -250,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sequel driver for Sandthorn
@@ -261,7 +260,6 @@ test_files:
 - spec/db/.keep
 - spec/driver_interface_spec.rb
 - spec/event_access_spec.rb
-- spec/event_store_spec.rb
 - spec/event_store_with_context_spec.rb
 - spec/get_events_spec.rb
 - spec/migration_specifying_domain_spec.rb

data/spec/event_store_spec.rb

@@ -1,46 +0,0 @@
-# require 'spec_helper'
-# module SandthornDriverSequel
-#   describe EventStore do
-    
-#     before(:each) { prepare_for_test context: nil; }
-#     let(:event_store) { SandthornDriverSequel.driver_from_url url: event_store_url }  
-    
-#     describe("when getting the same data from find and aggregate_events") do
-#       let(:test_events) do
-#         e = [] 
-#         e << {aggregate_version: 1, event_name: "new",  event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>aggregate_id}]}, event_meta_data: nil}
-#         e << {aggregate_version: 2, event_name: "foo",  event_data: "noop", event_meta_data: nil}
-#         e << {aggregate_version: 3, event_name: "flubber",  event_data: "noop", event_meta_data: nil}
-#       end
-#       let(:aggregate_id) {"c0456e26-e29a-4f67-92fa-130b3a31a39b"}
-      
-#       before do
-#         event_store.save_events test_events, aggregate_id, String
-#       end
-
-#       context "all" do
-
-#         let(:test_events_2) do
-#           e = [] 
-#           e << {aggregate_version: 1, event_name: "new",  event_data: {:attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>aggregate_id_2}]}, event_meta_data: nil}
-#           e << {aggregate_version: 2, event_name: "foo",  event_data: "noop", event_meta_data: nil}
-#           e << {aggregate_version: 3, event_name: "flubber",  event_data: "noop", event_meta_data: nil}
-#         end
-#         let(:aggregate_id_2) {"d0456e26-e29a-4f67-92fa-130b3a31a39b"}
-
-#         before do
-#           event_store.save_events test_events_2, aggregate_id_2, String
-#         end
-
-#         let(:all_events) do
-#           event_store.all String
-#         end
-
-#         it "should get two arrays of events" do
-#           expect(all_events.length).to eql 2
-#         end
-
-#       end
-#     end
-#   end
-# end