serf 0.1.0.alpha1 → 0.2.0.alpha1

data/Gemfile

@@ -3,14 +3,9 @@ source 'http://rubygems.org'
 # Example:
 #   gem 'activesupport', '>= 2.3.5'
 
-gem 'activesupport', '~> 3.1.1'
+gem 'activemodel', '~> 3.1.3'
+gem 'activesupport', '~> 3.1.3'
 gem 'eventmachine', '~> 0.12.10'
-gem 'i18n', '~> 0.6.0'
-gem 'msgpack', '~> 0.4.6'
-gem 'msgpack-rpc', '~> 0.4.5'
-gem 'multi_json', '~> 1.0.3'
-gem 'rack', '~> 1.3.5'
-gem 'redis', '~> 2.2.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -22,6 +17,7 @@ group :development, :test do
   gem 'rcov', '>= 0'
 
   # Soft Dependencies
-  gem 'log4r', '~> 1.1.9'
-  gem 'celluloid', '~> 0.5.0' # Only for CelluloidRunner
+  #gem 'log4r', '~> 1.1.9'
+  gem 'msgpack', '~> 0.4.6'
+  #gem 'multi_json', '~> 1.0.3'
 end

data/Gemfile.lock

@@ -1,30 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
-    celluloid (0.5.0)
+    builder (3.0.0)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
     git (1.2.5)
     i18n (0.6.0)
-    iobuffer (1.0.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    log4r (1.1.9)
     msgpack (0.4.6)
-    msgpack-rpc (0.4.5)
-      msgpack (>= 0.4.4)
-      rev (>= 0.3.0)
-    multi_json (1.0.3)
-    rack (1.3.5)
+    multi_json (1.0.4)
     rake (0.9.2.2)
     rcov (0.9.11)
-    redis (2.2.2)
-    rev (0.3.2)
-      iobuffer (>= 0.1.3)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -39,18 +34,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.1.1)
+  activemodel (~> 3.1.3)
+  activesupport (~> 3.1.3)
   bundler (~> 1.0.0)
-  celluloid (~> 0.5.0)
   eventmachine (~> 0.12.10)
-  i18n (~> 0.6.0)
   jeweler (~> 1.6.4)
-  log4r (~> 1.1.9)
   msgpack (~> 0.4.6)
-  msgpack-rpc (~> 0.4.5)
-  multi_json (~> 1.0.3)
-  rack (~> 1.3.5)
   rcov
-  redis (~> 2.2.2)
   rspec (~> 2.3.0)
   yard (~> 0.6.0)

data/README.md

@@ -5,64 +5,9 @@ Serf is a library that scaffolds distributed systems that are architected using
 Event-Driven Service Oriented Architecture design in combinations with
 the Command Query Responsibility Separation pattern.
 
-Fundamentally, serf is a server process that receives commands and
-emits events. The actual business logic is set up using `Serf's Up`
-configuration files similar to rackup files.
-
-An application developer writes Handler code that knows how to
-process commands and events. This handler code is wired up in the
-afore mentioned serfup file.
-
-Handler code is essentally an object that responds to 'call' as with
-other Rack based applications. The primary difference is that
-the 'env' passed to the Handler object is NOT rack env conformant.
-
-The message passed to the Handler objects' call methods are a
-hash, which has a `kind` keyed element whose value is the type
-of command (or event). A Handler SHOULD verify that this value is
-what it expects in case of misrouting due to bad serfup configuration.
-
-The serf library provides a very basic event service bus using
-Redis' pubsub capabilities. We hope to implement more advanced topologies
-using ZeroMQ in the future.
-
-View the `examples/config.su` file for an example of a serfup configuration.
-
-Besides Handlers, we have `Receivers` that expose points of entry for
-command and event messages. We implement two types:
-
-1. RedisPubsubReceiver - For pubsub event messages.
-2. MsgpackReceiver - For msgpack rpc receipt of command messages.
-
 Middleware
 ==========
 
