sandthorn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea77d4f178bf3c2124f48fbe2e5b12a406cf787
-  data.tar.gz: e671b7b29d552b10251c335e73d4bfa5280b9614
+  metadata.gz: 570d52af1a092035a72a6db14afb0c43ec61ae48
+  data.tar.gz: 39f92e0f586d6af40ec7d1b0c9eacdf7c08827ae
 SHA512:
-  metadata.gz: 417397fc0a413067e0e1756a325444867aaa9c8e5fd5d7bbb8b8553628f3144987464093e423d07de5bf6c44eacc0bf5e9725c4dbde09d896560085aa7a75e0a
-  data.tar.gz: 20406f646d0885d2dfbc066825562838a31ad7c4b76ca9b30c0efd6b5218363771e5ad0cee8902b3430bde5f992525a62a91d1ffaac6ed8889383dfff31c1163
+  metadata.gz: 95e7d6c19f1c50f01a4a63d0fec9378205956c29b9fb2be22fded7e5fb9c219dde8edfae25b5a3c7f620b01610157b7deb6f2531b79932b66912f7605105a776
+  data.tar.gz: b8e4d2e12afb2ea861b6e1136b9f3d263ed5fac7cd700a50969a3ecc556e3599e2200dbde479d99dda264fea753039719509d0f60a76489e98fee771ae7505b2

data/Gemfile.lock

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

data/lib/sandthorn/aggregate_root_base.rb

@@ -31,11 +31,11 @@ module Sandthorn
       end
 
       def commit *args
-        increase_current_aggregate_version!
-        method_name = caller_locations(1,1)[0].label.gsub("block in ", "")
         aggregate_attribute_deltas = get_delta
         
         unless aggregate_attribute_deltas.empty?
+          method_name = caller_locations(1,1)[0].label.gsub("block in ", "")
+          increase_current_aggregate_version!
           data = {:method_name => method_name, :method_args => args, :attribute_deltas => aggregate_attribute_deltas}
           data.merge!({trace: @aggregate_trace_information}) unless @aggregate_trace_information.nil? || @aggregate_trace_information.empty?
           @aggregate_events << ({:aggregate_version => @aggregate_current_event_version, :event_name => method_name, :event_args => data})
@@ -45,22 +45,22 @@ module Sandthorn
 
       alias :record_event :commit
       
-      def aggregate_trace args
-        @aggregate_trace_information = args
-        yield self
-        @aggregate_trace_information = nil
-      end
+      # def aggregate_trace args
+      #   @aggregate_trace_information = args
+      #   yield self
+      #   @aggregate_trace_information = nil
+      # end
 
       module ClassMethods
 
-        @@aggregate_trace_information = nil
-        def aggregate_trace args
-          @@aggregate_trace_information = args
-          @aggregate_trace_information = args
-          yield self
-          @@aggregate_trace_information = nil
-          @aggregate_trace_information = nil
-        end
+        # @@aggregate_trace_information = nil
+        # def aggregate_trace args
+        #   @@aggregate_trace_information = args
+        #   @aggregate_trace_information = args
+        #   yield self
+        #   @@aggregate_trace_information = nil
+        #   @aggregate_trace_information = nil
+        # end
 
         def all
           aggregate_id_list = Sandthorn.get_aggregate_list_by_typename(self.name)
@@ -84,13 +84,14 @@ module Sandthorn
         def new *args
           aggregate = super
           aggregate.aggregate_base_initialize
+          aggr = aggregate
 
-          aggregate.aggregate_trace @@aggregate_trace_information do |aggr|
-            aggr.aggregate_initialize
-            aggr.send :set_aggregate_id, Sandthorn.generate_aggregate_id
-            aggr.send :commit, *args
-            return aggr
-          end
+          #aggregate.aggregate_trace @@aggregate_trace_information do |aggr|
+          aggregate.aggregate_initialize
+          aggregate.send :set_aggregate_id, Sandthorn.generate_aggregate_id
+          aggregate.send :commit, *args
+          aggregate
+          #end
         end
 
         def aggregate_build events
