serf 0.8.0 → 0.9.0

data/Gemfile

@@ -6,6 +6,7 @@ source 'http://rubygems.org'
 # Requirements for both clients and servers.
 gem 'activesupport', '>= 3.2.0'
 gem 'i18n', '>= 0.6.0' # For ActiveSupport
+gem 'hashie', ">= 1.2.0"
 # Used by Serf::Messages::*
 gem 'uuidtools', '>= 2.1.2'
 
@@ -14,12 +15,12 @@ gem 'uuidtools', '>= 2.1.2'
 group :development, :test do
   gem "rspec", "~> 2.8.0"
   gem "yard", "~> 0.7.5"
-  gem "bundler", "~> 1.0.22"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.8.3"
   gem 'simplecov', '>= 0'
 
   # For our testing
-  gem 'log4r', '~> 1.1.10'
+  gem 'log4r', '>= 1.1.10'
 
   # Soft Dependencies
   #gem 'log4r', '~> 1.1.9'
@@ -30,5 +31,5 @@ group :development, :test do
 
   # EventMachine is now optional runner
   gem 'eventmachine', '>= 0.12.10'
-  gem 'girl_friday', '~> 0.9.7'
+  gem 'girl_friday', '>= 0.9.7'
 end

data/Gemfile.lock

@@ -10,6 +10,7 @@ GEM
     girl_friday (0.9.7)
       connection_pool (~> 0.1.0)
     git (1.2.5)
+    hashie (1.2.0)
     i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -43,12 +44,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 3.2.0)
-  bundler (~> 1.0.22)
+  bundler (~> 1.1.3)
   eventmachine (>= 0.12.10)
-  girl_friday (~> 0.9.7)
+  girl_friday (>= 0.9.7)
+  hashie (>= 1.2.0)
   i18n (>= 0.6.0)
   jeweler (~> 1.8.3)
-  log4r (~> 1.1.10)
+  log4r (>= 1.1.10)
   msgpack (>= 0.4.6)
   rspec (~> 2.8.0)
   simplecov

data/README.md

@@ -21,7 +21,7 @@ Messages are the representation of data, documents, etc that are
 marshalled from client to service, which represents the business
 level interaction of the service.
 
-Messages may be commands that a service must handle.
+Messages may be command requests that a service must handle.
 Messages may be events that a service emits.
 Messages may be documents that represent state or business data.
 
@@ -59,54 +59,23 @@ Not implemented as yet:
 Service Libraries
 =================
 
-1. Service Libraries SHOULD implement message classes that include the
-  ::Serf::Message helper module.
-  a. Barring that, they should conform to the idea that messages may be
-    hashes that define at least one attribute: 'kind'.
+1. Service Libraries SHOULD implement messages as just hashes with
+  defined schemas (JSON Schema).
+  a. Required by all messages is the 'kind' field.
+  b. By default, Serf Commands will read in hashes and turn them into
+    more convenient Hashie::Mash objects.
 2. Serialization of the messages SHOULD BE Json or MessagePack (I hate XML).
-  a. `to_hash` is also included.
+  a. Serf Builder will create Serf Apps that expect a HASH ENV as input
 3. Handlers MUST implement the 'build' class method, which
   MUST receive the ENV Hash as the first parameter, followed by supplemental
   arguments as declared in the DSL.
 4. Handler methods SHOULD return zero or more messages.
   a. Raised errors are caught and pushed to error channels.
+  b. Returned messages MUST be Hash based objects for Serialization.
 5. Handler methods SHOULD handle catch their business logic exceptions and
   return them as specialized messages that can be forwarded down error channels.
   Uncaught exceptions that are then caught by Serf are pushed as