-Serf::Middleware::EmRunner
---------------------------
-
-The EmRunner middleware is a mechanism to take a received message
-(from RedisPubsubReceiver or MsgpackReceiver) and have the subsequent
-app chain to be processed in the EventMachine deferred thread pool.
-This is handy for async messages that come in through the PubSub
-channel. And it is helpful in the CQRS model of processing when
-accepting commands through Msgpack RPC.
-
-Serf::Middleware::CelluloidRunner
----------------------------------
-
-`celluloid` is a soft dependency.
-
-But this middleware functions the same as the EmRunner, but with
-actors and fibers instead.
-
-NOTE: The limitation of this is that only 1 actor will be generated
-per 'use Serf::Middleware::CelluloidRunner' definition. Thus messages
-to any handler within a single 'group' will be processed serially.
-
-This might be helpful in special cases where you want non-blocking
-receipt of messages but also want ordered processing based on
-received messages.
-
 Airbrake
 --------
 
@@ -76,10 +21,7 @@ You can use Airbrake's middleware to catch exceptions.
       config.api_key = 'my_api_key'
     end
 
-    group :my_commands do
-      use Airbrake::Rack
-      handle 'my_command', MyCommand.new
-    end
+    use Airbrake::Rack
 
 
 Contributing to serf

data/Rakefile

@@ -17,7 +17,7 @@ Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "serf"
   gem.homepage = "http://github.com/byu/serf"
-  gem.license = "MIT"
+  gem.license = "Apache 2.0"
   gem.summary = %Q{Event-Driven SOA with CQRS}
   gem.description = %Q{Event-Driven SOA with CQRS}
   gem.email = "benjaminlyu@gmail.com"

data/lib/serf/builder.rb

@@ -1,22 +1,21 @@
-require 'rack'
+require 'serf/serfer'
 
 module Serf
 
   ##
-  # A Serf Builder that processes the SerfUp DSL to set up a new
-  # serf server processing.
+  # A Serf Builder that processes the SerfUp DSL to build a rack-like
+  # app to route and process received messages. This builder is
+  # implemented with lots of code from Rack::Builder.
   #
   #   builder = Serf::Builder.parse_file 'examples/config.su'
-  #   builder.run       # spins of daemon threads for each receiver
-  #   EventMachine::run # Most likely do this because of EmRunner middleware.
+  #   builder.to_app
   #
   # or
   #
   #   builder = Serf::Builder.new do
   #     ... A SerfUp Config block here. See the examples/config.su
   #   end
-  #   builder.run
-  #   EventMachine::run
+  #   builder.to_app
   #
   class Builder
     def self.parse_file(config)
@@ -26,71 +25,75 @@ module Serf
       return builder
     end
 
-    def initialize(&block)
-      @already_run = false
-      @groups = {}
-      @receivers = []
-
-      reset_current_group
+    def initialize(options={}, &block)
+      @use = []
+      @manifest = {}
+      @config = {}
+      @not_found = options[:not_found]
+      @serfer_class = options.fetch(:serfer_class) { ::Serf::Serfer }
+      @serfer_options = options[:serfer_options] || {}
       instance_eval(&block) if block_given?
     end
 
-    def group(name, &block)
-      raise 'Already inside group' if @current_group_name
-      @current_group_name = name
-      instance_eval(&block) if block_given?
-      commit_current_group
-      reset_current_group
+    def self.app(default_app=nil, &block)
+      self.new(default_app, &block).to_app
     end
 
     def use(middleware, *args, &block)
       @use << proc { |app| middleware.new(app, *args, &block) }
     end
 
-    def handle(kind, app=nil, &block)
-      raise 'Not inside group' unless @current_group_name
-      if app
-        @handlers[kind.to_s] = app
-      elsif block_given?
-        @handlers[kind.to_s] = ::Rack::Builder.new(block).to_app
-      end
+    def register(manifest)
+      @manifest.merge! manifest
+    end
+
+    def config(handler, *args, &block)
+      @config[handler] = [args, block]
     end
 
     def not_found(app)
