sandthorn_driver_sequel 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afdf98e380414f253698243d6c774c0ee744f01c
-  data.tar.gz: 0a47f12826b1009ac40f7425f63040f91aeba81a
+  metadata.gz: 733436ed1a28c227cd7f4af61f0e988d3596d4cc
+  data.tar.gz: 3fb7675715543044914b2490a5322855d4d3163b
 SHA512:
-  metadata.gz: 684d556c1a96bcad5a8a471e2d4f3ef470f7f2db40f4cf37af8f1f491c102ed9c32ad5c06fad652817927b17cfbf82ffe26ead0aae01305e69aa9f04c35a8c6b
-  data.tar.gz: 9e4f1345797c3d9906f66cfc056f2a971b6e17c9d303ba080a4db850ae545a8ab2de1b9454ced03609369d609e3a81c7a216242432a98142c2ed3758123d1c7d
+  metadata.gz: 1b8bdba85c255968f5c076780ee5f2de0ade21168d91ad3e45c8b2ee965d3c5b1fe14cb23cb3460bf4ee4b3dad2dd0b5ceb1cd59e8223e542e709cfee5e8ede7
+  data.tar.gz: 9850c19545a557071a6bb616d08e2d01fdfd281db913e41d1de1cf4c9ccfe5aa79f31b05a8eae2df3c3f9c86555c13e3fa98ba41d120f674f9cedbb1fa5269e1

data/README.md

@@ -22,16 +22,14 @@ Or install it yourself as:
 
 ### `SandthornDriverSequel.configure`
 
-Change the global configuration, the default data serialization for events and snapshots are YAML.
+Change the global configuration, the default data serialization for events are YAML.
 
-Change the serialization of events and snapshots to Oj.
+Change the serialization of events to Oj.
 
 ```ruby
 SandthornDriverSequel.configure { |conf|
   conf.event_serializer = Proc.new { |data| Oj::dump(data) }
   conf.event_deserializer = Proc.new { |data| Oj::load(data) }
-  conf.snapshot_serializer = Proc.new { |data| Oj::dump(data) }
-  conf.snapshot_deserializer = Proc.new { |data| Oj::dump(data) }
 }
 ```
 

data/lib/sandthorn_driver_sequel/access/aggregate_access.rb

@@ -34,10 +34,6 @@ module SandthornDriverSequel
       aggregate
     end
 
-    def aggregate_types
-      storage.aggregates.select(:aggregate_type).distinct.select_map(:aggregate_type)
-    end
-
     # Returns aggregate ids.
     # @param aggregate_type, optional,
     def aggregate_ids(aggregate_type: nil)

data/lib/sandthorn_driver_sequel/access/event_access.rb

@@ -23,7 +23,7 @@ module SandthornDriverSequel
     def find_events_by_aggregate_id(aggregate_id)
       aggregate_version = Sequel.qualify(storage.events_table_name, :aggregate_version)
       wrap(storage.events
-        .join(storage.aggregates, id: :aggregate_table_id)
+        .join(storage.aggregates_table_name, id: :aggregate_table_id)
         .where(aggregate_id: aggregate_id)
         .select(
           :sequence_number,
@@ -32,20 +32,12 @@ module SandthornDriverSequel
           aggregate_version,
           :event_name,
           :event_data,
+          :event_metadata,
           :timestamp)
         .order(:sequence_number)
         .all)
     end
 
-    # Returns events that occurred after the given snapshot
-    def after_snapshot(snapshot)
-      _aggregate_version = snapshot.aggregate_version
-      aggregate_table_id = snapshot.aggregate_table_id
-      wrap(storage.events
-        .where(aggregate_table_id: aggregate_table_id)
-        .where { aggregate_version > _aggregate_version }.all)
-    end
-
     def get_events(*args)
       query_builder = EventQuery.new(storage)
       query_builder.build(*args)