-  generic Serf::CaughtExceptionEvents, and are harder to deal with.
-
-
-Serf::Message
--------------
-
-Users of the Serf::Message module need to be aware of that:
-
-1. Messages MUST implement the `#attributes` method to use the
-  default implementations of `to_msgpack`, `to_json`, and `to_hash`.
-2. Messages MAY implement validation helpers (e.g. ActiveModel or
-  Virtus + Aequitas (DataMapper)). This is purely to be helpful for
-  receivers (Serf::Handlers) to validate the Messages before running
-  code against its data. The Serf infrastructure code does not
-  validate the Messages; it is the job of the handler code.
-3. Messages MAY override `Message.parse` class method if they want
-  different parsing (Message object instantiation) than
-  `message_class.new *args`. This parse method is called in
-  Serf::Handler when the handler class has defined a Message class
-  to be used to deserialize the ENV for a handler action method.
-3. Messages MAY override `Message#kind` instance method or `Message.kind`
-  class method to specify a message `kind` that is different than
-  the tableized name of the implementing ruby class.
-4. Messages MAY override `Message#to_msgpack`, `Message#to_json`, or
-  `Message#to_hash` to get alternate serialization.
-
-User that opt to roll their own Message class only need to be
-aware that:
-
-1. Message classes MUST implement `Message.parse(env={})` class method
-  if said message class is to be used as the target object representation
-  of a received message (from ENV hash).
-    a. Serf code makes this assumption when it finds an ENV
-    hash that is to be parsed into a message object.
+  generic CaughtExceptionEvents, and are harder to deal with.
 
 
 Example With GirlFriday
@@ -118,7 +87,6 @@ Example With GirlFriday
 
     require 'serf/builder'
     require 'serf/command'
-    require 'serf/message'
     require 'serf/middleware/uuid_tagger'
     require 'serf/util/options_extraction'
 
@@ -151,38 +119,20 @@ Example With GirlFriday
       end
     end
 
-    # my_lib/my_message.rb
-    # This class is stripped down minimal functionality that
-    # ActiveModel or Aequitas/Virtus implements.
-    class MyMessage
-      include Serf::Util::OptionsExtraction
-      include Serf::Message
-
-      attr_accessor :data
-
-      def initialize(*args)
-        extract_options! args
-        self.data = opts :data
-      end
+    # my_lib/my_validator.rb
+    class MyValidator
 
-      def attributes
-        { 'data' => data }
+      def self.validate!(data)
+        raise 'Data is nil' if data[:data].nil?
       end
 
-      def valid?
-        !data.nil?
-      end
-
-      def full_error_messages
-        'Data is blank' if data.nil?
-      end
     end
 
     # my_lib/my_overloaded_command.rb
     class MyOverloadedCommand
       include Serf::Command
 
-      self.request_factory = MyMessage
+      self.request_validator = MyValidator
 
       def initialize(*args)
         super
@@ -304,6 +254,7 @@ Example With GirlFriday
     end
     logger.info "End Tick #{Thread.current.object_id}"
 
+
 Example With EventMachine
 =========================
 
@@ -313,7 +264,6 @@ Example With EventMachine
 
     require 'serf/builder'
     require 'serf/command'
-    require 'serf/message'
     require 'serf/middleware/uuid_tagger'
     require 'serf/util/options_extraction'
 
@@ -347,37 +297,19 @@ Example With EventMachine
     end
 
     # my_lib/my_message.rb
-    # This class is stripped down minimal functionality that
-    # ActiveModel or Aequitas/Virtus implements.
-    class MyMessage
-      include Serf::Util::OptionsExtraction
-      include Serf::Message
+    class MyValidator
 
-      attr_accessor :data
-
-      def initialize(*args)
-        extract_options! args
-        self.data = opts :data
-      end
-
-      def attributes
-        { 'data' => data }
+      def self.validate!(data)
+        raise 'Data Missing Error' if data[:data].nil?
       end
 
-      def valid?
-        !data.nil?
-      end
-
-      def full_error_messages
-        'Data is blank' if data.nil?
-      end
     end
 
     # my_lib/my_overloaded_command.rb
     class MyOverloadedCommand
       include Serf::Command
 
-      self.request_factory = MyMessage
+      self.request_validator = MyValidator
 
       def initialize(*args)
         super
@@ -506,6 +438,7 @@ Example With EventMachine
       end
     end
 
+
 Contributing to serf
 ====================
 

data/lib/serf/command.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
 
+require 'serf/util/mash_factory'
 require 'serf/util/options_extraction'
 
 module Serf
@@ -14,6 +15,10 @@ module Serf
   #     # Set a default Message Parser for the class.
   #     self.request_factory = MySerfRequestMessage
   #
+  #     # Validate the request, like using JSON-Schema for hash
+  #     # (or Hashie's Mash) requests.
+  #     self.request_validator = MySerfRequestValidator
+  #
   #     def initialize(*args, &block)
   #       # Do some validation here, or extra parameter setting with the args
   #     end
@@ -37,6 +42,8 @@ module Serf
 
     included do
       class_attribute :request_factory
+      __send__ 'request_factory=', Serf::Util::MashFactory
+      class_attribute :request_validator
       attr_reader :request
     end
 