-      raise 'not_found already declared for this group' if @not_found
       @not_found = app
     end
 
-    def bind(group, receiver, *args)
-      app = @groups[group]
-      @receivers << receiver.new(app, *args)
-    end
-
-    def run
-      raise 'Already run' if @already_run
-      @already_run = true
-      @receivers.each do |receiver|
-        Thread.new {
-          receiver.run
-        }
-      end
+    def to_app
+      app = generate_routes
+      return @use.reverse.inject(app) { |a,e| e[a] }
     end
 
     private
 
-    def reset_current_group
-      @current_group_name = nil
-      @not_found = nil
-      @handlers = {}
-      @use = []
-    end
+    def generate_routes
+      kinds = {}
+      handlers = {}
+      async_handlers = {}
+
+      @manifest.each do |kind, options|
+        # Instantiate our handler with any possible configuration.
+        handler_str = options.fetch(:handler)
+        handler_class = handler_str.camelize.constantize
+        args, block = @config.fetch(handler_str) { [[], nil] }
+        handler = handler_class.new *args, &block
+
+        # Then put it into the proper map of handlers for either
+        # synchronous or asynchronous processing.
+        async = options.fetch(:async) { true }
+        (async ? async_handlers : handlers)[kind] = handler
+
+        # Get the implementing message serialization class.
+        # For a given message kind, we may have a different (or nil)
+        # implementing class. If nil, then we're not going to try to
+        # create a message class to validate before passing to handler.
+        message_class = options.fetch(:message_class) { kind }
+        kinds[kind] = message_class && message_class.camelize.constantize
+      end
 
-    def commit_current_group
-      app = ::Serf::Middleware::KindMapper.new(
-        map: @handlers,
-        not_found: @not_found)
-      app = @use.reverse.inject(app) { |a,e| e[a] } if @use.size > 0
-      @groups[@current_group_name] = app
+      # We create the serfer class to handle all the messages.
+      return @serfer_class.new(
+        @serfer_options.merge(
+          kinds: kinds,
+          handlers: handlers,
+          async_handlers: async_handlers,
+          not_found: @not_found))
     end
 
   end

data/lib/serf/handler.rb

@@ -0,0 +1,67 @@
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
+require 'active_support/ordered_options'
+
+module Serf
+
+  module Handler
+    extend ActiveSupport::Concern
+
+    included do
+      # In the class that includes this module, we're going to
+      # create an inheritable class attribute that will store
+      # our mappings between messages and the methods to call.
+      class_attribute :serf_actions
+      send(
+        'serf_actions=',
+        ActiveSupport::InheritableOptions.new)
+
+      def self.inherited(kls) #:nodoc:
+        super
+        # Sets the current subclass class attribute to be an
+        # inheritable copy of the superclass options.
+        kls.send(
+          'serf_actions=',
+          self.serf_actions.inheritable_copy)
+      end
+
+    end
+
+    module InstanceMethods
+
+      ##
+      # Rack-like call. It receives an environment hash, which we
+      # assume is a message.
+      #
+      def call(env={})
+        # Just to stringify the environment keys
+        env = env.dup.stringify_keys
+        # Make sure a kind was set, and that we can handle it.
+        message_kind = env['kind']
+        raise ArgumentError, 'No "kind" in call env' if message_kind.blank?
+        method = self.class.serf_actions[message_kind]
+        raise ArgumentError, "#{message_kind} not found" if method.blank?
+        # Now execute the method with the environment parameters
+        self.send method, env
+      end
+    end
+
+    module ClassMethods
+
+      ##
+      # registers a method to handle the receipt of a message type.
+      #
+      def receives(message_kind, options={})
+        raise ArgumentError, 'Blank message_kind' if message_kind.blank?
+        exposed_method = options[:with]
+        raise ArgumentError, 'Missing "with" option' if exposed_method.blank?
+        self.serf_actions[message_kind] = exposed_method
+      end
+
+    end
+
+  end
+
+end

