euston 1.2.8-java → 1.2.9-java

data/Rakefile

@@ -65,7 +65,7 @@ end
 #
 #############################################################################
 
-default_rspec_opts = %w[--colour --format Fuubar]
+default_rspec_opts = %w[--colour --tty -b --format Fuubar]
 
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|

data/euston.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'euston'
-  s.version     = '1.2.8'
-  s.date        = '2012-02-02'
+  s.version     = '1.2.9'
+  s.date        = '2012-02-28'
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -46,8 +46,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemodel',         '~> 3.1.0'
   s.add_dependency 'activesupport',       '~> 3.1.0'
 
-  s.add_development_dependency 'fuubar',  '~> 0.0.0'
-  s.add_development_dependency 'rake',    '~> 0.9.2'
-  s.add_development_dependency 'rspec',   '~> 2.6.0'
-  s.add_development_dependency 'uuid',    '~> 2.3.0'
+  s.add_development_dependency 'awesome_print', '~> 1.0.2'
+  s.add_development_dependency 'fuubar',        '~> 1.0.0'
+  s.add_development_dependency 'rake',          '~> 0.9.2'
+  s.add_development_dependency 'rspec',         '~> 2.6.0'
+  s.add_development_dependency 'uuid',          '~> 2.3.0'
 end

data/lib/euston/aggregate_root.rb

@@ -44,6 +44,10 @@ module Euston
         @uncommitted_events ||= []
       end
 
+      def uncommitted_headers
+        @uncommitted_headers ||= {}
+      end
+
       def consume_command headers, command
         consume_message headers, command, :command, Euston::CommandHeaders, :send_command_to_method
       end
@@ -52,16 +56,6 @@ module Euston
         consume_message headers, event, :event_subscription, Euston::EventHeaders, :send_event_subscription_to_method
       end
 
-      def replay_event headers, event
-        headers = Euston::EventHeaders.from_hash(headers) if headers.is_a?(Hash)
-
-        source_message = headers.source_message
-        committed_messages << source_message[:headers][:id] unless source_message.nil?
-
-        send_event_to_method headers, event
-        @initial_version = initial_version + 1
-      end
-
       def take_snapshot
         methods = self.class.instance_methods
         regex = self.class.take_snapshot_regexp
@@ -88,11 +82,6 @@ module Euston
                              :version => version,
                              :timestamp => Time.now.to_f
 
-        unless @current_message_headers.nil?
-          event.headers[@current_message_type] = { :headers  => @current_message_headers.to_hash,
-                                                   :body     => @current_message_body }
-        end
-
         send_event_to_method Euston::EventHeaders.from_hash(event.headers), event.body
         uncommitted_events << event
       end
@@ -118,6 +107,10 @@ module Euston
 
         raise "This aggregate cannot apply a historical event stream because it is not empty." unless uncommitted_events.empty? && initial_version == 0
 
+        unless stream.committed_headers[:source_message].nil?
+          committed_messages << stream.committed_headers[:source_message][:headers][:id]
+        end
+
         events.each_with_index do |event, i|
           replay_event event.headers, event.body
         end
@@ -130,6 +123,12 @@ module Euston
         uncommitted_commands << command
       end
 
+      def replay_event headers, event
+        headers = Euston::EventHeaders.from_hash(headers) if headers.is_a?(Hash)
+        send_event_to_method headers, event
+        @initial_version = initial_version + 1
+      end
+
       def send_command_to_method headers, command
         deliver_message headers, command, :consumes_method_name, 'a command', "a 'consumes' block"
       end
@@ -148,10 +147,9 @@ module Euston
         headers = headers_type.from_hash(headers) if headers.is_a?(Hash)
 
         unless committed_messages.include? headers.id
-          @current_message_type     = message_type
-          @current_message_headers  = headers
-          @current_message_body     = body
-
+          uncommitted_headers[:source_message_type] = message_type
+          uncommitted_headers[:source_message]      = { headers: headers.to_hash, body: body } 
+          
           self.send send_method, headers, body
         end
 
@@ -164,9 +162,9 @@ module Euston
           @log.debug "Calling #{name} with: #{message.inspect}"
           m = method(name)
           case m.arity
-          when 2, -2
+          when 2, -1, -2
             m.call OpenStruct.new(headers.to_hash).freeze, OpenStruct.new(message).freeze
-          when 1, -1
+          when 1
             m.call OpenStruct.new(message).freeze
           else
             m.call

