synapse-core 0.5.4 → 0.5.5

data/lib/synapse/event_sourcing/repository.rb

@@ -62,7 +62,7 @@ module Synapse
         aggregate.initialize_from_stream stream
 
         if aggregate.deleted?
-          raise AggregateDeletedError
+          raise AggregateDeletedError.new type_identifier, aggregate_id
         end
 
         if expected_version and @conflict_resolver.nil?
@@ -138,6 +138,13 @@ module Synapse
     end
 
     # Raised when an aggregate has been found but it was marked for deletion
-    class AggregateDeletedError < Repository::AggregateNotFoundError; end
+    class AggregateDeletedError < Repository::AggregateNotFoundError
+      # @param [String] type_identifier
+      # @param [Object] aggregate_id
+      # @return [undefined]
+      def initialize(type_identifier, aggregate_id)
+        super 'Aggregate marked for deletion [%s] [%s]' % [type_identifier, aggregate_id]
+      end
+    end
   end
 end

data/lib/synapse/event_sourcing/snapshot/taker.rb

@@ -10,12 +10,12 @@ module Synapse
       # @return [SnapshotEventStore]
       attr_accessor :event_store
 
-      # @return [Executor]
+      # @return [Contender::Executor]
       attr_accessor :executor
 
       # @return [undefined]
       def initialize
-        @executor = DirectExecutor.new
+        @executor = Contender::DirectExecutor.new
       end
 
       # Schedules a snapshot to be taken for an aggregate of the given type and with the given

data/lib/synapse/mapping/mapping.rb

@@ -55,6 +55,6 @@ module Synapse
       def hash
         @type.hash
       end
-    end
-  end
+    end # Mapping
+  end # Mapping
 end

data/lib/synapse/process_manager/simple_process_manager.rb

@@ -4,6 +4,7 @@ module Synapse
     class SimpleProcessManager < ProcessManager
       # @return [Array] Types of events that will always result in the creation of a process
       attr_accessor :always_create_events
+
       # @return [Array] Types of events that will result in the creation of a process if one
       #   doesn't already exist
       attr_accessor :optionally_create_events

data/lib/synapse/rails/injection_helper.rb

@@ -0,0 +1,23 @@
+module Synapse
+  module Rails
+    # Mixin for an action controller in Rails that adds dependency injection
+    module InjectionHelper
+      extend ActiveSupport::Concern
+
+      included do
+        before_filter :inject_dependencies
+      end
+
+      # Performs one-time dependency injection before an action is called
+      # @return [undefined]
+      def inject_dependencies
+        return if @_dependencies_injected
+
+        container = Synapse.container
+        container.inject_into self
+
+        @_dependencies_injected = true
+      end
+    end # InjectionHelper
+  end # Rails
+end

data/lib/synapse/railtie.rb

@@ -0,0 +1,17 @@
+module Synapse
+  # Simple integration between the Synapse framework and Rails 3.2+
+  class Railtie < Rails::Railtie
+    # Set the name of the Railtie
+    railtie_name :synapse
+
+    # Controllers will get dependencies injected automatically
+    initializer 'synapse.include_controller_mixins' do
+      ActionController::Base.class_eval do
+        include Synapse::Configuration::Dependent
+        include Synapse::Rails::InjectionHelper
+      end
+    end
+  end # Railtie
+end
+
+require 'synapse/rails/injection_helper'

data/lib/synapse/repository/lock_manager.rb

@@ -26,7 +26,7 @@ module Synapse
       # @param [Object] aggregate_id
       # @return [undefined]
       def release_lock(aggregate_id); end
-    end
+    end # LockManager
 
     # Implementation of a lock manager that does no locking
     class NullLockManager < LockManager
@@ -35,6 +35,6 @@ module Synapse
       def validate_lock(aggregate)
         true
       end
-    end
-  end
+    end # NullLockManager
+  end # Repository
 end

data/lib/synapse/uow/listener.rb

@@ -74,6 +74,6 @@ module Synapse
       # @param [UnitOfWork] unit
       # @return [undefined]
       def on_cleanup(unit); end
-    end
-  end
+    end # UnitOfWorkListener
+  end # UnitOfWork
 end

data/lib/synapse/uow/listener_collection.rb

@@ -22,10 +22,7 @@ module Synapse
       # @param [UnitOfWorkListener] listener
       # @return [undefined]
       def push(listener)
-        if @logger.debug?
-          @logger.debug 'Registering listener [%s]' % listener.class
-        end
-
+        @logger.debug 'Registering listener [%s]' % listener.class
         @listeners.push listener
       end
 
@@ -34,17 +31,10 @@ module Synapse
       # @param [UnitOfWork] unit
       # @return [undefined]
       def on_start(unit)