data/lib/serf/message.rb

@@ -0,0 +1,44 @@
+require 'active_model'
+require 'active_support/concern'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/string/inflections'
+
+module Serf
+
+  ##
+  # A module to represent a message that we're transporting over
+  # the wire. This is mainly for commands and events in ED-SOA.
+  # Optional, but useful for validations, etc.
+  #
+  module Message
+    extend ActiveSupport::Concern
+    include ActiveModel::Serialization
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Validations
+
+    included do
+      class_attribute :kind
+      send 'kind=', self.to_s.tableize.singularize
+    end
+
+    module InstanceMethods
+
+      def attributes
+        {
+          'kind' => kind
+        }
+      end
+
+      def kind
+        self.class.kind
+      end
+
+      def to_msgpack
+        attributes.to_msgpack
+      end
+
+    end
+
+  end
+
+end

data/lib/serf/serfer.rb

@@ -0,0 +1,78 @@
+require 'eventmachine'
+
+require 'serf/util/null_object'
+
+module Serf
+
+  ##
+  # The Serfer is a rack app endpoint that:
+  class Serfer
+
+    def initialize(options={})
+      # Options for handling the requests
+      @kinds = options[:kinds] || {}
+      @handlers = options[:handlers] || {}
+      @async_handlers = options[:async_handlers] || {}
+      @not_found = options[:not_found]
+
+      # Other processing aspects
+      @em = options.fetch(:event_machine) { ::EM }
+      @logger = options.fetch(:logger) { ::Serf::Util::NullObject.new }
+    end
+
+    ##
+    # Rack-like call to handle a message
+    #
+    def call(env)
+      kind = env['kind']
+
+      # Do a message_class validation if we have it listed.
+      # And use the message attributes instead of raw env when passing
+      # to message handler.
+      message_class = @kinds[kind]
+      if message_class
+        message = message_class.new env
+        raise message.errors.full_messages.join('. ') unless message.valid?
+        params = message.attributes
+      else
+        params = env.stringify_keys
+      end
+
+      # Run an asynchronous handler if we have it. 
+      handler = @async_handlers[kind]
+      if handler
+        @em.defer(proc do
+          begin
+            handler.call params
+          rescue => e
+            @logger.error e
+          end
+        end)
+        return [
+          202,
+          {
+            'Content-Type' => 'text/plain'
+          },
+          ['Accepted']
+        ]
+      end
+
+      # Run a synchronous handler if we have it. 
+      handler = @handlers[kind]
+      return handler.call(params) if handler
+
+      # run a not found
+      return @not_found.call(params) if @not_found
+
+      # we can't handle this kind.
+      return [
+        404,
+        {
+          'Content-Type' => 'text/plain',
+          'X-Cascade' => 'pass'
+        },
+        ['Not Found']
+      ]
+    end
+  end
+end

data/lib/serf/{null_object.rb → util/null_object.rb}

@@ -1,4 +1,5 @@
 module Serf
+module Util
 
   ##
   # A simple NullOject pattern implementation for some Serf code that
@@ -11,3 +12,4 @@ module Serf
   end
 
 end
+end

data/lib/serf/version.rb

@@ -2,7 +2,7 @@ module Serf
 
   module Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     BUILD = 'alpha1'
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join '.'

data/lib/serf.rb

@@ -1,21 +1,4 @@
 module Serf