@@ -56,16 +48,19 @@ module SandthornDriverSequel
 
     def wrap(arg)
       events = Utilities.array_wrap(arg)
-      events.each { |e| e[:event_args] = deserialize(e[:event_data]) }
+      events.each { |e| 
+        e[:event_data] = deserialize(e[:event_data])
+        e[:event_metadata] = deserialize(e[:event_metadata])
+      }
       events.map { |e| EventWrapper.new(e.values) }
     end
 
     def deserialize event_data
-      @deserializer.call(event_data)
+      event_data ? @deserializer.call(event_data) : nil
     end
 
-    def serialize event_args
-      @serializer.call(event_args)
+    def serialize event_data
+      @serializer.call(event_data)
     end
 
     def build_event_data(aggregate, timestamp, event)
@@ -73,7 +68,8 @@ module SandthornDriverSequel
         aggregate_table_id: aggregate.id,
         aggregate_version: aggregate.aggregate_version,
         event_name: event.event_name,
-        event_data: serialize(event.event_args),
+        event_data: serialize(event.event_data),
+        event_metadata: serialize(event.event_metadata),
         timestamp: timestamp
       }
     end

data/lib/sandthorn_driver_sequel/errors.rb

@@ -32,18 +32,4 @@ module SandthornDriverSequel::Errors
     end
   end
 
-  class WrongSnapshotVersionError < Error
-    attr_reader :aggregate, :version
-    def initialize(aggregate, version)
-      @aggregate = aggregate
-      @version = version
-      super(create_message)
-    end
-
-    def create_message
-      "#{aggregate[:aggregate_type]} with id #{aggregate[:aggregate_id]}: tried to save snapshot with version "+
-      "#{version}, but current version is at #{aggregate[:aggregate_version]}"
-    end
-  end
-
 end    

data/lib/sandthorn_driver_sequel/event_query.rb

@@ -48,6 +48,7 @@ module SandthornDriverSequel
         :sequence_number,
         :event_name,
         :event_data,
+        :event_metadata,
         :timestamp
       ]
     end
@@ -58,9 +59,9 @@ module SandthornDriverSequel
 
     def add_aggregate_types(query, aggregate_types)
       if aggregate_types.any?
-        query.join(storage.aggregates, id: :aggregate_table_id, aggregate_type: aggregate_types)
+        query.join(storage.aggregates_table_name, id: :aggregate_table_id, aggregate_type: aggregate_types)
       else
-        query.join(storage.aggregates, id: :aggregate_table_id)
+        query.join(storage.aggregates_table_name, id: :aggregate_table_id)
       end
     end
 

data/lib/sandthorn_driver_sequel/event_store.rb

@@ -1,6 +1,5 @@
 require "sandthorn_driver_sequel/access/aggregate_access"
 require "sandthorn_driver_sequel/access/event_access"
-require "sandthorn_driver_sequel/access/snapshot_access"
 require "sandthorn_driver_sequel/storage"
 
 module SandthornDriverSequel
@@ -14,8 +13,6 @@ module SandthornDriverSequel
       @context = context
       @event_serializer = configuration.event_serializer
       @event_deserializer = configuration.event_deserializer
-      @snapshot_serializer = configuration.snapshot_serializer
-      @snapshot_deserializer = configuration.snapshot_deserializer
     end
 
     def self.from_url url, configuration, context = nil
@@ -32,61 +29,33 @@ module SandthornDriverSequel
       end
     end
 
-    def save_snapshot aggregate
-      driver.execute_in_transaction do |db|
-        snapshot_access = get_snapshot_access(db)
-        snapshot_access.record_snapshot(aggregate)
-      end
-    end
-
     #get methods
     def all aggregate_type
       return get_aggregate_ids(aggregate_type: aggregate_type).map do |id|
-        get_aggregate_events_from_snapshot(id)
+        aggregate_events(id)
       end
     end
 
