eventus 0.3.2 → 0.3.3

data/lib/eventus/aggregate_root.rb

@@ -20,7 +20,7 @@ module Eventus
       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
+          @event_conflicts[k.to_s] = v.respond_to?(:map) ? v.map{|e| e.to_s} : [v.to_s]
         end
       end
 
@@ -43,7 +43,7 @@ module Eventus
         @stream.commit
         true
       rescue Eventus::ConcurrencyError
-        committed = @stream.committed_events[version-1..-1]
+        committed = @stream.committed_events.drop(version)
         uncommitted = @stream.uncommitted_events
         conflict = committed.any?{ |e| uncommitted.any? {|u| self.class.conflict?(e['name'], u['name'])} }
         raise Eventus::ConflictError if conflict

data/lib/eventus/version.rb

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

data/spec/aggregate_root_spec.rb

@@ -5,7 +5,7 @@ class TestAgg
 
   attr_accessor :loaded
 
-  conflicts :cake_baked => :cake_baked
+  conflicts :lemon_squeezed => :cake_baked
 
   def bake_cake
     apply_change :cake_baked, :flavor => 'strawberry'
@@ -57,8 +57,8 @@ describe Eventus::AggregateRoot do
 
   describe "when saving" do
     let(:aggregate) { TestAgg.new }
-    let(:stream) { stub(:stream, :committed_events => events, :version => events.length) }
-    let(:events) { [{'name' => 'cake_baked'}] }
+    let(:stream) { stub(:stream, :committed_events => events, :version => 0) }
+    let(:events) { [{'name' => 'lemon_squeezed'}] }
 
     before do
       aggregate.populate(stream)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 24983203454212459
+      hash: -2796071801929159894
 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: 24983203454212459
+      hash: -2796071801929159894
 requirements: []
 rubyforge_project: eventus
 rubygems_version: 1.8.13