-
-  autoload :Builder, 'serf/builder'
-  autoload :NullObject, 'serf/null_object'
-
-  # Emitters
-  autoload :RedisEmitter, 'serf/emitters/redis_emitter'
-
-  # Receivers
-  autoload :MsgpackReceiver, 'serf/receivers/msgpack_receiver'
-  autoload :RedisPubsubReceiver, 'serf/receivers/redis_pubsub_receiver'
-
-  module Middleware
-    autoload :CelluloidRunner, 'serf/middleware/celluloid_runner'
-    autoload :EmRunner, 'serf/middleware/em_runner'
-    autoload :KindMapper, 'serf/middleware/kind_mapper'
-  end
-
 end
 
 require 'serf/version'

data/serf.gemspec

@@ -5,14 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "serf"
-  s.version = "0.1.0.alpha1"
+  s.version = "0.2.0.alpha1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin Yu"]
-  s.date = "2011-11-03"
+  s.date = "2011-12-12"
   s.description = "Event-Driven SOA with CQRS"
   s.email = "benjaminlyu@gmail.com"
-  s.executables = ["serfup"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -26,24 +25,19 @@ Gem::Specification.new do |s|
     "NOTICE.txt",
     "README.md",
     "Rakefile",
-    "bin/serfup",
-    "examples/config.su",
     "lib/serf.rb",
     "lib/serf/builder.rb",
-    "lib/serf/emitters/redis_emitter.rb",
-    "lib/serf/middleware/celluloid_runner.rb",
-    "lib/serf/middleware/em_runner.rb",
-    "lib/serf/middleware/kind_mapper.rb",
-    "lib/serf/null_object.rb",
-    "lib/serf/receivers/msgpack_receiver.rb",
-    "lib/serf/receivers/redis_pubsub_receiver.rb",
+    "lib/serf/handler.rb",
+    "lib/serf/message.rb",
+    "lib/serf/serfer.rb",
+    "lib/serf/util/null_object.rb",
     "lib/serf/version.rb",
     "serf.gemspec",
     "spec/serf_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/byu/serf"
-  s.licenses = ["MIT"]
+  s.licenses = ["Apache 2.0"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
   s.summary = "Event-Driven SOA with CQRS"
@@ -52,54 +46,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.1"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.1.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.3"])
       s.add_runtime_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_runtime_dependency(%q<i18n>, ["~> 0.6.0"])