@@ -137,6 +138,7 @@ module Sandthorn
           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
         end
       end
@@ -150,9 +152,7 @@ module Sandthorn
       end
 
       def extract_relevant_aggregate_instance_variables
-        instance_variables.select do |i|
-          i.to_s != "@hashy" && (!i.to_s.start_with?("@aggregate_") || i.to_s == "@aggregate_id")
-        end
+        instance_variables.select { |i| i.to_s=="@aggregate_id" || !i.to_s.start_with?("@aggregate_") }
       end
 
       def set_orginating_aggregate_version! aggregate_version
@@ -169,7 +169,6 @@ module Sandthorn
 
       def clear_aggregate_events
         @aggregate_events = []
-        @aggregate_attribute_deltas = []
       end
 
       def aggregate_clear_current_event_version!

data/lib/sandthorn/aggregate_root_dirty_hashy.rb

@@ -10,18 +10,30 @@ module Sandthorn
         base.extend(Sandthorn::AggregateRoot::Base::ClassMethods)
       end
 
-      def aggregate_initialize
+      def aggregate_initialize *args
         @hashy = ::DirtyHashy.new
       end
 
+      def set_instance_variables! attribute
+        super attribute
+
+        extract_relevant_aggregate_instance_variables.each do |var|
+          next if var.to_s == "@hashy"
+          @hashy[var.to_s.delete("@")] = self.instance_variable_get("#{var}")
+        end
+        @hashy.clean_up!
+      end
+
       def get_delta
         extract_relevant_aggregate_instance_variables.each do |var|
+          next if var.to_s == "@hashy"
           @hashy[var.to_s.delete("@")] = self.instance_variable_get("#{var}")
         end
         aggregate_attribute_deltas = []
         @hashy.changes.each do |attribute|
           aggregate_attribute_deltas << { :attribute_name => attribute[0], :old_value => attribute[1][0], :new_value => attribute[1][1]}
         end
+        @hashy.clean_up!
         aggregate_attribute_deltas
       end
 

data/lib/sandthorn/version.rb

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

data/spec/aggregate_root_spec.rb

@@ -136,6 +136,36 @@ module Sandthorn
           expect{DirtyClass.find("666")}.to raise_error
         end
       end
+
+
+    end
+
+    describe "event data" do
+
+      let(:dirty_obejct) { 
+        o = DirtyClass.new :name => "old_value"
+        o
+      }
+
+      context "old_value should be set" do
+      
+        it "should set the old_value on the event" do
+          dirty_obejct.change_name "new_name"
+          expect(dirty_obejct.aggregate_events.last[:event_args][:attribute_deltas].first[:old_value]).to eql "old_value"
+        end
+
+        it "should not change aggregate_id" do
+          dirty_obejct.change_name "new_name"
+          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
+          dirty_obejct.change_name "new_name"
+          dirty_obejct.aggregate_events.each do |event|
+            expect(event[:event_name]).not_to eql "change_sex"
+          end
+        end
+      end
     end
   end
 end

data/spec/event_inspector_spec.rb

@@ -1,152 +1,152 @@
-require 'spec_helper'
-require 'sandthorn/event_inspector'
-require 'sandthorn/aggregate_root_dirty_hashy'
+# require 'spec_helper'
+# require 'sandthorn/event_inspector'
+# require 'sandthorn/aggregate_root_dirty_hashy'
 
-class InspectorAggregate
-  include Sandthorn::AggregateRoot::DirtyHashy
+# class InspectorAggregate
+#   include Sandthorn::AggregateRoot::DirtyHashy
 
-  attr_reader :foo_bar
+#   attr_reader :foo_bar
 
-  def initialize args = {}
-    @foo_bar = args.fetch(:foo_bar, nil)
-  end
+#   def initialize args = {}
+#     @foo_bar = args.fetch(:foo_bar, nil)
+#   end
 