-    def find aggregate_id
-      get_aggregate_events_from_snapshot(aggregate_id)
+    def find aggregate_id, aggregate_type
+      aggregate_events(aggregate_id)
     end
 
-    
-    def get_aggregate_events(aggregate_id)
+    def get_events(*args)
       driver.execute do |db|
-        events = get_event_access(db)
-        events.find_events_by_aggregate_id(aggregate_id)
+        event_access = get_event_access(db)
+        event_access.get_events(*args)
       end
     end
 
-    # If the aggregate has a snapshot, return events starting from the snapshots.
-    # Otherwise, return all events.
-    # TODO: needs a better name
-    def get_aggregate_events_from_snapshot(aggregate_id)
+    private
+
+    def aggregate_events(aggregate_id)
       driver.execute do |db|
-        snapshots = get_snapshot_access(db)
         event_access = get_event_access(db)
-        snapshot = snapshots.find_by_aggregate_id(aggregate_id)
-        if snapshot
-          events = event_access.after_snapshot(snapshot)
-          snapshot_event = build_snapshot_event(snapshot)
-          events.unshift(snapshot_event)
-        else
-          event_access.find_events_by_aggregate_id(aggregate_id)
-        end
+        event_access.find_events_by_aggregate_id(aggregate_id)
       end
     end
 
-
-
-    
-
-    def get_aggregate aggregate_id, *class_name
-      warn(":get_aggregate is deprecated. Use :get_aggregate_events_from_snapshot")
-      get_aggregate_events_from_snapshot(aggregate_id)
-    end
-
-    
-
     def get_aggregate_ids(aggregate_type: nil)
       driver.execute do |db|
         access = get_aggregate_access(db)
@@ -94,59 +63,6 @@ module SandthornDriverSequel
       end
     end
 
-    def get_aggregate_list_by_typename(type)
-      warn(":get_aggregate_list_by_typenames is deprecated. Use :get_aggregate_ids")
-      get_aggregate_ids(aggregate_type: type)
-    end
-
-    def get_all_types
-      driver.execute do |db|
-        access = get_aggregate_access(db)
-        access.aggregate_types
-      end
-    end
-
-    def get_snapshot aggregate_id
-      driver.execute do |db|
-        snapshots = get_snapshot_access(db)
-        snapshot = snapshots.find_by_aggregate_id(aggregate_id)
-        snapshot.data
-      end
-    end
-
-    def get_events(*args)
-      driver.execute do |db|
-        event_access = get_event_access(db)
-        event_access.get_events(*args)
-      end
-    end
-
-    def get_new_events_after_event_id_matching_classname event_id, class_name, take: 0
-      get_events(after_sequence_number: event_id, aggregate_types: Utilities.array_wrap(class_name), take: take)
-    end
-
-    def obsolete_snapshots(*args)
-      driver.execute do |db|
-        snapshots = get_snapshot_access(db)
-        snapshots.obsolete(*args)
-      end
-    end
-
-    private
-
-    def build_snapshot_event(snapshot)
-      {
-        aggregate: snapshot.data,
-      }
-    end
-
-    def transform_snapshot(snapshot)
-      {
-          aggregate_version: snapshot.aggregate_version,
-          event_data: snapshot.snapshot_data
-      }
-    end
-
     def get_aggregate_access(db)
       @aggregate_access ||= AggregateAccess.new(storage(db))
     end
@@ -155,10 +71,6 @@ module SandthornDriverSequel
       @event_access ||= EventAccess.new(storage(db), @event_serializer, @event_deserializer)
     end
 
-    def get_snapshot_access(db)
-      @snapshot_access ||= SnapshotAccess.new(storage(db), @snapshot_serializer, @snapshot_deserializer)
-    end
-
     def storage(db)
       @storage ||= Storage.new(db, @context)
     end

data/lib/sandthorn_driver_sequel/event_store_context.rb

@@ -1,15 +1,15 @@
 module SandthornDriverSequel
   module EventStoreContext
     attr_reader :context
