sandthorn 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d4f14306b2c1c46da7b99ce8409f6e69dcddf050
-  data.tar.gz: 87dc839602892021e7aa13b2830bedbb1cc90891
+SHA256:
+  metadata.gz: eb2833dc0d8dfa96bc80089a176f2718040f1107f0305232840e3009232511bb
+  data.tar.gz: 1c57a94df6798dfa32a1050d105bec05ccf30e08876c0a50aa610e3f7be3ce11
 SHA512:
-  metadata.gz: 627da016b372e4f64e452c7bd3a6a8b69412f11e43b2f885e46b1aff6593d4cc73db78521761d5ef2f670ff238836b17a9e25d36208db37830670b38b30fea41
-  data.tar.gz: a6db0ce8921f77bfeccf4fca94ba3ba2228f5f00d73318c445d5b3a60f9b8d7df98e3bfca6475bc27df9ff60a5704d3e51a0f46afeb8094bb0087bcd5a2b697a
+  metadata.gz: f21f398f4bbfc6ed3e23be70e294f5fbabfec60d1ed69bb03b8efd0f047d2131d9d225f4dd9794a24d45661ad6200b85364b54c50590825f0fa4bf9eb1d6759d
+  data.tar.gz: 027501a879da6025ffd51511e88b8affb9eb21e2e493086e143cab1faaa50e462142771a423a1e93f0d7b31f81da381869f7cfbebe5caf8a82880863c9ac9b4d

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sandthorn.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/Sandthorn/sandthorn.svg?branch=master)](https://travis-ci.org/Sandthorn/sandthorn)
-[![Coverage Status](https://coveralls.io/repos/Sandthorn/sandthorn/badge.png?branch=master)](https://coveralls.io/r/Sandthorn/sandthorn?branch=master)
-[![Code Climate](https://codeclimate.com/github/Sandthorn/sandthorn.png)](https://codeclimate.com/github/Sandthorn/sandthorn)
-[![Gem Version](https://badge.fury.io/rb/sandthorn.png)](http://badge.fury.io/rb/sandthorn)
+[![Coverage Status](https://coveralls.io/repos/Sandthorn/sandthorn/badge.svg?branch=master)](https://coveralls.io/r/Sandthorn/sandthorn?branch=master)
+[![Code Climate](https://codeclimate.com/github/Sandthorn/sandthorn.svg)](https://codeclimate.com/github/Sandthorn/sandthorn)
+[![Gem Version](https://badge.fury.io/rb/sandthorn.svg)](http://badge.fury.io/rb/sandthorn)
 
 # Sandthorn Event Sourcing
 A ruby library for saving an object's state as a series of events.
@@ -124,7 +124,7 @@ class Board
   include Sandthorn::AggregateRoot
 
   # creates a private class method `board_created`
-  contructor_events :board_created
+  constructor_events :board_created
 
   def self.create name
 
@@ -137,7 +137,7 @@ end
 
 ### `Sandthorn::AggregateRoot::stateless_events`
 
-Calling `stateless_events` creates public class methods. The first argument is an `aggregate_id` and the second argument is optional but has to be a hash and is stored in the attribute_deltas of the event.
+Calling `stateless_events` creates public class methods. The first argument is an `aggregate_id` and the second argument is optional but has to be a hash and is stored in the event_data of the event.
 
 When creating a stateless event, the corresponding aggregate is never loaded and the event is saved without calling the save method.
 

data/lib/sandthorn.rb

@@ -1,6 +1,5 @@
 require "sandthorn/version"
 require "sandthorn/errors"
-require "sandthorn/event"
 require "sandthorn/aggregate_root"
 require "sandthorn/event_stores"
 require 'yaml'

data/lib/sandthorn/aggregate_root_base.rb

@@ -118,6 +118,7 @@ module Sandthorn
             current_aggregate_version = events.last[:aggregate_version]
             aggregate.send :set_orginating_aggregate_version!, current_aggregate_version
             aggregate.send :set_current_aggregate_version!, current_aggregate_version
+            aggregate.send :set_aggregate_id, events.first.fetch(:aggregate_id)
           end
           attributes = build_instance_vars_from_events events
           aggregate.send :clear_aggregate_events
@@ -132,7 +133,7 @@ module Sandthorn
         def stateless_events(*event_names)
           event_names.each do |name|
             define_singleton_method name do |aggregate_id, *args|
-              event = build_stateless_event(name.to_s, args)
+              event = build_stateless_event(aggregate_id, name.to_s, args)
               Sandthorn.save_events([event], aggregate_id, self)
               return aggregate_id
             end
@@ -169,24 +170,18 @@ module Sandthorn
 
         private
 
-        def build_stateless_event name, args = []
+        def build_stateless_event aggregate_id, name, args = []
 
-          formated_attribute_deltas = args.first.map do |key, value|
-            {
-              attribute_name: key.to_s,
-              old_value: nil,
-              new_value: value
-            }
+          deltas = {}
+          args.first.each do |key, value|
+            deltas[key.to_sym] = { old_value: nil, new_value: value }
           end unless args.empty?
 
-          data = {
-            attribute_deltas: formated_attribute_deltas
-          }
-
           return {
             aggregate_version: nil,
+            aggregate_id: aggregate_id,
             event_name: name,
-            event_data: data,
+            event_data: deltas,
             event_metadata: nil
           }
 
@@ -194,11 +189,11 @@ module Sandthorn
 
         def build_instance_vars_from_events events
           events.each_with_object({}) do |event, instance_vars|
-            event_data = event[:event_data]
-            attribute_deltas = event_data[:attribute_deltas]
+            attribute_deltas = event[:event_data]
             unless attribute_deltas.nil?
-              deltas = attribute_deltas.each_with_object({}) do |delta, acc|
-                acc[delta[:attribute_name]] = delta[:new_value]
+              deltas = {}
+              attribute_deltas.each do |key, value|
+                deltas[key] = value[:new_value]
               end
               instance_vars.merge! deltas
             end
@@ -220,10 +215,7 @@ module Sandthorn
 
       def extract_relevant_aggregate_instance_variables
         instance_variables.select do |variable|
-          equals_aggregate_id = variable.to_s == "@aggregate_id"
-          does_not_contain_aggregate = !variable.to_s.start_with?("@aggregate_")
-
-          equals_aggregate_id || does_not_contain_aggregate
+           !variable.to_s.start_with?("@aggregate_")
         end
       end
 
@@ -252,17 +244,13 @@ module Sandthorn
       end
 
       def commit_with_event_name(event_name)
-        aggregate_attribute_deltas = get_delta
-
         increase_current_aggregate_version!
-        data = {
-          attribute_deltas: aggregate_attribute_deltas
-        }
 
         @aggregate_events << ({
           aggregate_version: @aggregate_current_event_version,
+          aggregate_id: @aggregate_id,
           event_name: event_name,
-          event_data: data,
+          event_data: get_delta(),
           event_metadata: @aggregate_trace_information
         })
 

data/lib/sandthorn/aggregate_root_marshal.rb

@@ -3,7 +3,7 @@ module Sandthorn
     module Marshal 
 
       def aggregate_initialize *args
-        @aggregate_attribute_deltas = []
+        @aggregate_attribute_deltas = {}
         @aggregate_stored_instance_variables = {}
       end
 
@@ -20,7 +20,7 @@ module Sandthorn
       def get_delta
         deltas = extract_relevant_aggregate_instance_variables
         deltas.each { |d| delta_attribute(d) }
-
+        
         result = @aggregate_attribute_deltas
         clear_aggregate_deltas
         result
@@ -42,8 +42,7 @@ module Sandthorn
         new_value_to_store = ::Marshal.load(new_dump)
         old_value_to_store = old_dump ? ::Marshal.load(old_dump) : nil
 
-        @aggregate_attribute_deltas << {
-          attribute_name: attribute_name.to_s.delete("@"),
+        @aggregate_attribute_deltas[attribute_name.to_s.delete("@").to_sym] = {
           old_value: old_value_to_store,
           new_value: new_value_to_store
         }
@@ -54,7 +53,7 @@ module Sandthorn
       end
 
       def clear_aggregate_deltas
-        @aggregate_attribute_deltas = []
+        @aggregate_attribute_deltas = {}
       end
     end
   end

data/lib/sandthorn/version.rb

@@ -1,3 +1,3 @@
 module Sandthorn
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/sandthorn.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lars.krantz@alaz.se", "morgan.hallgren@gmail.com", "jesper.josefsson@gmail.com"]
   spec.description   = %q{Event sourcing gem}
   spec.summary       = %q{Event sourcing gem}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/Sandthorn/sandthorn"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/aggregate_delta_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-
-
 class PersonTest
     include Sandthorn::AggregateRoot
     attr_reader :name
@@ -44,15 +42,14 @@ describe 'Property Delta Event Sourcing' do
 
   it 'should be able to set name' do
     person.change_name  "Klabbarparen"
-    expect(person.name).to eql("Klabbarparen")
-    #puts person.aggregate_events
+    expect(person.name).to eq("Klabbarparen")
   end
 
   it 'should be able to build from events' do
     person.change_name  "Klabbarparen"
     builded = PersonTest.aggregate_build person.aggregate_events
-    expect(builded.name).to eql(person.name)
-    expect(builded.aggregate_id).to eql(person.aggregate_id)
+    expect(builded.name).to eq(person.name)
+    expect(builded.aggregate_id).to eq(person.aggregate_id)
   end
 
   it 'should not have any events when built up' do
@@ -75,16 +72,12 @@ describe 'Property Delta Event Sourcing' do
     person.add_to_hash :bar, "foo"
 
     builded = PersonTest.aggregate_build person.aggregate_events
-    expect(builded.my_hash[:foo]).to eql("bar")
-    expect(builded.my_hash[:bar]).to eql("foo")
+    expect(builded.my_hash[:foo]).to eq("bar")
+    expect(builded.my_hash[:bar]).to eq("foo")
 
     person.add_to_hash :foo, "BAR"
 
-    #events = person.aggregate_events
-    #events << builded.aggregate_events
-    #puts events
-
     builded2 = PersonTest.aggregate_build person.aggregate_events
-    expect(builded2.my_hash[:foo]).to eql("BAR")
+    expect(builded2.my_hash[:foo]).to eq("BAR")
   end
 end

data/spec/aggregate_events_spec.rb

@@ -44,7 +44,7 @@ module Sandthorn
       end
 
       it "should set the name instance variable" do
-        expect(subject.name).to eql "new name"
+        expect(subject.name).to eq("new name")
       end
     
       it "should store the event params as methods args" do
@@ -52,11 +52,11 @@ module Sandthorn
       end
 
       it "should store the args to the event" do
-        expect(subject.aggregate_events[1][:event_data][:attribute_deltas][0][:new_value]).to eql("new name")
+        expect(subject.aggregate_events[1][:event_data][:name][:new_value]).to eq("new name")
       end
 
       it "should store the event_name" do
-        expect(subject.aggregate_events[1][:event_name]).to eql("name_changed")
+        expect(subject.aggregate_events[1][:event_name]).to eq("name_changed")
       end
     end
 

data/spec/aggregate_root_spec.rb

@@ -5,12 +5,12 @@ module Sandthorn
     class DirtyClass
       include Sandthorn::AggregateRoot
       attr_reader :name, :age
-      attr :sex
+      attr :age
       attr_writer :writer
       
       def initialize args = {}
         @name = args.fetch(:name, nil)
-        @sex = args.fetch(:sex, nil)
+        @age = args.fetch(:age, nil)
         @writer = args.fetch(:writer, nil)
       end
 
@@ -21,9 +21,9 @@ module Sandthorn
         end
       end
 
-      def change_sex value
-        unless sex == value
-          @sex = value
+      def change_age value
+        unless age == value
+          @age = value
           commit
         end
       end
@@ -64,7 +64,7 @@ module Sandthorn
 
       context "all" do
         it "should all the aggregates" do
-          expect(subject.length).to eql 3
+          expect(subject.length).to eq(3)
         end
 
         it "should include correct aggregates" do
@@ -83,10 +83,10 @@ module Sandthorn
 
       context "new with args" do
 
-        let(:subject) { DirtyClass.new(name: "Mogge", sex: "hen", writer: true) }
+        let(:subject) { DirtyClass.new(name: "Mogge", age: 35, writer: true) }
         it "should set the values" do
-          expect(subject.name).to eql "Mogge"
-          expect(subject.sex).to eql "hen"
+          expect(subject.name).to eq("Mogge")
+          expect(subject.age).to eq(35)
           expect{subject.writer}.to raise_error NoMethodError
         end
       end
@@ -95,23 +95,23 @@ module Sandthorn
         
         it "should get new_name" do
           dirty_object.change_name "new_name"
-          expect(dirty_object.name).to eql "new_name"
+          expect(dirty_object.name).to eq("new_name")
         end
 
         it "should generate one event on new" do
-          expect(dirty_object.aggregate_events.length).to eql 1
+          expect(dirty_object.aggregate_events.length).to eq(1)
         end
 
         it "should generate 2 events new and change_name" do
           dirty_object.change_name "new_name"
-          expect(dirty_object.aggregate_events.length).to eql 2
+          expect(dirty_object.aggregate_events.length).to eq(2)
         end
       end
 
-      context "when changing sex (attr)" do
-        it "should get new_sex" do
-          dirty_object.change_sex "new_sex"
-          expect(dirty_object.sex).to eql "new_sex"
+      context "when changing age (attr)" do
+        it "should get new_age" do
+          dirty_object.change_age "new_age"
+          expect(dirty_object.age).to eq("new_age")
         end
       end
 
@@ -123,27 +123,27 @@ module Sandthorn
 
       context "save" do
         it "should not have events on aggregate after save" do
-          expect(dirty_object.save.aggregate_events.length).to eql 0
+          expect(dirty_object.save.aggregate_events.length).to eq(0)
         end
 
         it "should have aggregate_originating_version == 0 pre save" do
-          expect(dirty_object.aggregate_originating_version).to eql 0
+          expect(dirty_object.aggregate_originating_version).to eq(0)
         end
 
         it "should have aggregate_originating_version == 1 post save" do
-          expect(dirty_object.save.aggregate_originating_version).to eql 1
+          expect(dirty_object.save.aggregate_originating_version).to eq(1)
         end
       end
 
       context "find" do
         before(:each) { dirty_object.save }
         it "should find by id" do
-          expect(DirtyClass.find(dirty_object.id).id).to eql dirty_object.id
+          expect(DirtyClass.find(dirty_object.id).id).to eq(dirty_object.id)
         end
 
         it "should hold changed name" do
           dirty_object.change_name("morgan").save
-          expect(DirtyClass.find(dirty_object.id).name).to eql "morgan"
+          expect(DirtyClass.find(dirty_object.id).name).to eq("morgan")
         end
 
         it "should raise error if trying to find id that not exist" do
@@ -157,7 +157,7 @@ module Sandthorn
     describe "event data" do
 
       let(:dirty_object) { 
-        o = DirtyClass.new :name => "old_value", :sex => "hen"
+        o = DirtyClass.new :name => "old_value", :age => 35
         o.save
       }
 
@@ -167,7 +167,7 @@ module Sandthorn
 
         it "should set the old_value on the event" do
           dirty_object_after_find.change_name "new_name"
-          expect(dirty_object_after_find.aggregate_events.last[:event_data][:attribute_deltas].first[:old_value]).to eql "old_value"
+          expect(dirty_object_after_find.aggregate_events.last[:event_data][:name][:old_value]).to eq("old_value")
         end
 
       end
@@ -176,36 +176,32 @@ module Sandthorn
       
         it "should set the old_value on the event" do
           dirty_object.change_name "new_name"
-          expect(dirty_object.aggregate_events.last[:event_data][:attribute_deltas].first[:old_value]).to eql "old_value"
+          expect(dirty_object.aggregate_events.last[:event_data][:name][:old_value]).to eq("old_value")
         end
 
         it "should not change aggregate_id" do
           dirty_object.change_name "new_name"
-          expect(dirty_object.aggregate_events.last[:event_data][:attribute_deltas].last[:attribute_name]).not_to eql "aggregate_id"
+          expect(dirty_object.aggregate_events.last[:event_data]["attribute_name"]).not_to eq("aggregate_id")
         end
 
-        it "should not change sex attribute if sex method is not runned" do
+        it "should not change age attribute if age method is not runned" do
           dirty_object.change_name "new_name"
           dirty_object.aggregate_events.each do |event|
-            event[:event_data][:attribute_deltas].each do |attribute_delta|
-              expect(attribute_delta[:attribute_name]).not_to eql "sex"
-            end
+            expect(event[:event_data]["age"].nil?).to be_truthy
           end
         end
 
-        it "should not change sex attribute if sex attribute is the same" do
-          dirty_object.change_sex "hen"
+        it "should not change age attribute if age attribute is the same" do
+          dirty_object.change_age 35
           dirty_object.aggregate_events.each do |event|
-            event[:event_data][:attribute_deltas].each do |attribute_delta|
-              expect(attribute_delta[:attribute_name]).not_to eql "sex"
-            end
+            expect(event[:event_data]["age"].nil?).to be_truthy
           end
         end
 
-        it "should set old_value and new_value on sex change" do
-          dirty_object.change_sex "shemale"
-          expect(dirty_object.aggregate_events.last[:event_data][:attribute_deltas].first[:old_value]).to eql "hen"
-          expect(dirty_object.aggregate_events.last[:event_data][:attribute_deltas].first[:new_value]).to eql "shemale"
+        it "should set old_value and new_value on age change" do
+          dirty_object.change_age 36
+          expect(dirty_object.aggregate_events.last[:event_data][:age][:old_value]).to eq(35)
+          expect(dirty_object.aggregate_events.last[:event_data][:age][:new_value]).to eq(36)
         end
       end
     end
@@ -218,11 +214,11 @@ module Sandthorn
       end
 
       it "should have the event no_state_change_only_empty_event" do
-        expect(dirty_object.aggregate_events.first[:event_name]).to eql("no_state_change_only_empty_event")
+        expect(dirty_object.aggregate_events.first[:event_name]).to eq("no_state_change_only_empty_event")
       end
 
-      it "should have attribute_deltas set to empty array" do
-        expect(dirty_object.aggregate_events.first[:event_data][:attribute_deltas]).to eql([])
+      it "should have event_data set to empty hash" do
+        expect(dirty_object.aggregate_events.first[:event_data]).to eq({})
       end
 
     end