@@ -45,11 +52,7 @@ module Serf
     end
 
     def validate_request!
-      # We must verify that the request is valid, but only if the
-      # request object isn't a hash.
-      unless request.is_a?(Hash) || request.valid?
-        raise ArgumentError, request.full_error_messages
-      end
+      request_validator.validate! request if request_validator
     end
 
     module ClassMethods
@@ -86,14 +89,14 @@ module Serf
         # Set the request instance variable to whatever type of request we got.
         obj.instance_variable_set :@request, request
 
+        # Finalize the object's construction with the rest of the args & block.
+        obj.__send__ :initialize, *args, &block
+
         # Now validate that the request is ok.
         # Implementing classes MAY override this method to do different
         # kind of request validation.
         obj.validate_request!
 
-        # Finalize the object's construction with the rest of the args & block.
-        obj.__send__ :initialize, *args, &block
-
         return obj
       end
 

data/lib/serf/middleware/uuid_tagger.rb

@@ -9,7 +9,6 @@ module Middleware
   # if the incoming request already has it.
   #
   class UuidTagger
-    include Serf::Util::Uuidable
 
     ##
     # @param app the app
@@ -23,7 +22,7 @@ module Middleware
     def call(env)
       env = env.dup
       unless env[@field.to_sym] || env[@field.to_s]
-        env[@field] = create_coded_uuid
+        env[@field] = Serf::Util::Uuidable.create_coded_uuid
       end
       @app.call env
     end

data/lib/serf/more/command_worker.rb

@@ -39,12 +39,6 @@ module More
       return results
     end
 
-    # Overriding the Serf::Command validate_request! so it doesn't
-    # call #valid? on the request object. This is because the incoming
-    # request is another Command object itself.
-    def validate_request!
-    end
-
   end
 
 end

data/lib/serf/runners/event_machine.rb

@@ -1,6 +1,5 @@
 require 'eventmachine'
 
-require 'serf/messages/message_accepted_event'
 require 'serf/runners/direct'
 require 'serf/util/error_handling'
 
@@ -32,10 +31,6 @@ module Runners
       # Manditory: Need a runner because this class is just a wrapper.
       @runner = opts! :runner
 
-      @mae_class = opts(
-        :message_accepted_event_class,
-        ::Serf::Messages::MessageAcceptedEvent)
-
       @evm = opts :event_machine, ::EventMachine
       @logger = opts :logger, ::Serf::Util::NullObject.new
     end
@@ -54,7 +49,10 @@ module Runners
           end
         end)
       end
-      return @mae_class.new(message: context)
+      return {
+        kind: 'serf/messages/message_accepted_event',
+        message: context
+      }
     end
 
     def self.build(options={})

data/lib/serf/runners/girl_friday.rb

@@ -1,6 +1,5 @@
 require 'girl_friday'
 
-require 'serf/messages/message_accepted_event'
 require 'serf/runners/helper'
 require 'serf/util/error_handling'
 
@@ -30,12 +29,6 @@ module Runners
     end
 
     def call(handlers, context)