+
     def events_table_name
       with_context_if_exists :events
     end
+
     def aggregates_table_name
       with_context_if_exists :aggregates
     end
-    def snapshots_table_name
-      with_context_if_exists :snapshots
-    end
+
     def with_context_if_exists name
       name = "#{context}_#{name}".to_sym if context
       name

data/lib/sandthorn_driver_sequel/migration.rb

@@ -17,7 +17,6 @@ module SandthornDriverSequel
     private
     def clear_for_test
       driver.execute do |db|
-        db[snapshots_table_name].truncate
         db[events_table_name].truncate
         db[aggregates_table_name].truncate
       end
@@ -77,13 +76,23 @@ module SandthornDriverSequel
           was_migrated events_migration_1, db
         end
       end
+
+      events_migration_2 = "#{events_table_name}-20170514"
+      unless has_been_migrated?(events_migration_2)
+        driver.execute_in_transaction do |db|
+          db.alter_table events_table_name do
+            add_column :event_metadata, String, text: true, null: true
+          end
+          was_migrated events_migration_2, db
+        end
+      end
     end
     def snapshots
-      snapshot_migration_0 = "#{snapshots_table_name}-20130312"
+      snapshot_migration_0 = "#{:snapshots}-20130312"
       unless has_been_migrated?(snapshot_migration_0)
         driver.execute_in_transaction do |db|
           aggr_table = aggregates_table_name
-          db.create_table(snapshots_table_name) do
+          db.create_table(:snapshots) do
             primary_key :id
             Integer :aggregate_version, null: false
             String :snapshot_data, text: true, null: false
@@ -93,6 +102,14 @@ module SandthornDriverSequel
           was_migrated snapshot_migration_0, db
         end
       end
+      snapshot_migration_1 = "#{:snapshots}-20170416"
+      unless has_been_migrated?(snapshot_migration_1)
+        driver.execute_in_transaction do |db|
+          db.drop_table?(:snapshots)
+          was_migrated snapshot_migration_1, db
+        end
+
+      end
     end
 
     def migration_table_name

data/lib/sandthorn_driver_sequel/storage.rb

@@ -25,11 +25,6 @@ module SandthornDriverSequel
       Class.new(Sequel::Model(events_table))
     end
 
-    # Returns a Sequel::Model for accessing snapshots
-    def snapshots
-      Class.new(Sequel::Model(snapshots_table))
-    end
-
     def aggregates_table
       db[aggregates_table_name]
     end
@@ -38,9 +33,5 @@ module SandthornDriverSequel
       db[events_table_name]
     end
 
-    def snapshots_table
-      db[snapshots_table_name]
-    end
-
   end
 end

data/lib/sandthorn_driver_sequel/version.rb

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

data/lib/sandthorn_driver_sequel/wrappers/event_wrapper.rb

@@ -2,7 +2,7 @@ require 'delegate'
 module SandthornDriverSequel
   class EventWrapper < SimpleDelegator
 
-    [:aggregate_version, :event_name, :event_data, :event_args, :timestamp, :aggregate_table_id].each do |attribute|
+    [:aggregate_version, :event_name, :event_data, :event_metadata, :timestamp, :aggregate_table_id].each do |attribute|
       define_method(attribute) do
         fetch(attribute)
       end

data/lib/sandthorn_driver_sequel/wrappers.rb

@@ -1,2 +1 @@
 require "sandthorn_driver_sequel/wrappers/event_wrapper"
-require "sandthorn_driver_sequel/wrappers/snapshot_wrapper"

data/lib/sandthorn_driver_sequel.rb

@@ -83,32 +83,6 @@ module SandthornDriverSequel
         -> (data) { YAML.load(data) }
       end
 