data/lib/euston/event_handler.rb

@@ -24,7 +24,7 @@ module Euston
         method_name = event_handler_method_name type, version
         define_method method_name, &consumer
         new_method = instance_method method_name
-
+        
         define_method method_name do |*args|
           new_method.bind(self).call *args
         end

data/lib/euston/version.rb

@@ -1,3 +1,3 @@
 module Euston
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/spec/aggregate_root_samples.rb

@@ -44,6 +44,7 @@ module Euston
         apply_event :product_access_logged, 1, :product_id => command.product_id,
                                        :access_count => @access_count + 1
       end
+      
       applies :product_created, 1 do |event|
         @access_count = 0
       end

data/spec/aggregate_root_spec.rb

@@ -2,21 +2,47 @@ require File.expand_path("../spec_helper", __FILE__)
 
 module Euston
   describe 'aggregate root' do
-    context 'duplicate command consumption' do
-      let(:aggregate) { Sample::Widget.new }
-      let(:aggregate2) { Sample::Widget.new }
-      let(:command) { { :headers => CommandHeaders.new(id: Euston.uuid.generate, type: 'create_widget', version: 1),
-                        :body => { :id => Euston.uuid.generate } } }
+    let(:aggregate)       { Sample::Widget.new }
+    let(:command_headers) { CommandHeaders.new id: Euston.uuid.generate, type: 'create_widget', version: 1 }
+    let(:command_body)    { { :id => Euston.uuid.generate } }
+
+    before do
+      aggregate.consume_command command_headers, command_body
+    end
+
+    subject { aggregate }
+
+    context 'commmand consumption' do
+      its(:uncommitted_events)  { should have(1).item }
+      
+      describe 'the uncommitted headers' do
+        subject { aggregate.uncommitted_headers }
+        
+        its([:source_message_type]) { should == :command }
 
-      it 'does not handle the same command twice' do
-        aggregate.consume_command command[:headers], command[:body]
-        aggregate.uncommitted_events.should have(1).item
+        describe 'the source message' do
+          subject { aggregate.uncommitted_headers[:source_message] }
 
-        aggregate.uncommitted_events.each { |e| aggregate2.replay_event e.headers, e.body }
+          its([:headers]) { should == command_headers }
+          its([:body])    { should == command_body }
+        end
+      end
+    end
 
-        aggregate2.consume_command command[:headers], command[:body]
-        aggregate2.uncommitted_events.should have(0).items
+    context 'duplicate command consumption' do
+      subject do 
+        stream = OpenStruct.new.tap do |s| 
+          s.committed_headers = { source_message_type: :command, 
+                                  source_message: { headers: command_headers, body: command_body } }
+          s.committed_events = aggregate.uncommitted_events
+        end
+
+        aggregate2 = Sample::Widget.hydrate stream
+        aggregate2.consume_command command_headers, command_body
+        aggregate2
       end
+
+      its(:uncommitted_events) { should have(0).items }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'ap'
+require 'ostruct'
 require 'euston'
 require 'aggregate_root_samples'
 

metadata

@@ -2,7 +2,7 @@
 name: euston
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.8
+  version: 1.2.9
 platform: java
 authors:
 - Lee Henson
@@ -10,72 +10,83 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  version_requirements: &3336 !ruby/object:Gem::Requirement
+  version_requirements: &3406 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
     none: false
-  requirement: *3336
+  requirement: *3406
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &3354 !ruby/object:Gem::Requirement
+  version_requirements: &3424 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
     none: false
-  requirement: *3354
+  requirement: *3424
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  version_requirements: &3440 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+    none: false
+  requirement: *3440
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &3370 !ruby/object:Gem::Requirement
+  version_requirements: &3458 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 1.0.0
     none: false
-  requirement: *3370
+  requirement: *3458
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &3388 !ruby/object:Gem::Requirement
+  version_requirements: &3474 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
     none: false
-  requirement: *3388
+  requirement: *3474
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &3404 !ruby/object:Gem::Requirement
+  version_requirements: &3490 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *3404
+  requirement: *3490
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: uuid
-  version_requirements: &3420 !ruby/object:Gem::Requirement
+  version_requirements: &3506 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.0
     none: false
-  requirement: *3420
+  requirement: *3506
   prerelease: false
   type: :development
 description: ''
@@ -138,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key:
 specification_version: 3
 summary: Cqrs tooling.