-      # Create our accepted event before we enqueue the handlers.
-      mae_class = opts(
-        :message_accepted_event_class,
-        ::Serf::Messages::MessageAcceptedEvent)
-      event = mae_class.new message: context
-
       # Push each handler into the queue along with a copy of the context.
       handlers.each do |handler|
         @queue.push(
@@ -45,7 +38,10 @@ module Runners
 
       # We got here, we succeeded pushing all the works.
       # Now we return our accepted event.
-      return event
+      return {
+        kind: 'serf/messages/message_accepted_event',
+        message: context
+      }
     end
 
     ##

data/lib/serf/util/error_handling.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/string/inflections'
 
-require 'serf/messages/caught_exception_event'
 require 'serf/util/null_object'
 require 'serf/util/options_extraction'
 require 'serf/util/protected_call'
@@ -14,7 +13,6 @@ module Util
   #
   # Including classes may have the following instance variables
   # to override the default values:
-  # * @error_event_class - ::Serf::Messages::CaughtExceptionEvent
   # * @logger - ::Serf::Util::NullObject.new
   # * @error_channel - ::Serf::Util::NullObject.new
   module ErrorHandling
@@ -40,14 +38,15 @@ module Util
     # log the exception itself to the logger.
     #
     def handle_error(e, context=nil)
-      eec = opts :error_event_class, ::Serf::Messages::CaughtExceptionEvent
       logger = opts :logger, ::Serf::Util::NullObject.new
       error_channel = opts :error_channel, ::Serf::Util::NullObject.new
-      error_event = eec.new(
+      error_event = {
+        kind: 'serf/messages/caught_exception_event',
         context: context,
-        error: e.class.to_s.tableize,
+        error: e.class.to_s.underscore,
         message: e.message,
-        backtrace: e.backtrace.join("\n"))
+        backtrace: e.backtrace.join("\n")
+      }
 
       # log the error to our logger
       logger.error e

data/lib/serf/util/mash_factory.rb

@@ -0,0 +1,18 @@
+require 'hashie'
+
+module Serf
+module Util
+
+  ##
+  # A Request Factory that just coerces a REQUEST ENV hash message
+  # into a Hashie::Mash object for convenience key/value access.
+  #
+  module MashFactory
+
+    def self.build(message)
+      Hashie::Mash.new message
+    end
+  end
+
+end
+end

data/lib/serf/util/uuidable.rb

@@ -17,7 +17,7 @@ module Util
     #
     # NOTE: UUIDTools TimeStamp code creates a UTC based timestamp UUID.
     #
-    def create_coded_uuid
+    def self.create_coded_uuid
       # All raw UUIDs are 16 bytes long. Base64 lengthens the string to
       # 24 bytes long. We chomp off the last two equal signs '==' to
       # trim the string length to 22 bytes. This gives us an overhead
@@ -30,10 +30,35 @@ module Util
     ##
     # @param coded_uuid a coded uuid to parse.
     #
-    def parse_coded_uuid(coded_uuid)
+    def self.parse_coded_uuid(coded_uuid)
       UUIDTools::UUID.parse_raw Base64.urlsafe_decode64("#{coded_uuid}==")
     end
 
+    ##
+    # Create a new set of uuids.
+    #
+    def self.create_uuids(parent={})
+      {
+        uuid: create_coded_uuid,
+        parent_uuid: parent['uuid'],
+        origin_uuid: (
+          parent[:origin_uuid] ||
+          parent[:parent_uuid] ||
+          parent[:uuid])
+      }
+    end
+
+    ##
+    # Set a message's UUIDs with new UUIDs based on the parent's UUIDs.
+    #
+    def self.annotate_with_uuids!(message, parent={})
+      uuids = self.create_uuids parent
+      message[:uuid] ||= uuids[:uuid]
+      message[:parent_uuid] ||= uuids[:parent_uuid]
+      message[:origin_uuid] ||= uuids[:origin_uuid]
+      return nil
+    end
+
   end
 
 end

data/lib/serf/version.rb

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

data/schemas/caught_exception_event.json

@@ -0,0 +1,21 @@
+{
+  "description": "Message Kind: serf/messages/caught_exception_event",
+  "type": "object",
+  "properties": {
+    "context": {
+      "type": "object"
+    },
+    "error": {
+      "type": "string"
+    },
+    "message": {
+      "type": "string"
+    },
+    "backtrace": {
+      "type": "string"
+    },
+    "uuid": {
+      "type": "string"
+    }
+  }
+}

data/schemas/message_accepted_event.json

@@ -0,0 +1,14 @@
+{
+  "description": "Message Kind: serf/messages/message_accepted_event",
+  "type": "object",
+  "properties": {
+    "message": {
+      "type": "object",
+      "required": true
+    },
+    "uuid": {
+      "type": "string",
+      "required": true
+    }
+  }
+}

data/serf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "serf"
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin Yu"]
-  s.date = "2012-04-19"
+  s.date = "2012-05-06"
   s.description = "Event-Driven SOA with CQRS"
   s.email = "benjaminlyu@gmail.com"
   s.extra_rdoc_files = [
@@ -30,12 +30,8 @@ Gem::Specification.new do |s|
     "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/more/command_worker.rb",
-    "lib/serf/more/uuid_fields.rb",
     "lib/serf/routing/endpoint.rb",
     "lib/serf/routing/registry.rb",
     "lib/serf/runners/direct.rb",
@@ -44,12 +40,15 @@ Gem::Specification.new do |s|
     "lib/serf/runners/helper.rb",
     "lib/serf/serfer.rb",
     "lib/serf/util/error_handling.rb",
+    "lib/serf/util/mash_factory.rb",
     "lib/serf/util/null_object.rb",
     "lib/serf/util/options_extraction.rb",
     "lib/serf/util/protected_call.rb",
     "lib/serf/util/regexp_matcher.rb",
     "lib/serf/util/uuidable.rb",
     "lib/serf/version.rb",
+    "schemas/caught_exception_event.json",
+    "schemas/message_accepted_event.json",
     "serf.gemspec",
     "spec/serf_spec.rb",
     "spec/spec_helper.rb"
@@ -66,43 +65,46 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.2.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.22"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<log4r>, ["~> 1.1.10"])
+      s.add_development_dependency(%q<log4r>, [">= 1.1.10"])
       s.add_development_dependency(%q<msgpack>, [">= 0.4.6"])
       s.add_development_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_development_dependency(%q<girl_friday>, ["~> 0.9.7"])
+      s.add_development_dependency(%q<girl_friday>, [">= 0.9.7"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.2.0"])
       s.add_dependency(%q<i18n>, [">= 0.6.0"])
+      s.add_dependency(%q<hashie>, [">= 1.2.0"])
       s.add_dependency(%q<uuidtools>, [">= 2.1.2"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<yard>, ["~> 0.7.5"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.22"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<log4r>, ["~> 1.1.10"])
+      s.add_dependency(%q<log4r>, [">= 1.1.10"])
       s.add_dependency(%q<msgpack>, [">= 0.4.6"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_dependency(%q<girl_friday>, ["~> 0.9.7"])
+      s.add_dependency(%q<girl_friday>, [">= 0.9.7"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.2.0"])
     s.add_dependency(%q<i18n>, [">= 0.6.0"])
+    s.add_dependency(%q<hashie>, [">= 1.2.0"])
     s.add_dependency(%q<uuidtools>, [">= 2.1.2"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<yard>, ["~> 0.7.5"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.22"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<log4r>, ["~> 1.1.10"])
+    s.add_dependency(%q<log4r>, [">= 1.1.10"])
     s.add_dependency(%q<msgpack>, [">= 0.4.6"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    s.add_dependency(%q<girl_friday>, ["~> 0.9.7"])
+    s.add_dependency(%q<girl_friday>, [">= 0.9.7"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serf
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70198112141080 !ruby/object:Gem::Requirement
+  requirement: &70100670653360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198112141080
+  version_requirements: *70100670653360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70198112140280 !ruby/object:Gem::Requirement
+  requirement: &70100670652560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198112140280
+  version_requirements: *70100670652560
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70100670651180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70100670651180
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70198112138420 !ruby/object:Gem::Requirement
+  requirement: &70100670649260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70198112138420
+  version_requirements: *70100670649260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70198112136940 !ruby/object:Gem::Requirement
+  requirement: &70100670647520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70198112136940
+  version_requirements: *70100670647520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70198112135260 !ruby/object:Gem::Requirement
+  requirement: &70100670646500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +76,21 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70198112135260
+  version_requirements: *70100670646500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70198112134580 !ruby/object:Gem::Requirement
+  requirement: &70100670814180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.22
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70198112134580
+  version_requirements: *70100670814180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70198112148060 !ruby/object:Gem::Requirement
+  requirement: &70100670813540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70198112148060
+  version_requirements: *70100670813540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70198112146140 !ruby/object:Gem::Requirement
+  requirement: &70100670812840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198112146140
+  version_requirements: *70100670812840
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &70198112145040 !ruby/object:Gem::Requirement
+  requirement: &70100670812100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :development
   prerelease: false
-  version_requirements: *70198112145040
+  version_requirements: *70100670812100
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70198112144400 !ruby/object:Gem::Requirement
+  requirement: &70100670811380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *70198112144400
+  version_requirements: *70100670811380
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70198112143700 !ruby/object:Gem::Requirement
+  requirement: &70100670810700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,18 +142,18 @@ dependencies:
         version: 0.12.10
   type: :development
   prerelease: false
-  version_requirements: *70198112143700
+  version_requirements: *70100670810700
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &70198112142640 !ruby/object:Gem::Requirement
+  requirement: &70100670809960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.7
   type: :development
   prerelease: false
-  version_requirements: *70198112142640
+  version_requirements: *70100670809960
 description: Event-Driven SOA with CQRS
 email: benjaminlyu@gmail.com
 executables: []
@@ -164,12 +175,8 @@ files:
 - 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/more/command_worker.rb
-- lib/serf/more/uuid_fields.rb
 - lib/serf/routing/endpoint.rb
 - lib/serf/routing/registry.rb
 - lib/serf/runners/direct.rb
@@ -178,12 +185,15 @@ files:
 - lib/serf/runners/helper.rb
 - lib/serf/serfer.rb
 - lib/serf/util/error_handling.rb
+- lib/serf/util/mash_factory.rb
 - lib/serf/util/null_object.rb
 - lib/serf/util/options_extraction.rb
 - lib/serf/util/protected_call.rb
 - lib/serf/util/regexp_matcher.rb
 - lib/serf/util/uuidable.rb
 - lib/serf/version.rb
+- schemas/caught_exception_event.json
+- schemas/message_accepted_event.json
 - serf.gemspec
 - spec/serf_spec.rb
 - spec/spec_helper.rb
@@ -202,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3739935025256924512
+      hash: 2754574147578555547
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/serf/message.rb

@@ -1,56 +0,0 @@
-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
-
-    included do
-      class_attribute :kind
-      send 'kind=', self.to_s.tableize.singularize
-      class_attribute :model_name
-      send 'model_name=', self.to_s
-    end
-
-    def to_hash
-      attributes.merge kind: kind
-    end
-
-    def to_msgpack
-      to_hash.to_msgpack
-    end
-
-    def to_json(*args)
-      to_hash.to_json *args
-    end
-
-    def model
-      self.class
-    end
-
-    def full_error_messages
-      errors.full_messages.join '. '
-    end
-
-    module ClassMethods
-
-      def parse(*args, &block)
-        self.new *args, &block
-      end
-
-      def build(*args, &block)
-        self.new *args, &block
-      end
-
-    end
-
-  end
-
-end

data/lib/serf/messages/caught_exception_event.rb

@@ -1,49 +0,0 @@
-require 'serf/message'
-require 'serf/util/uuidable'
-
-module Serf
-module Messages
-
-  ##
-  # An event message to signal that the serf code caught an
-  # exception during the processing of some message, which is
-  # represented by the context field.
-  #
-  # Instances of this class are norminally pushed to an
-  # error channel for out of band processing/notification.
-  #
-  class CaughtExceptionEvent
-    include Serf::Message
-    include Serf::Util::Uuidable
-
-    attr_accessor :context
-    attr_accessor :error
-    attr_accessor :message
-    attr_accessor :backtrace
-
-    def initialize(options={})
-      @context = options[:context]
-      @error = options[:error]
-      @message = options[:message]
-      @backtrace = options[:backtrace]
-      @uuid = options[:uuid]
-    end
-
-    def attributes
-      {
-        'context' => @context,
-        'error' => @error,
-        'message' => @message,
-        'backtrace' => @backtrace,
-        'uuid' => (@uuid || create_coded_uuid)
-      }
-    end
-
-    def to_s
-      to_hash.to_s
-    end
-
-  end
-
-end
-end

data/lib/serf/messages/message_accepted_event.rb

@@ -1,38 +0,0 @@
-require 'serf/message'
-require 'serf/util/uuidable'
-
-module Serf
-module Messages
-
-  ##
-  # This event signals that the serf process has accepted a message
-  # for processing at a later time. These events are normally sent
-  # in response to calling clients, which is a separate signal
-  # than any errors given.
-  #
-  class MessageAcceptedEvent
-    include Serf::Message
-    include Serf::Util::Uuidable
-
-    attr_accessor :message
-
-    def initialize(options={})
-      @message = options[:message]
-      @uuid = options[:uuid]
-    end
-
-    def attributes
-      {
-        'message' => @message,
-        'uuid' => (@uuid || create_coded_uuid)
-      }
-    end
-
-    def to_s
-      to_hash.to_s
-    end
-
-  end
-
-end
-end

data/lib/serf/more/uuid_fields.rb

@@ -1,29 +0,0 @@
-require 'serf/util/uuidable'
-
-module Serf
-module More
-
-  ##
-  # Assumes that Virtus has already been included in the class that
-  # also includes UuidFields.
-  #
-  module UuidFields
-    extend Serf::Util::Uuidable
-
-    def self.included(base)
-      base.attribute :uuid, String, default: lambda { |o,a| create_coded_uuid }
-      base.attribute :parent_uuid, String
-      base.attribute :origin_uuid, String
-    end
-
-    def create_child_uuids
-      {
-        uuid: UuidFields.create_coded_uuid,
-        parent_uuid: uuid,
-        origin_uuid: (origin_uuid || parent_uuid || uuid)
-      }
-    end
-  end
-
-end
-end