serf 0.6.1 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serf
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70299039120640 !ruby/object:Gem::Requirement
+  requirement: &70285339872700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299039120640
+  version_requirements: *70285339872700
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70299039109700 !ruby/object:Gem::Requirement
+  requirement: &70285339872080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299039109700
+  version_requirements: *70285339872080
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70299039106600 !ruby/object:Gem::Requirement
+  requirement: &70285339871240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,54 +43,54 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70299039106600
+  version_requirements: *70285339871240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299039104180 !ruby/object:Gem::Requirement
+  requirement: &70285339870220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70299039104180
+  version_requirements: *70285339870220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70299039091440 !ruby/object:Gem::Requirement
+  requirement: &70285339869440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70299039091440
+  version_requirements: *70285339869440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70299039069120 !ruby/object:Gem::Requirement
+  requirement: &70285339868840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.22
   type: :development
   prerelease: false
-  version_requirements: *70299039069120
+  version_requirements: *70285339868840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70299039063240 !ruby/object:Gem::Requirement
+  requirement: &70285339868260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70299039063240
+  version_requirements: *70285339868260
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70299039058300 !ruby/object:Gem::Requirement
+  requirement: &70285339867680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299039058300
+  version_requirements: *70285339867680
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &70285339866960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :development
+  prerelease: false
+  version_requirements: *70285339866960
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70299035537960 !ruby/object:Gem::Requirement
+  requirement: &70285339866280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *70299035537960
+  version_requirements: *70285339866280
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70299035537480 !ruby/object:Gem::Requirement
+  requirement: &70285339914940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,18 @@ dependencies:
         version: 0.12.10
   type: :development
   prerelease: false
-  version_requirements: *70299035537480
+  version_requirements: *70285339914940
+- !ruby/object:Gem::Dependency
+  name: girl_friday
+  requirement: &70285339914320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :development
+  prerelease: false
+  version_requirements: *70285339914320
 description: Event-Driven SOA with CQRS
 email: benjaminlyu@gmail.com
 executables: []
@@ -137,22 +159,27 @@ files:
 - NOTICE.txt
 - README.md
 - Rakefile
+- docs/thread_pools.txt
 - lib/serf.rb
 - lib/serf/builder.rb
+- lib/serf/command.rb
 - lib/serf/error.rb
 - lib/serf/message.rb
 - lib/serf/messages/caught_exception_event.rb
 - lib/serf/messages/message_accepted_event.rb
 - lib/serf/middleware/uuid_tagger.rb
-- lib/serf/runners/direct_runner.rb
-- lib/serf/runners/em_runner.rb
+- lib/serf/routing/endpoint.rb
+- lib/serf/routing/registry.rb
+- lib/serf/runners/direct.rb
+- lib/serf/runners/event_machine.rb
+- lib/serf/runners/girl_friday.rb
+- lib/serf/runners/helper.rb
 - lib/serf/serfer.rb
+- lib/serf/util/error_handling.rb
 - lib/serf/util/null_object.rb
+- lib/serf/util/options_extraction.rb
 - lib/serf/util/regexp_matcher.rb
-- lib/serf/util/route_endpoint.rb
-- lib/serf/util/route_set.rb
 - lib/serf/util/uuidable.rb
-- lib/serf/util/with_error_handling.rb
 - lib/serf/version.rb
 - serf.gemspec
 - spec/serf_spec.rb
@@ -172,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2184859614106286117
+      hash: 314755585934468655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Event-Driven SOA with CQRS

data/lib/serf/runners/direct_runner.rb

@@ -1,60 +0,0 @@
-require 'serf/util/with_error_handling'
-
-module Serf
-module Runners
-
-  ##
-  # Direct runner drives the execution of a handler for given messages.
-  # This class deals with error handling and publishing handler results
-  # to proper error or results channels.
-  #
-  class DirectRunner
-    include ::Serf::Util::WithErrorHandling
-
-    def initialize(options={})
-      # Mandatory, we want both results and error channels.
-      @results_channel = options.fetch(:results_channel)
-      @error_channel = options.fetch(:error_channel)
-
-      # Optional overrides for error handling
-      @error_event_class = options[:error_event_class]
-      @logger = options[:logger]
-    end
-
-    def run(endpoints, env)
-      results = []
-      endpoints.each do |ep|
-        run_results = with_error_handling(env) do
-          params = ep.message_parser ? ep.message_parser.parse(env) : env
-          ep.handler.send(ep.action, params)
-        end
-        results.concat Array(run_results)
-        publish_results run_results
-      end
-      return results
-    end
-
-    def self.build(options={})
-      self.new options
-    end
-
-    protected
-
-    ##
-    # Loop over the results and publish them to the results channel.
-    # Any error in publishing individual messages will result in
-    # a log event and an error channel event.
-    def publish_results(results)
-      results = Array(results)
-      results.each do |message|
-        with_error_handling(message) do
-          @results_channel.publish message
-        end
-      end
-      return nil
-    end
-
-  end
-
-end
-end

data/lib/serf/runners/em_runner.rb

