sandthorn 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570d52af1a092035a72a6db14afb0c43ec61ae48
-  data.tar.gz: 39f92e0f586d6af40ec7d1b0c9eacdf7c08827ae
+  metadata.gz: 6b32292f067fc1a54b2a64d44a42c88c852489b8
+  data.tar.gz: 3da32e8fbd184194b7f99d0977742ab6cccc8f74
 SHA512:
-  metadata.gz: 95e7d6c19f1c50f01a4a63d0fec9378205956c29b9fb2be22fded7e5fb9c219dde8edfae25b5a3c7f620b01610157b7deb6f2531b79932b66912f7605105a776
-  data.tar.gz: b8e4d2e12afb2ea861b6e1136b9f3d263ed5fac7cd700a50969a3ecc556e3599e2200dbde479d99dda264fea753039719509d0f60a76489e98fee771ae7505b2
+  metadata.gz: 69576400bb2d0667765130a000cf41b2eba699066b9eb9bc2172af37efd7351742fb646762f172d4c778cf9b057583c3a612dbb77f7462c70aca894d386a1081
+  data.tar.gz: eba722ba78c620c688b4259962b1da42896ff13f65f10b7efd23399c4d55a2a3f2686494de213bd5f4c7ab04d9a8b6b621b25b6c6e9097911c97d85f97044bf8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sandthorn (0.1.1)
+    sandthorn (0.2.0)
       dirty_hashy
 
 GEM

data/README.md

@@ -23,10 +23,9 @@ _Example:_
 # The one available right now
 require 'sandthorn'
 require 'sandthorn_driver_sequel'
-require 'sandthorn/aggregate_root_dirty_hashy'
 
 class Ship
-  include Sandthorn::AggregateRoot::DirtyHashy
+  include Sandthorn::AggregateRoot
   attr_reader :name
 
   def initialize name: nil, shipping_company: nil
@@ -65,7 +64,7 @@ ship.rename! new_name: "Vasa"
 ship.save
 
 new_ship = Ship.find ship.id
-puts ship.name
+puts new_ship.name
 
 # For more info look at the specs.
 

data/lib/sandthorn.rb

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

data/lib/sandthorn/aggregate_root.rb

@@ -0,0 +1,11 @@
+require 'sandthorn/aggregate_root_marshal'
+
+module Sandthorn
+  module AggregateRoot
+    include Sandthorn::AggregateRoot::Marshal
+
+    def self.included(base)
+      base.extend(Sandthorn::AggregateRoot::Base::ClassMethods)
+    end
+  end
+end

data/lib/sandthorn/aggregate_root_base.rb

@@ -137,8 +137,8 @@ module Sandthorn
           aggregate.send :clear_aggregate_events
           aggregate.send :set_orginating_aggregate_version!, current_aggregate_version
           aggregate.send :set_current_aggregate_version!, current_aggregate_version
-          aggregate.send :set_instance_variables!, attributes
           aggregate.send :aggregate_initialize
+          aggregate.send :set_instance_variables!, attributes
           aggregate
         end
       end

data/lib/sandthorn/aggregate_root_dirty_hashy.rb

@@ -6,10 +6,6 @@ module Sandthorn
     module DirtyHashy
       include Sandthorn::AggregateRoot::Base
 
-      def self.included(base)
-        base.extend(Sandthorn::AggregateRoot::Base::ClassMethods)
-      end
-
       def aggregate_initialize *args
         @hashy = ::DirtyHashy.new
       end

data/lib/sandthorn/aggregate_root_marshal.rb

@@ -0,0 +1,54 @@
+require "sandthorn/aggregate_root_base"
+
+module Sandthorn
+  module AggregateRoot
+    module Marshal 
+      include Sandthorn::AggregateRoot::Base
+
+      def aggregate_initialize *args
+        @aggregate_attribute_deltas = []
+        @aggregate_stored_instance_variables = {}
+      end
+
+      def set_instance_variables! attribute
+        super attribute
+        init_vars = extract_relevant_aggregate_instance_variables
+        init_vars.each {|attribute_name| @aggregate_stored_instance_variables[attribute_name] = ::Marshal.dump(instance_variable_get(attribute_name)) }
+      end
+
+      def get_delta
+        deltas = extract_relevant_aggregate_instance_variables
+        deltas.each { |d| delta_attribute(d)}
+        
+        result = @aggregate_attribute_deltas
+        clear_aggregate_deltas
+        result
+      end
+
+      private
+
+      def delta_attribute attribute_name
+        old_dump = @aggregate_stored_instance_variables[attribute_name]
+        new_dump = ::Marshal.dump(instance_variable_get(attribute_name))
+        unless old_dump == new_dump
+          store_attribute_deltas attribute_name, new_dump, old_dump
+          store_aggregate_instance_variable attribute_name, new_dump
+        end
+      end
+
+      def store_attribute_deltas attribute_name, new_dump, old_dump
+        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("@"), :old_value => old_value_to_store, :new_value => new_value_to_store}
+      end
+
+      def store_aggregate_instance_variable attribute_name, new_dump
+        @aggregate_stored_instance_variables[attribute_name] = new_dump
+      end
+
+      def clear_aggregate_deltas
+        @aggregate_attribute_deltas = []
+      end
+    end
+  end
+end