-        @logger.debug 'Notifying listeners that unit of work is starting'
-
         @listeners.each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of start' % listener.class
-          end
-
+          @logger.debug 'Notifying [%s] of start' % listener.class
           listener.on_start unit
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
 
       # @param [UnitOfWork] unit
@@ -63,78 +53,46 @@ module Synapse
       # @param [Hash<EventBus, Array>] events
       # @return [undefined]
       def on_prepare_commit(unit, aggregates, events)
-        @logger.debug 'Notifying listeners that commit was requested'
-
         @listeners.each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of commit' % listener.class
-          end
-
+          @logger.debug 'Notifying [%s] of commit' % listener.class
           listener.on_prepare_commit unit, aggregates, events
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
 
       # @param [UnitOfWork] unit
       # @param [Object] transaction
       # @return [undefined]
       def on_prepare_transaction_commit(unit, transaction)
-        @logger.debug 'Notifying listeners that transactional commit was requested'
-
         @listeners.each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of transactional commit' % listener.class
-          end
-
+          @logger.debug 'Notifying [%s] of transactional commit' % listener.class
           listener.on_prepare_transaction_commit unit, transaction
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
 
       # @param [UnitOfWork] unit
       # @return [undefined]
       def after_commit(unit)
-        @logger.debug 'Notifying listeners that commit has finished'
-
         @listeners.reverse_each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of finished commit' % listener.class
-          end
-
+          @logger.debug 'Notifying [%s] of finished commit' % listener.class
           listener.after_commit unit
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
 
       # @param [UnitOfWork] unit
       # @param [Error] cause
       # @return [undefined]
       def on_rollback(unit, cause = nil)
-        @logger.debug 'Notifying listeners of rollback'
-
         @listeners.reverse_each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of rollback' % listener.class
-          end
-
+          @logger.debug 'Notifying [%s] of rollback' % listener.class
           listener.on_rollback unit, cause
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
 
       # @param [UnitOfWork] unit
       # @return [undefined]
       def on_cleanup(unit)
-        @logger.debug 'Notifying listeners of cleanup'
-
         @listeners.reverse_each do |listener|
-          if @logger.debug?
-            @logger.debug 'Notifying [%s] of cleanup' % listener.class
-          end
+          @logger.debug 'Notifying [%s] of cleanup' % listener.class
 
           begin
             listener.on_cleanup unit
@@ -143,8 +101,6 @@ module Synapse
             @logger.warn 'Listener raised an exception during cleanup: %s' % exception.inspect
           end
         end
-
-        @logger.debug 'Listeners successfully notified'
       end
     end # UnitOfWorkListenerCollection
   end # UnitOfWork

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

data/lib/synapse-core.rb

@@ -0,0 +1 @@
+require 'synapse'

data/lib/synapse.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext'
+require 'contender'
 require 'forwardable'
 require 'logging'
 require 'set'
@@ -29,3 +30,5 @@ module Synapse
   autoload :ProcessManager
   autoload :Upcasting
 end
+
+require 'synapse/railtie' if defined? Rails

data/test/command/async_command_bus_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'support/countdown_latch'
 
 module Synapse
   module Command
@@ -9,14 +8,16 @@ module Synapse
         unit_factory = UnitOfWork::UnitOfWorkFactory.new unit_provider
 
         @bus = AsynchronousCommandBus.new unit_factory
-        @bus.thread_pool = Thread.pool 2
+        @bus.thread_pool = Contender::Pool::ThreadPoolExecutor.new
+        @bus.thread_pool.start
       end
 
       should 'be able to dispatch commands asynchronously using a thread pool' do
         x = 5 # Number of commands to dispatch
 
         command = CommandMessage.as_message TestCommand.new
-        handler = TestAsyncHandler.new x
+        latch = Contender::CountdownLatch.new x
+        handler = TestAsyncHandler.new latch
 
         @bus.subscribe TestCommand, handler
 
@@ -24,23 +25,19 @@ module Synapse
           @bus.dispatch command
         end
 
-        wait_until do
-          handler.latch.count == 0
-        end
+        assert latch.await 5
 
         @bus.shutdown
       end
     end
 
     class TestAsyncHandler
-      attr_reader :latch
-
-      def initialize(x)
-        @latch = CountdownLatch.new x
+      def initialize(latch)
+        @latch = latch
       end
 
       def handle(command, unit)
-        @latch.countdown!
+        @latch.countdown
       end
     end
 

data/test/configuration/component/command_bus/async_command_bus_test.rb

@@ -16,20 +16,21 @@ module Synapse
         assert command_bus.is_a? Command::AsynchronousCommandBus
 
         thread_pool = command_bus.thread_pool