-  def this_is_an_event args = nil
-    record_event args
-  end
-  def another_event
-    record_event
-  end
-  def new_damaged_item_was_added hello
-    record_event hello
-  end 
-end
+#   def this_is_an_event args = nil
+#     record_event args
+#   end
+#   def another_event
+#     record_event
+#   end
+#   def new_damaged_item_was_added hello
+#     record_event hello
+#   end 
+# end
 
-module Sandthorn
-  describe EventInspector do
-    let(:aggregate) {InspectorAggregate.new.extend EventInspector}
+# module Sandthorn
+#   describe EventInspector do
+#     let(:aggregate) {InspectorAggregate.new.extend EventInspector}
 
-    context "when using extract_trace_info from an event" do
-      let(:trace_info) {{user_id: "foo", ip: "bar"}}
-      let(:subject) do
-        aggregate.aggregate_trace trace_info do |traced|
-          traced.this_is_an_event
-        end
-        aggregate
-      end
-      context "and unsaved aggregate" do
-        it "should extract exact traceinfo from event" do
-          all_trace = subject.events_with_trace_info
-          all_trace.last[:trace].should eql trace_info
-        end
-      end
-      context "and saved aggregate" do
-        it "should extract exact traceinfo from event" do
-          subject.save
-          all_trace = subject.events_with_trace_info
-          all_trace.last[:trace].should eql trace_info
-        end
-      end
-    end
-    context "when inspecting non saved events" do
-      context "with no tracing information" do
-        let(:subject) { aggregate.this_is_an_event;aggregate }
+#     context "when using extract_trace_info from an event" do
+#       let(:trace_info) {{user_id: "foo", ip: "bar"}}
+#       let(:subject) do
+#         aggregate.aggregate_trace trace_info do |traced|
+#           traced.this_is_an_event
+#         end
+#         aggregate
+#       end
+#       context "and unsaved aggregate" do
+#         it "should extract exact traceinfo from event" do
+#           all_trace = subject.events_with_trace_info
+#           all_trace.last[:trace].should eql trace_info
+#         end
+#       end
+#       context "and saved aggregate" do
+#         it "should extract exact traceinfo from event" do
+#           subject.save
+#           all_trace = subject.events_with_trace_info
+#           all_trace.last[:trace].should eql trace_info
+#         end
+#       end
+#     end
+#     context "when inspecting non saved events" do
+#       context "with no tracing information" do
+#         let(:subject) { aggregate.this_is_an_event;aggregate }
         