data/lib/sandthorn/version.rb

@@ -1,3 +1,3 @@
 module Sandthorn
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/aggregate_delta_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
-require 'sandthorn/aggregate_root_dirty_hashy'
 
 
 
 class PersonTest
-    include Sandthorn::AggregateRoot::DirtyHashy
+    include Sandthorn::AggregateRoot
     attr_reader :name
     attr_reader :age
     attr_reader :relationship_status

data/spec/aggregate_root_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
-require 'sandthorn/aggregate_root_dirty_hashy'
 
 module Sandthorn
   module AggregateRoot
     class DirtyClass
-      include Sandthorn::AggregateRoot::DirtyHashy
+      include Sandthorn::AggregateRoot
       attr_reader :name, :age
       attr :sex
       attr_writer :writer
@@ -25,12 +24,14 @@ module Sandthorn
       def change_sex value
         unless sex == value
           @sex = value
+          commit
         end
       end
 
       def change_writer value
         unless writer == value
           @writer = value
+          commit
         end
       end
 
@@ -143,10 +144,21 @@ module Sandthorn
     describe "event data" do
 
       let(:dirty_obejct) { 
-        o = DirtyClass.new :name => "old_value"
-        o
+        o = DirtyClass.new :name => "old_value", :sex => "hen"
+        o.save
       }
 
+      let(:dirty_obejct_after_find) { DirtyClass.find dirty_obejct.id }
+
+      context "after find" do
+
+        it "should set the old_value on the event" do
+          dirty_obejct_after_find.change_name "new_name"
+          expect(dirty_obejct_after_find.aggregate_events.last[:event_args][:attribute_deltas].first[:old_value]).to eql "old_value"
+        end
+
+      end
+
       context "old_value should be set" do
       
         it "should set the old_value on the event" do
@@ -159,12 +171,29 @@ module Sandthorn
           expect(dirty_obejct.aggregate_events.last[:event_args][:attribute_deltas].last[:attribute_name]).not_to eql "aggregate_id"
         end
 
-        it "should not change sex attribute" do
+        it "should not change sex attribute if sex method is not runned" do
           dirty_obejct.change_name "new_name"
           dirty_obejct.aggregate_events.each do |event|
-            expect(event[:event_name]).not_to eql "change_sex"
+            event[:event_args][:attribute_deltas].each do |attribute_delta|
+              expect(attribute_delta[:attribute_name]).not_to eql "sex"
+            end
+          end
+        end
+
+        it "should not change sex attribute if sex attribute is the same" do
+          dirty_obejct.change_sex "hen"
+          dirty_obejct.aggregate_events.each do |event|
+            event[:event_args][:attribute_deltas].each do |attribute_delta|
+              expect(attribute_delta[:attribute_name]).not_to eql "sex"
+            end
           end
         end
+
+        it "should set old_value and new_value on sex change" do
+          dirty_obejct.change_sex "shemale"
+          expect(dirty_obejct.aggregate_events.last[:event_args][:attribute_deltas].first[:old_value]).to eql "hen"
+          expect(dirty_obejct.aggregate_events.last[:event_args][:attribute_deltas].first[:new_value]).to eql "shemale"
+        end
       end
     end
   end

data/spec/aggregate_snapshot_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'sandthorn/aggregate_root_dirty_hashy'
 require 'sandthorn/aggregate_root_snapshot'
 require 'date'
 
@@ -64,7 +63,7 @@ module BankAccountDepositCommmands
 end
 
 class BankAccount
-  include Sandthorn::AggregateRoot::DirtyHashy
+  include Sandthorn::AggregateRoot
 
   attr_reader :balance
   attr_reader :account_number

data/spec/benchmark_spec.rb

@@ -5,7 +5,7 @@ require 'benchmark'
 module Sandthorn
   module AggregateRoot
     class TestClass
-      include Sandthorn::AggregateRoot::DirtyHashy
+      include Sandthorn::AggregateRoot
       attr_reader :name
       
       

data/spec/complex_aggregate_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'sandthorn/aggregate_root_dirty_hashy'
 require 'date'
 
 class Hello
@@ -16,7 +15,7 @@ class Hello
 end
 
 class IAmComplex
-  include Sandthorn::AggregateRoot::DirtyHashy
+  include Sandthorn::AggregateRoot
   attr_reader :a_date
   attr_reader :hello
 
@@ -70,7 +69,6 @@ describe 'when using complex types in events' do
   it 'should detect foo_bar chaning in hello' do
     aggr = IAmComplex.aggregate_build @events
     aggr.set_foo_bar_on_hello "morgan"
-
     builded = IAmComplex.aggregate_build aggr.aggregate_events
     builded.hello.foo_bar.should eql "morgan"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandthorn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lars Krantz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,8 +201,10 @@ files:
 - README.md
 - Rakefile
 - lib/sandthorn.rb
+- lib/sandthorn/aggregate_root.rb
 - lib/sandthorn/aggregate_root_base.rb
 - lib/sandthorn/aggregate_root_dirty_hashy.rb
+- lib/sandthorn/aggregate_root_marshal.rb
 - lib/sandthorn/aggregate_root_snapshot.rb
 - lib/sandthorn/errors.rb
 - lib/sandthorn/event_inspector.rb