@@ -1,62 +0,0 @@
-require 'eventmachine'
-
-require 'serf/messages/message_accepted_event'
-require 'serf/runners/direct_runner'
-
-module Serf
-module Runners
-
-  ##
-  # This runner simply wraps another runner to execute in the
-  # EventMachine deferred threadpool.
-  #
-  # NOTE: Because the Serfer class validates messages before
-  #  sending them to runners (and handlers), this class simply
-  #  responds to the calling client with an 'MessageAcceptedEvent'
-  #  to signal that the message will be processed later.
-  #
-  # Errors caught here will simply be logged. This is because
-  # the wrapped runner *MUST* handle its own errors. If an error
-  # should propagate up here, then it was most likely an error
-  # that occurred in a rescue block... we don't want to complicate
-  # any extra publishing to error channels because that may have
-  # been the cause of the error.
-  #
-  class EmRunner
-
-    def initialize(options={})
-      # Manditory: Need a runner because EmRunner is just a wrapper.
-      @runner = options.fetch(:runner)
-
-      @mae_class = options.fetch(:message_accepted_event_class) {
-        ::Serf::Messages::MessageAcceptedEvent
-      }
-      @evm = options.fetch(:event_machine) { ::EventMachine }
-      @logger = options.fetch(:logger) { ::Serf::Util::NullObject.new }
-    end
-
-    def run(endpoints, env)
-      endpoints = endpoints.dup
-      env = env.dup
-      @evm.defer(proc do
-        begin
-          @runner.run endpoints, env
-        rescue => e
-          @logger.error "#{e.inspect}\n\n#{e.backtrace.join("\n")}"
-        end
-      end)
-      return @mae_class.new message: env
-    end
-
-    def self.build(options={})
-      options[:runner] = options.fetch(:runner) {
-        factory = options[:runner_factory] || ::Serf::Runners::DirectRunner
-        factory.build options
-      }
-      self.new options
-    end
-
-  end
-
-end
-end

data/lib/serf/util/route_endpoint.rb

@@ -1,37 +0,0 @@
-module Serf
-module Util
-
-  ##
-  # A simple class to represent route endpoints. RouteSets
-  # store a list of endpoints per matcher, and Runners use endpoints
-  # to then execute the handlers.
-  #
-  class RouteEndpoint
-    # Actual handler object that defines the action method.
-    attr_accessor :handler
-    # The method to call.
-    attr_accessor :action
-    # A parser that turns the message ENV hash into a Message object
-    # that the handler#action uses.
-    attr_accessor :message_parser
-
-    def initialize(options={})
-      # Mandatory parameters
-      @handler = options.fetch :handler
-      @action = options.fetch :action
-
-      # Optional parameters
-      @message_parser = options[:message_parser]
-    end
-
-    ##
-    # Default factory method.
-    #
-    def self.build(options={})
-      return self.new options
-    end
-
-  end
-
-end
-end

data/lib/serf/util/route_set.rb

@@ -1,82 +0,0 @@
-require 'serf/util/route_endpoint'
-require 'serf/util/regexp_matcher'
-
-module Serf
-module Util
-
-  ##
-  # RouteSets hold routing information for ENV hashes to matched endpoints.
-  #
-  class RouteSet
-
-    def initialize(options={})
-      @routes = {}
-      @matchers = []
-      @regexp_matcher_factory = options.fetch(:regexp_matcher_factory) {
-        ::Serf::Util::RegexpMatcher
-      }
-      @route_endpoint_factory = options.fetch(:route_endpoint_factory) {
-        ::Serf::Util::RouteEndpoint
-      }
-    end
-
-    ##
-    # Connects a matcher (String or an Object implementing ===) to an endpoint.
-    #
-    # @option opts [Obj, String] :matcher Matches ENV Hashes to endpoints.
-    #   Note that String and Regexp values are set up to match the
-    #   :kind key from ENV Hashes.
-    # @option opts [Obj] :handler Receiver of the action.
-    # @option opts [Symbol, String] :action Method to call on handler.
-    # @option opts [#parse] :message_parser Translates ENV Hash to Message Obj.
-    #
-    def add_route(options={})
-      # We create our endpoint representation.
-      endpoint = @route_endpoint_factory.build(
-        handler: options.fetch(:handler),
-        action: options.fetch(:action),
-        message_parser: options[:message_parser])
-
-      # Maybe we have an non-String matcher. Handle the Regexp case.
-      # We only keep track of matchers if it isn't a string because
-      # string matchers are just pulled out of routes by key lookup.
-      matcher = options.fetch :matcher
-      matcher = @regexp_matcher_factory.build matcher if matcher.kind_of? Regexp
-      @matchers << matcher unless matcher.is_a? String
-
-      # We add the route (matcher+endpoint) into our routes
-      @routes[matcher] ||= []
-      @routes[matcher] << endpoint
-    end
-
-    ##
-    # @param [Hash] env The input message environment to match for routes.
-    # @return [Array] List of endpoints that matched.
-    #
-    def match_routes(env={})
-      kind = env[:kind]
-      routes = []
-      routes.concat Array(@routes[kind])
-      @matchers.each do |matcher|
-        routes.concat Array(@routes[matcher]) if matcher === env
-      end
-      return routes
-    end
-
-    ##
-    # @return [Integer] Number of routes this RouteSet tracks.
-    #
-    def size
-      return @routes.size
-    end
-
-    ##
-    # Default factory method.
-    #
-    def self.build(options={})
-      self.new options
-    end
-  end
-
-end
-end