-        assert_equal 4, thread_pool.min
-        assert_equal 4, thread_pool.max
+        assert_instance_of Contender::Pool::ThreadPoolExecutor, thread_pool
+        assert thread_pool.active?
+        thread_pool.shutdown
       end
 
-      should 'build with a custom thread pool size' do
+      should 'build with a custom thread pool options' do
         @builder.async_command_bus do
-          use_threads 2, 8
+          use_pool_options size: 4, non_block: true
         end
 
         command_bus = @container.resolve :command_bus
 
         thread_pool = command_bus.thread_pool
-        assert_equal 2, thread_pool.min
-        assert_equal 8, thread_pool.max
+        assert thread_pool.active?
+        thread_pool.shutdown
       end
     end
   end

data/test/configuration/component/serialization/serializer_test.rb

@@ -40,7 +40,7 @@ module Synapse
       end
 
       should 'build with OxSerializer' do
-        skip 'Ox not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Ox not supported on JRuby' if defined? JRUBY_VERSION
 
         serialize_options = { :circular => true }
 
@@ -56,7 +56,7 @@ module Synapse
       end
 
       should 'build with OjSerializer' do
-        skip 'Oj not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Oj not supported on JRuby' if defined? JRUBY_VERSION
 
         serialize_options = { :indent => 2, :circular => true }
         deserialize_options = { :symbol_keys => true }

data/test/configuration/fixtures/dependent.rb

@@ -4,7 +4,7 @@ module Synapse
       include Dependent
 
       depends_on :service_a
-      depends_on :service_b, :attribute => :some_service
+      depends_on :service_b, :as => :some_service
     end
   end
 end

data/test/rails/injection_helper_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+require 'rails'
+require 'synapse/railtie'
+
+module Synapse
+  module Rails
+    class InjectionHelperTest < Test::Unit::TestCase
+
+      def setup
+        @controller_class = Class.new
+        @controller = @controller_class.new
+        mock(@controller_class).before_filter(:inject_dependencies)
+        @controller_class.send :include, InjectionHelper
+      end
+
+      should 'inject dependencies only once' do
+        container_mock = mock(Synapse).container.mock!
+        container_mock.inject_into(@controller)
+
+        @controller.inject_dependencies
+        @controller.inject_dependencies
+      end
+
+    end
+  end
+end

data/test/serialization/converter/ox_test.rb

@@ -4,7 +4,7 @@ module Synapse
   module Serialization
     class OxDocumentToXmlConverterTest < Test::Unit::TestCase
       def setup
-        skip 'Ox not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Ox not supported on JRuby' if defined? JRUBY_VERSION
       end
 
       should 'convert an Ox document to an XML string' do
@@ -22,7 +22,7 @@ module Synapse
 
     class XmlToOxDocumentConverterTest < Test::Unit::TestCase
       def setup
-        skip 'Ox not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Ox not supported on JRuby' if defined? JRUBY_VERSION
       end
 
       should 'convert an XML string to an Ox document' do

data/test/serialization/serializer/oj_test.rb

@@ -6,7 +6,7 @@ module Synapse
 
     class OjSerializerTest < Test::Unit::TestCase
       def setup
-        skip 'Oj not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Oj not supported on JRuby' if defined? JRUBY_VERSION
       end
 
       should 'support serializing and deserializing content' do

data/test/serialization/serializer/ox_test.rb

@@ -6,7 +6,7 @@ module Synapse
 
     class OxSerializerTest < Test::Unit::TestCase
       def setup
-        skip 'Ox not supported on JRuby' if defined? JRUBY_VERSION
+        omit 'Ox not supported on JRuby' if defined? JRUBY_VERSION
 
         @serializer = OxSerializer.new ConverterFactory.new
       end

data/test/test_helper.rb

@@ -8,19 +8,18 @@ else
   end
 end
 
-require 'pp'
+# Need this for Contender, since we get it from GitHub for now
+require 'bundler/setup'
+
 require 'synapse'
+
+require 'pp'
 require 'test/unit'
-require 'shoulda/context'
-require 'rr'
+require 'test/unit/rr'
+
 require 'timecop'
+require 'shoulda/context'
 
 require 'test_ext'
 
-# I guess RR broke
-# http://stackoverflow.com/questions/3657972
-unless defined? Test::Unit::AssertionFailedError
-  Test::Unit::AssertionFailedError = ActiveSupport::TestCase::Assertion
-end
-
 ActiveSupport::Autoload.eager_autoload!

data/test/uow/uow_test.rb

@@ -159,8 +159,8 @@ module Synapse
 
       should 'rollback if an aggregate storage callback raises an exception' do
         aggregate_root = Object.new
-        mock(aggregate_root).add_registration_listener
-        mock(aggregate_root).id
+        stub(aggregate_root).add_registration_listener
+        stub(aggregate_root).id
 
         event_bus = Object.new
         cause = TestError.new