euston-eventstore 1.2.0-java → 1.2.1-java

data/euston-eventstore.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-eventstore'
-  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']
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     lib/euston-eventstore/persistence/mongodb/mongo_command_message.rb
     lib/euston-eventstore/persistence/mongodb/mongo_commit.rb
     lib/euston-eventstore/persistence/mongodb/mongo_commit_id.rb
+    lib/euston-eventstore/persistence/mongodb/mongo_concurrency_detection.rb
     lib/euston-eventstore/persistence/mongodb/mongo_config.rb
     lib/euston-eventstore/persistence/mongodb/mongo_event_message.rb
     lib/euston-eventstore/persistence/mongodb/mongo_persistence_engine.rb

data/lib/euston-eventstore.rb

@@ -17,6 +17,7 @@ require 'euston-eventstore/dispatcher/synchronous_dispatcher'
 require 'euston-eventstore/persistence/stream_head'
 require 'euston-eventstore/persistence/mongodb/mongo_commit'
 require 'euston-eventstore/persistence/mongodb/mongo_commit_id'
+require 'euston-eventstore/persistence/mongodb/mongo_concurrency_detection'
 require 'euston-eventstore/persistence/mongodb/mongo_config'
 require 'euston-eventstore/persistence/mongodb/mongo_command_message'
 require 'euston-eventstore/persistence/mongodb/mongo_event_message'

data/lib/euston-eventstore/persistence/mongodb/mongo_concurrency_detection.rb

@@ -0,0 +1,31 @@
+module Euston
+  module EventStore
+    module Persistence
+      module Mongodb
+        module MongoConcurrencyDetection
+          extend ActiveSupport::Concern
+
+          module InstanceMethods
+            def mongo_error_types_for_current_ruby_platform
+              errors = [ Mongo::OperationFailure ]
+              errors << NativeException if RUBY_PLATFORM.to_s == 'java'
+              errors
+            end
+
+            def detect_mongo_concurrency opts = {}, &block
+              begin
+                yield
+              rescue *mongo_error_types_for_current_ruby_platform => e
+                if e.message.include? "E11000"
+                  opts.fetch(:on_e11000_error, ->(ex) { raise ConcurrencyError }).call e
+                else
+                  opts.fetch(:on_other_error, ->(ex) { raise ex }).call e
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/euston-eventstore/persistence/mongodb/mongo_persistence_engine.rb

@@ -3,6 +3,8 @@ module Euston
     module Persistence
       module Mongodb
         class MongoPersistenceEngine
+          include MongoConcurrencyDetection
+
           def initialize(store)
             @store = store
 
@@ -42,18 +44,18 @@ module Euston
             try_mongo do
               commit = attempt.to_mongo_commit
 
-              begin
-                persisted_commits.insert commit
-
-                update_stream_head_async attempt.stream_id, attempt.stream_revision, attempt.events.length
-              rescue Mongo::OperationFailure, NativeException => e
-                raise(Euston::EventStore::StorageError, e.message, e.backtrace) unless e.message.include? CONCURRENCY_EXCEPTION
-
+              on_e11000_error = ->(e) do
                 committed = persisted_commits.find_one(attempt.to_id_query)
-
                 raise Euston::EventStore::DuplicateCommitError if !committed.nil? && committed['commit_id'] == attempt.commit_id
                 raise Euston::EventStore::ConcurrencyError
               end
+
+              on_other_error = ->(e) { raise EventStore::StorageError, e.message, e.backtrace }
+
+              detect_mongo_concurrency :on_e11000_error => on_e11000_error, :on_other_error => on_other_error do
+                persisted_commits.insert commit
+                update_stream_head_async attempt.stream_id, attempt.stream_revision, attempt.events.length
+              end
             end
           end
 

data/lib/euston-eventstore/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: euston-eventstore
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.0
+  version: 1.2.1
 platform: java
 authors:
 - Lee Henson
@@ -10,106 +10,106 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 +01:00
+date: 2011-10-13 00:00:00.000000000 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &2210 !ruby/object:Gem::Requirement
+  version_requirements: &2218 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.9
     none: false
-  requirement: *2210
+  requirement: *2218
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: euston
-  version_requirements: &2228 !ruby/object:Gem::Requirement
+  version_requirements: &2236 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
     none: false
-  requirement: *2228
+  requirement: *2236
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  version_requirements: &2244 !ruby/object:Gem::Requirement
+  version_requirements: &2252 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
     none: false
-  requirement: *2244
+  requirement: *2252
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: json-jruby
-  version_requirements: &2260 !ruby/object:Gem::Requirement
+  version_requirements: &2268 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
     none: false
-  requirement: *2260
+  requirement: *2268
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jmongo
-  version_requirements: &2276 !ruby/object:Gem::Requirement
+  version_requirements: &2284 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
     none: false
-  requirement: *2276
+  requirement: *2284
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &2292 !ruby/object:Gem::Requirement
+  version_requirements: &2300 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
     none: false
-  requirement: *2292
+  requirement: *2300
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: fuubar
-  version_requirements: &2310 !ruby/object:Gem::Requirement
+  version_requirements: &2318 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.0
     none: false
-  requirement: *2310
+  requirement: *2318
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2326 !ruby/object:Gem::Requirement
+  version_requirements: &2334 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
     none: false
-  requirement: *2326
+  requirement: *2334
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2342 !ruby/object:Gem::Requirement
+  version_requirements: &2350 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
     none: false
-  requirement: *2342
+  requirement: *2350
   prerelease: false
   type: :development
 description: Ruby port for Jonathan Oliver's EventStore. See https://github.com/joliver/EventStore for details.
@@ -137,6 +137,7 @@ files:
 - lib/euston-eventstore/persistence/mongodb/mongo_command_message.rb
 - lib/euston-eventstore/persistence/mongodb/mongo_commit.rb
 - lib/euston-eventstore/persistence/mongodb/mongo_commit_id.rb
+- lib/euston-eventstore/persistence/mongodb/mongo_concurrency_detection.rb
 - lib/euston-eventstore/persistence/mongodb/mongo_config.rb
 - lib/euston-eventstore/persistence/mongodb/mongo_event_message.rb
 - lib/euston-eventstore/persistence/mongodb/mongo_persistence_engine.rb