-      s.add_runtime_dependency(%q<msgpack>, ["~> 0.4.6"])
-      s.add_runtime_dependency(%q<msgpack-rpc>, ["~> 0.4.5"])
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_runtime_dependency(%q<rack>, ["~> 1.3.5"])
-      s.add_runtime_dependency(%q<redis>, ["~> 2.2.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<log4r>, ["~> 1.1.9"])
-      s.add_development_dependency(%q<celluloid>, ["~> 0.5.0"])
+      s.add_development_dependency(%q<msgpack>, ["~> 0.4.6"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.1.1"])
+      s.add_dependency(%q<activemodel>, ["~> 3.1.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.1.3"])
       s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-      s.add_dependency(%q<i18n>, ["~> 0.6.0"])
-      s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
-      s.add_dependency(%q<msgpack-rpc>, ["~> 0.4.5"])
-      s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_dependency(%q<rack>, ["~> 1.3.5"])
-      s.add_dependency(%q<redis>, ["~> 2.2.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<log4r>, ["~> 1.1.9"])
-      s.add_dependency(%q<celluloid>, ["~> 0.5.0"])
+      s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.1.1"])
+    s.add_dependency(%q<activemodel>, ["~> 3.1.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.1.3"])
     s.add_dependency(%q<eventmachine>, ["~> 0.12.10"])
-    s.add_dependency(%q<i18n>, ["~> 0.6.0"])
-    s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
-    s.add_dependency(%q<msgpack-rpc>, ["~> 0.4.5"])
-    s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-    s.add_dependency(%q<rack>, ["~> 1.3.5"])
-    s.add_dependency(%q<redis>, ["~> 2.2.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<log4r>, ["~> 1.1.9"])
-    s.add_dependency(%q<celluloid>, ["~> 0.5.0"])
+    s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serf
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha1
+  version: 0.2.0.alpha1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,99 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70284262969520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70284262969520
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70284262967940 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: &70254700994980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
-  type: :runtime
-  prerelease: false
-  version_requirements: *70284262967940
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70284262966820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70284262966820
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: &70284262965600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70284262965600
+  version_requirements: *70254700994980
 - !ruby/object:Gem::Dependency
-  name: msgpack-rpc
-  requirement: &70284262964540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70284262964540
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70284262963360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *70284262963360
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &70284262962220 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70254700994500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70284262962220
+  version_requirements: *70254700994500
 - !ruby/object:Gem::Dependency
-  name: redis
-  requirement: &70284262961440 !ruby/object:Gem::Requirement
+  name: eventmachine
+  requirement: &70254700994020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70284262961440
+  version_requirements: *70254700994020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70284262960340 !ruby/object:Gem::Requirement
+  requirement: &70254700993540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70284262960340
+  version_requirements: *70254700993540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70284262914860 !ruby/object:Gem::Requirement
+  requirement: &70254700993060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70284262914860
+  version_requirements: *70254700993060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70284262913600 !ruby/object:Gem::Requirement
+  requirement: &70254700992580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70284262913600
+  version_requirements: *70254700992580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70284262912720 !ruby/object:Gem::Requirement
+  requirement: &70254700992100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70284262912720
+  version_requirements: *70254700992100
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70284262911900 !ruby/object:Gem::Requirement
+  requirement: &70254700991540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,33 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284262911900
+  version_requirements: *70254700991540
 - !ruby/object:Gem::Dependency
-  name: log4r
-  requirement: &70284262910880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.9
-  type: :development
-  prerelease: false
-  version_requirements: *70284262910880
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: &70284262909900 !ruby/object:Gem::Requirement
+  name: msgpack
+  requirement: &70254700991060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *70284262909900
+  version_requirements: *70254700991060
 description: Event-Driven SOA with CQRS
 email: benjaminlyu@gmail.com
-executables:
-- serfup
+executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -193,24 +126,19 @@ files:
 - NOTICE.txt
 - README.md
 - Rakefile
-- bin/serfup
-- examples/config.su
 - lib/serf.rb
 - lib/serf/builder.rb
-- lib/serf/emitters/redis_emitter.rb
-- lib/serf/middleware/celluloid_runner.rb
-- lib/serf/middleware/em_runner.rb
-- lib/serf/middleware/kind_mapper.rb
-- lib/serf/null_object.rb
-- lib/serf/receivers/msgpack_receiver.rb
-- lib/serf/receivers/redis_pubsub_receiver.rb
+- lib/serf/handler.rb
+- lib/serf/message.rb
+- lib/serf/serfer.rb
+- lib/serf/util/null_object.rb
 - lib/serf/version.rb
 - serf.gemspec
 - spec/serf_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/byu/serf
 licenses:
-- MIT
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -223,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1899332783665321639
+      hash: 1721782691913874176
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/bin/serfup

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-#$LOAD_PATH << 'lib'
-
-require 'eventmachine'
-require 'serf'
-
-Serf::Builder.parse_file(ARGV.first).run
-EventMachine::run

data/examples/config.su

@@ -1,58 +0,0 @@
-# A Serf's Up file
-
-require 'log4r'
-
-# Set up a general logger for the app
-logger = Log4r::Logger.new 'my_logger'
-logger.outputters = Log4r::FileOutputter.new(
-  'fileOutputter',
-  filename: 'console.txt')
-
-# Define a single emitter w/ default redis connections
-emitter = Serf::RedisEmitter.new
-
-# Define a group of events handlers
-group :events do
-  # We use the EmRunner middleware so the handlers get run in the
-  # EventMachine deferred thread pool.
-  use Serf::Middleware::EmRunner, logger: logger
-
-  # Define a handler for the post_rated_event kind of message.
-  handle 'post_rated_event', proc { |env|
-    logger.info("I'm in post_rated_event #{env.inspect}")
-    [200, {}, '']
-  }
-
-  # Define what happens if a message received has a 'kind' attribute that
-  # is not defined in this group.
-  not_found(proc { |env|
-    logger.info("event not found #{env.inspect}")
-    [200, {},'']
-  })
-end
-
-# Define a group of handlers that'll be handled by the MsgPackReceiver
-group :commands do
-  # We use the EmRunner middleware so the handlers get run in the
-  # EventMachine deferred thread pool.
-  use Serf::Middleware::EmRunner, logger: logger
-
-  # Handle the 'post_rating_request' command message.
-  handle 'post_rating_request', proc { |env|
-    logger.info("I'm in post_rating_request #{env.inspect}")
-    emitter.emit(
-      kind: 'post_rated_event',
-      rated_data: env.to_s)
-    [200, {},'']
-  }
-  not_found(proc { |env|
-    logger.info("command not found #{env.inspect}")
-    [200, {},'']
-  })
-end
-
-# Bind our receivers and handler groups
-bind :events, Serf::RedisPubsubReceiver
-bind :commands, Serf::MsgpackReceiver, :host => '0.0.0.0', :post => 18800
-
-

data/lib/serf/emitters/redis_emitter.rb

@@ -1,23 +0,0 @@
-require 'multi_json'
-require 'redis'
-
-module Serf
-
-  ##
-  # Emits messages/events over a redis pubsub channel.
-  #
-  class RedisEmitter
-    DEFAULT_CHANNEL = 'serf_pubsub_channel'
-
-    def initialize(options={})
-      @redis = options.fetch(:redis) { Redis.connect }
-      @channel = options.fetch(:channel) { DEFAULT_CHANNEL }
-    end
-
-    def emit(message)
-      encoded_message = MultiJson.encode message
-      @redis.publish @channel, encoded_message
-    end
-
-  end
-end

data/lib/serf/middleware/celluloid_runner.rb

@@ -1,45 +0,0 @@
-require 'celluloid'
-
-module Serf
-module Middleware
-
-  ##
-  # Spins off a received message to be run async by a celluloid actor.
-  #
-  class CelluloidRunner
-
-    def initialize(app, options={})
-      actor_class = options.fetch(:actor_class) { CelluloidRunnerActor }
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-      @actor = actor_class.new app, logger: @logger
-    end
-
-    def call(message)
-      @actor.call! message
-      return [
-        202,
-        {
-          'Content-Type' => 'text/plain'
-        },
-        ['Accepted']
-      ]
-    end
-  end
-
-  class CelluloidRunnerActor
-    include Celluloid
-
-    def initialize(app, options={})
-      @app = app
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-    end
-
-    def call(message)
-      @app.call message
-    rescue => e
-      @logger.error e
-    end
-  end
-
-end
-end

data/lib/serf/middleware/em_runner.rb

@@ -1,32 +0,0 @@
-require 'eventmachine'
-
-module Serf
-module Middleware
-
-  class EmRunner
-    def initialize(app, options={})
-      @em = options.fetch(:event_machine) { EM }
-      @app = app
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-    end
-
-    def call(env)
-      @em.defer(proc do
-        begin
-          @app.call env
-        rescue => e
-          @logger.error e
-        end
-      end)
-      return [
-        202,
-        {
-          'Content-Type' => 'text/plain'
-        },
-        ['Accepted']
-      ]
-    end
-  end
-
-end
-end

data/lib/serf/middleware/kind_mapper.rb

@@ -1,48 +0,0 @@
-module Serf
-module Middleware
-
-  ##
-  # Our "router" app that will call the actual registered handler object
-  # with the received message based on the 'kind' of message received.
-  #
-  # This means we look into the 'env' of the call and match the
-  # env['kind'] value to see if we have it registered.
-  # If found, we pass to the proper handler, else we run a not_found
-  # handler. Sans a registered not_found handler, we just return a
-  # 404 message. Note that if we used any Async middleware (i.e.
-  # EmRunner or CelluloidRunner), the calling client (using Msgpack RPC)
-  # will not see the 404 or not found handler results. The Async middleware
-  # will have returned a 202 Accepted result.
-  #
-  # Developers SHOULD implement alternate mechanisms of error handling
-  # and logging. Even possibly implementing a 404 handler that
-  # broadcasts such a not found error event message.
-  #
-  class KindMapper
-
-    def initialize(options={})
-      @map = options.fetch(:map) { {} }
-      @not_found = options[:not_found]
-    end
-
-    def call(env)
-      kind = env['kind']
-      if kind && @map.has_key?(kind)
-        return @map[kind].call env
-      elsif @not_found
-        return @not_found.call env
-      end
-      return [
-        404,
-        {
-          'Content-Type' => 'text/plain',
-          'X-Cascade' => 'pass'
-        },
-        ['Not Found']
-      ]
-    end
-
-  end
-
-end
-end

data/lib/serf/receivers/msgpack_receiver.rb

@@ -1,55 +0,0 @@
-require 'active_support/core_ext/hash'
-require 'msgpack/rpc'
-
-module Serf
-
-  ##
-  # A MsgpackRpc handler that is just here to act as a protective
-  # facade to only expose the 'call' rpc method to MsgpackRpc clients.
-  #
-  class MsgpackHandler
-    def initialize(app, options={})
-      @app = app
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-    end
-
-    def call(env)
-      @app.call env.stringify_keys
-    rescue => e
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-      # We reraise this error so it's passed on through to the remote client.
-      raise e
-    end
-  end
-
-  ##
-  # Defines a Msgpack RPC Server to run to receive messages.
-  #
-  class MsgpackReceiver
-    DEFAULT_SERVER_TRANSPORT_CLASS = MessagePack::RPC::TCPServerTransport
-    DEFAULT_ADDRESS_CLASS = MessagePack::RPC::Address
-
-    def initialize(app, options={})
-      @handler = options.fetch(:handler) { MsgpackHandler.new(app) }
-
-      @listener = options.fetch(:listener) {
-        host = options.fetch(:host) { '0.0.0.0' }
-        port = options.fetch(:port) { 18800 }
-        address = DEFAULT_ADDRESS_CLASS.new host, port
-        DEFAULT_SERVER_TRANSPORT_CLASS.new address
-      }
-
-      @rpc_class = options.fetch(:rpc_class) { MessagePack::RPC::Server }
-    end
-
-    ##
-    # Runs, doesn't return.
-    def run
-      svr = @rpc_class.new
-      svr.listen @listener, @handler
-      svr.run
-    end
-
-  end
-
-end

data/lib/serf/receivers/redis_pubsub_receiver.rb

@@ -1,38 +0,0 @@
-require 'active_support/core_ext/hash'
-require 'multi_json'
-require "redis"
-
-module Serf
-
-  ##
-  # Defines a receiver that listens for messages from a subscribed
-  # Redis pubsub channel.
-  #
-  class RedisPubsubReceiver
-
-    def initialize(app, options={})
-      @app = app
-
-      @redis = options.fetch(:redis) { Redis.connect }
-      @channel = options.fetch(:channel) { 'serf_pubsub_channel' }
-      @logger = options.fetch(:logger) { ::Serf::NullObject.new }
-    end
-
-    ##
-    # Runs, doesn't return.
-    def run
-      @redis.subscribe(@channel) do |on|
-        on.message do |channel, message|
-          begin
-            decoded_message = MultiJson.decode message
-            raise 'Received non-hash JSON' unless decoded_message.kind_of? Hash
-            @app.call decoded_message.stringify_keys
-          rescue => e
-            @logger.error e
-          end
-        end
-      end
-    end
-
-  end
-end