-        it "should have the new event" do
-          subject.has_event?(:new).should be_true
-        end
+#         it "should have the new event" do
+#           subject.has_event?(:new).should be_true
+#         end
 
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_unsaved_event?(:this_is_an_event).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_unsaved_event?(:no_event_here).should be_false
-        end
-      end
-      context "with tracing information" do
-        let(:subject) do
-          aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
-            traced.this_is_an_event "my name"
-          end
-          aggregate
-        end
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_unsaved_event?(:this_is_an_event).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_unsaved_event?(:no_event_here).should be_false
+#         end
+#       end
+#       context "with tracing information" do
+#         let(:subject) do
+#           aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
+#             traced.this_is_an_event "my name"
+#           end
+#           aggregate
+#         end
         
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_unsaved_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_unsaved_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
-          subject.has_unsaved_event?(:this_is_an_event, trace: {another_user_id: 123}).should be_false
-        end
-      end
-    end 
-    context "when inspecting saved events" do
-      context "with no tracing information" do
-        let(:subject) { aggregate.this_is_an_event;aggregate.save;aggregate }
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_unsaved_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_unsaved_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
+#           subject.has_unsaved_event?(:this_is_an_event, trace: {another_user_id: 123}).should be_false
+#         end
+#       end
+#     end 
+#     context "when inspecting saved events" do
+#       context "with no tracing information" do
+#         let(:subject) { aggregate.this_is_an_event;aggregate.save;aggregate }
         
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_saved_event?(:this_is_an_event).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_saved_event?(:no_event_here).should be_false
-        end
-      end
-      context "with tracing information" do
-        let(:subject) do
-          aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
-            traced.this_is_an_event "my name"
-          end
-          aggregate.save
-          aggregate
-        end
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_saved_event?(:this_is_an_event).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_saved_event?(:no_event_here).should be_false
+#         end
+#       end
+#       context "with tracing information" do
+#         let(:subject) do
+#           aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
+#             traced.this_is_an_event "my name"
+#           end
+#           aggregate.save
+#           aggregate
+#         end
         
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_saved_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_saved_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
-          subject.has_saved_event?(:this_is_an_event, trace: {another_user_id: 123}).should be_false
-        end
-        it "should be able to check complex trace" do
-          subject.aggregate_trace client_ip: "10", user_id: "123" do |trace|
-            trace.new_damaged_item_was_added "foobar"
-            trace.save  
-          end
-          subject.has_saved_event?(:new_damaged_item_was_added, trace: {user_id: "123", client_ip: "10"})
-        end
-      end
-    end
-    context "when inspecting any events" do
-      context "with no tracing information" do
-        let(:subject) { aggregate.this_is_an_event;aggregate.save;aggregate.another_event;aggregate }
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_saved_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_saved_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
+#           subject.has_saved_event?(:this_is_an_event, trace: {another_user_id: 123}).should be_false
+#         end
+#         it "should be able to check complex trace" do
+#           subject.aggregate_trace client_ip: "10", user_id: "123" do |trace|
+#             trace.new_damaged_item_was_added "foobar"
+#             trace.save  
+#           end
+#           subject.has_saved_event?(:new_damaged_item_was_added, trace: {user_id: "123", client_ip: "10"})
+#         end
+#       end
+#     end
+#     context "when inspecting any events" do
+#       context "with no tracing information" do
+#         let(:subject) { aggregate.this_is_an_event;aggregate.save;aggregate.another_event;aggregate }
         
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_event?(:this_is_an_event).should be_true
-          subject.has_event?(:another_event).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_event?(:no_event_here).should be_false
-        end
-      end
-      context "with tracing information" do
-        let(:subject) do
-          aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
-            traced.this_is_an_event "my name"
-            traced.save
-            traced.another_event
-          end
-          aggregate
-        end
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_event?(:this_is_an_event).should be_true
+#           subject.has_event?(:another_event).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_event?(:no_event_here).should be_false
+#         end
+#       end
+#       context "with tracing information" do
+#         let(:subject) do
+#           aggregate.aggregate_trace user_id: 123, ip: "1234" do |traced|
+#             traced.this_is_an_event "my name"
+#             traced.save
+#             traced.another_event
+#           end
+#           aggregate
+#         end
         
-        it "should report true on has_unsaved_event? :this_is_an_event" do
-          subject.has_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
-          subject.has_event?(:another_event, trace: {user_id: 123, ip: "1234"}).should be_true
-        end
-        it "should report false on has_unsaved_event? :no_event_here" do
-          subject.has_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
-          subject.has_event?(:another_event, trace: {ip: "123"}).should be_false
-        end
-      end
-    end
-  end
-end
+#         it "should report true on has_unsaved_event? :this_is_an_event" do
+#           subject.has_event?(:this_is_an_event, trace: {user_id: 123, ip: "1234"}).should be_true
+#           subject.has_event?(:another_event, trace: {user_id: 123, ip: "1234"}).should be_true
+#         end
+#         it "should report false on has_unsaved_event? :no_event_here" do
+#           subject.has_event?(:this_is_an_event, trace: {user_id: 321}).should be_false
+#           subject.has_event?(:another_event, trace: {ip: "123"}).should be_false
+#         end
+#       end
+#     end
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandthorn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lars Krantz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler