euston 1.2.0 → 1.2.1

data/euston.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'euston'
-  s.version     = '1.2.0'
-  s.date        = '2011-10-12'
+  s.version     = '1.2.1'
+  s.date        = '2011-10-13'
   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']
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     lib/euston/event_handler.rb
     lib/euston/event_handler_private_method_names.rb
     lib/euston/event_headers.rb
-    lib/euston/idempotence.rb
     lib/euston/null_logger.rb
     lib/euston/repository.rb
     lib/euston/version.rb

data/lib/euston/event_handler.rb

@@ -10,13 +10,13 @@ module Euston
     module ClassMethods
       def subscribes type, version = 1, opts = nil, &consumer
         if self.include? Euston::AggregateRoot
-          opts = opts || { :id => :id }
+          o = { :id => :id }.merge opts
 
           self.class.send :define_method, id_from_event_method_name(type, version) do |event|
-            if opts[:id].respond_to? :call
-              opts[:id].call event
+            if o[:id].respond_to? :call
+              o[:id].call event
             else
-              event[opts[:id]]
+              event[o[:id]]
             end
           end
         end

data/lib/euston/version.rb

@@ -1,3 +1,3 @@
 module Euston
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/euston.rb

@@ -35,7 +35,6 @@ require 'euston/event'
 require 'euston/event_handler_private_method_names'
 require 'euston/event_handler'
 require 'euston/event_headers'
-require 'euston/idempotence'
 require 'euston/null_logger'
 require 'euston/aggregate_root'
 require 'euston/repository'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: euston
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 Z
+date: 2011-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &83067690 !ruby/object:Gem::Requirement
+  requirement: &81777330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *83067690
+  version_requirements: *81777330
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83067260 !ruby/object:Gem::Requirement
+  requirement: &81776220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *83067260
+  version_requirements: *81776220
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &83066570 !ruby/object:Gem::Requirement
+  requirement: &81775260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.0
   type: :development
   prerelease: false
-  version_requirements: *83066570
+  version_requirements: *81775260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83065520 !ruby/object:Gem::Requirement
+  requirement: &81774780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *83065520
+  version_requirements: *81774780
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &83064720 !ruby/object:Gem::Requirement
+  requirement: &81774320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +66,7 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *83064720
+  version_requirements: *81774320
 description: ''
 email:
 - lee.m.henson@gmail.com
@@ -93,7 +93,6 @@ files:
 - lib/euston/event_handler.rb
 - lib/euston/event_handler_private_method_names.rb
 - lib/euston/event_headers.rb
-- lib/euston/idempotence.rb
 - lib/euston/null_logger.rb
 - lib/euston/repository.rb
 - lib/euston/version.rb

data/lib/euston/idempotence.rb

@@ -1,27 +0,0 @@
-module Euston
-  module Idempotence
-    extend ActiveSupport::Concern
-
-    module InstanceMethods
-      def if_unhandled obj, headers
-        return if obj._history.include? headers.id
-
-        obj._history << headers.id
-
-        unless headers.source_message.nil? || obj._history.include?(headers.source_message[:headers][:id])
-          obj._history << headers.source_message[:headers][:id]
-        end
-
-        yield
-      end
-
-      def if_exists_and_unhandled document_type, id, headers
-        document = document_type.find id
-
-        if_unhandled document, headers do
-          yield document
-        end
-      end
-    end
-  end
-end