eventus 0.3.1 → 0.3.2

data/lib/eventus/aggregate_root.rb

@@ -16,6 +16,18 @@ module Eventus
       def persistence
         @persistence ||= Eventus.persistence
       end
+
+      def conflicts(added = {})
+        @event_conflicts ||= {}
+        added.each do |k,v|
+          @event_conflicts[k.to_s] = v.respond_to?(:map) ? v.map{|e| e.to_s} : v.to_s
+        end
+      end
+
+      def conflict?(e1, e2)
+        return false unless @event_conflicts
+        @event_conflicts.fetch(e1,[]).include?(e2) || @event_conflicts.fetch(e2,[]).include?(e1)
+      end
     end
 
     module InstanceMethods
@@ -27,7 +39,15 @@ module Eventus
       end
 
       def save
+        version = @stream.version
         @stream.commit
+        true
+      rescue Eventus::ConcurrencyError
+        committed = @stream.committed_events[version-1..-1]
+        uncommitted = @stream.uncommitted_events
+        conflict = committed.any?{ |e| uncommitted.any? {|u| self.class.conflict?(e['name'], u['name'])} }
+        raise Eventus::ConflictError if conflict
+        false
       end
 
       protected

data/lib/eventus/errors.rb

@@ -1,4 +1,5 @@
 module Eventus
   class ConcurrencyError < ::StandardError; end
+  class ConflictError < ::StandardError; end
   class ConnectionError  < ::StandardError; end
 end

data/lib/eventus/version.rb

@@ -1,3 +1,3 @@
 module Eventus
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/aggregate_root_spec.rb

@@ -5,6 +5,8 @@ class TestAgg
 
   attr_accessor :loaded
 
+  conflicts :cake_baked => :cake_baked
+
   def bake_cake
     apply_change :cake_baked, :flavor => 'strawberry'
   end
@@ -55,15 +57,29 @@ describe Eventus::AggregateRoot do
 
   describe "when saving" do
     let(:aggregate) { TestAgg.new }
-    let(:stream) { stub(:stream, :committed_events => []) }
+    let(:stream) { stub(:stream, :committed_events => events, :version => events.length) }
+    let(:events) { [{'name' => 'cake_baked'}] }
 
     before do
       aggregate.populate(stream)
     end
 
-    it "should commit stream" do
+    it "should return true when no concurrency error" do
       stream.should_receive(:commit)
-      aggregate.save
+      aggregate.save.should == true
+    end
+
+    it "should return false if no conflict" do
+      stream.should_receive(:commit).and_raise(Eventus::ConcurrencyError)
+      stream.should_receive(:uncommitted_events).and_return([{'name' => 'coconut'}])
+
+      aggregate.save.should == false
+    end
+
+    it "should raise conflict error if conflict exists" do
+      stream.should_receive(:commit).and_raise(Eventus::ConcurrencyError)
+      stream.should_receive(:uncommitted_events).and_return([{'name' => 'cake_baked'}])
+      lambda {aggregate.save}.should raise_error(Eventus::ConflictError)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000Z
 dependencies: []
 description: An Event Store
 email:
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2674942126495806471
+      hash: 24983203454212459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2674942126495806471
+      hash: 24983203454212459
 requirements: []
 rubyforge_project: eventus
 rubygems_version: 1.8.13