-      #snapshot
-      def snapshot_serializer=(block)
-        @snapshot_serializer = block
-      end
-
-      def snapshot_deserializer=(block)
-        @snapshot_deserializer = block
-      end
-
-      def snapshot_serializer
-        @snapshot_serializer || default_snapshot_serializer
-      end
-
-      def snapshot_deserializer
-        @snapshot_deserializer || default_snapshot_deserializer
-      end
-
-      def default_snapshot_serializer
-        -> (data) { YAML.dump(data) }
-      end
-
-      def default_snapshot_deserializer
-        -> (data) { YAML.load(data) }
-      end
-
-
     end
   end
 end

data/sandthorn_driver_sequel.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "rspec"
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "autotest-standalone"
   spec.add_development_dependency "uuidtools"
   spec.add_development_dependency "ruby-beautify"
-  spec.add_development_dependency "guard-rspec"
 
-  spec.add_runtime_dependency     "sequel", "~> 4.17"
+  spec.add_runtime_dependency     "sequel"
 end

data/spec/aggregate_access_spec.rb

@@ -62,16 +62,6 @@ module SandthornDriverSequel
       end
     end
 
-    describe "#aggregate_types" do
-      it "returns all aggregate types in the event store" do
-        types = ["foo", "bar", "qux"]
-        types.each do |type|
-          access.register_aggregate(generate_uuid, type)
-        end
-        expect(access.aggregate_types).to eq(types.sort)
-      end
-    end
-
     describe "#aggregate_ids" do
       context "when given no argument" do
         it "returns all aggregate ids" do

data/spec/benchmark_spec.rb

@@ -10,20 +10,20 @@ module Sandthorn
       before(:each) { prepare_for_test }
       let(:test_events_20_events) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new", event_args: {:method_name=>"new", :method_args=>[], :attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}}
+        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"}]}}
         19.times do |i| 
-           e << {aggregate_version: i+2, event_name: "foo", event_args: "A2"}
+           e << {aggregate_version: i+2, event_name: "foo", event_data: "A2"}
         end
         e
       end
       let(:test_events_one_event) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new", event_args: "B1" }
+        e << {aggregate_version: 1, event_name: "new", event_data: "B1" }
       end
       let(:test_events_two_events) do
         e = [] 
-        e << {aggregate_version: 1, event_name: "new", event_args: {:method_name=>"new", :method_args=>[], :attribute_deltas=>[{:attribute_name=>"aggregate_id", :old_value=>nil, :new_value=>"0a74e545-be84-4506-8b0a-73e947856327"}]}}
-        e << {aggregate_version: 2, event_name: "foo", event_args: "A2"}
+        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"}
       end
       let(:aggregate_id) {"c0456e26-2345-4f67-92fa-130b3a31a39a"}
       let(:es) { event_store }
@@ -72,36 +72,7 @@ module Sandthorn
         end
 
       end
-       describe "find with snapshot" do
-
-        it "should find one event that is snapshoted 500 times" do
-          snapshot_data = { event_data: YAML.dump(Object.new), aggregate_version: 1 } 
-          es.save_events(test_events_one_event, 0, aggregate_id, SandthornDriverSequel::EventStore)
-          es.save_snapshot(snapshot_data, aggregate_id, SandthornDriverSequel::EventStore)
-
-          Benchmark.bm do |x|
-            x.report("find") { for i in 1..n; es.get_aggregate(aggregate_id, SandthornDriverSequel::EventStore);  end }
-          end
-        end
-        it "should find two events that is snapshoted 500 times" do
-          snapshot_data = { event_data: YAML.dump(Object.new), aggregate_version: 2 } 
-          es.save_events(test_events_two_events, 0, aggregate_id, SandthornDriverSequel::EventStore)
-          es.save_snapshot(snapshot_data, aggregate_id, SandthornDriverSequel::EventStore)
-          Benchmark.bm do |x|
-            x.report("find") { for i in 1..n; es.get_aggregate(aggregate_id, SandthornDriverSequel::EventStore);  end }
-          end
-        end
-        it "should find twenty events that is snapshoted 500 times" do
-          snapshot_data = { event_data: YAML.dump(Object.new), aggregate_version: 19 } 
-          es.save_events(test_events_20_events, 0, aggregate_id, SandthornDriverSequel::EventStore)
-          es.save_snapshot(snapshot_data, aggregate_id, SandthornDriverSequel::EventStore)
-
-          Benchmark.bm do |x|
-            x.report("find") { for i in 1..n; es.get_aggregate(aggregate_id, SandthornDriverSequel::EventStore);  end }
-          end
-        end
-
-      end
+       
       # it "new save and find 500 aggregates" do
 
       #   Benchmark.bm do |x|

data/spec/configuration_spec.rb

@@ -19,21 +19,11 @@ module SandthornDriverSequel
         expect(driver.instance_variable_get "@event_deserializer".to_sym).to be_a Proc
       end
 
-      it "should have the default snapshot_serializer" do
-        expect(driver.instance_variable_get "@snapshot_serializer".to_sym).to be_a Proc
-      end
-
-      it "should have the default snapshot_deserializer" do
-        expect(driver.instance_variable_get "@snapshot_deserializer".to_sym).to be_a Proc
-      end
-
       context "change global configuration" do
         before do
           SandthornDriverSequel.configure { |conf|
             conf.event_serializer = :serializer_event_global
             conf.event_deserializer = :deserializer_event_global
-            conf.snapshot_serializer = :serializer_snapshot_global
-            conf.snapshot_deserializer = :deserializer_snapshot_global
           }
         end
 
@@ -42,8 +32,6 @@ module SandthornDriverSequel
           SandthornDriverSequel.configure { |conf|
             conf.event_serializer = -> (data) { YAML.dump(data) }
             conf.event_deserializer = -> (data) { YAML.load(data) }
-            conf.snapshot_serializer = -> (data) { YAML.dump(data) }
-            conf.snapshot_deserializer = -> (data) { YAML.load(data) }
           }
         end
 
@@ -55,13 +43,6 @@ module SandthornDriverSequel
           expect(driver.instance_variable_get "@event_deserializer".to_sym).to eql :deserializer_event_global
         end
 
-        it "should have the new snapshot_serializer" do
-          expect(driver.instance_variable_get "@snapshot_serializer".to_sym).to eql :serializer_snapshot_global
-        end
-
-        it "should have the default snapshot_deserializer" do
-          expect(driver.instance_variable_get "@snapshot_deserializer".to_sym).to eql :deserializer_snapshot_global
-        end
       end
     end
 
@@ -70,8 +51,6 @@ module SandthornDriverSequel
         SandthornDriverSequel.driver_from_connection(connection: Sequel.sqlite) { |conf|
           conf.event_serializer = :event_serializer
           conf.event_deserializer = :event_deserializer
-          conf.snapshot_serializer = :snapshot_serializer
-          conf.snapshot_deserializer = :snapshot_deserializer
         }
       end
 
@@ -87,14 +66,6 @@ module SandthornDriverSequel
         expect(driver.instance_variable_get "@event_deserializer".to_sym).to eql :event_deserializer
       end
 
-      it "should have a configuration snapshot_serializer" do
-        expect(driver.instance_variable_get "@snapshot_serializer".to_sym).to eql :snapshot_serializer
-      end
-
-      it "should have a configuration snapshot_deserializer" do
-        expect(driver.instance_variable_get "@snapshot_deserializer".to_sym).to eql :snapshot_deserializer
-      end
-
     end
 
 

data/spec/driver_interface_spec.rb

@@ -7,13 +7,6 @@ module SandthornDriverSequel
       let(:subject) { event_store }
       methods = [
         :save_events,
-        :save_snapshot,
-        :get_aggregate_events_from_snapshot,
-        :get_aggregate,
-        :get_aggregate_events,
-        :get_aggregate_ids,
-        :get_all_types,
-        :get_snapshot,
         :get_events,
         :context,
         :driver,