carnivore 0.2.2 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.4
+* Move receive starts out of processing loop
+* Extract source name from arguments on setup
+* Deep force smash type on conversion
+* Add optional disablement of multiple callback matches
+
 # v0.2.2
 * Local loopback is optional and disabled by default
 * Include Smash utility for Hash management

data/lib/carnivore/callback.rb

@@ -1,4 +1,5 @@
 require 'carnivore'
+require 'celluloid/autostart'
 
 module Carnivore
   # Payload modifier

data/lib/carnivore/source.rb

@@ -122,6 +122,10 @@ module Carnivore
     attr_reader :message_remote
     # @return [TrueClass, FalseClass] currently processing a message
     attr_reader :processing
+    # @return [TrueClass, FalseClass] allow multiple callback matches
+    attr_reader :allow_multiple_matches
+    # @return [Hash] original options hash
+    attr_reader :arguments
 
     # Create new Source
     #
@@ -130,9 +134,13 @@ module Carnivore
     # @option args [TrueClass, FalseClass] :auto_process start processing on initialization
     # @option args [TrueClass, FalseClass] :auto_confirm confirm messages automatically on receive
     # @option args [Proc] :orphan_callback execute block when no callbacks are valid for message
+    # @option args [Proc] :multiple_callback execute block when multiple callbacks are valid and multiple support is disabled
     # @option args [TrueClass, FalseClass] :prevent_duplicates setup and use message registry
+    # @option args [TrueClass, FalseClass] :allow_multiple_matches allow multiple callback matches (defaults true)
     # @option args [Array<Callback>] :callbacks callbacks to register on this source
     def initialize(args={})
+      @arguments = args.dup
+      @name = args[:name]
       @args = Smash.new(args)
       @callbacks = []
       @message_loop = Queue.new
@@ -142,11 +150,14 @@ module Carnivore
       @run_process = true
       @auto_confirm = !!args[:auto_confirm]
       @callback_supervisor = Carnivore::Supervisor.create!.last
-      if(args[:orphan_callback])
-        unless(args[:orphan_callback].is_a?(Proc))
-          raise TypeError.new("Expected `Proc` type for `orphan_callback` but received `#{args[:orphan_callback].class}`")
+      @allow_multiple_matches = !!args.fetch(:allow_multiple_matches, true)
+      [:orphan_callback, :multiple_callback].each do |key|
+        if(args[key])
+          unless(args[key].is_a?(Proc))
+            raise TypeError.new("Expected `Proc` type for `#{key}` but received `#{args[key].class}`")
+          end
+          define_singleton_method(key, &args[key])
         end
-        define_singleton_method(:orphan_callback, &args[:orphan_callback])
       end
       if(args[:prevent_duplicates])
         init_registry
@@ -162,7 +173,10 @@ module Carnivore
       connect
       if(auto_process && !callbacks.empty?)
         async.process
+      else
+        warn 'Processing is disabled'
       end
+      info 'Source initialization is complete'
     rescue => e
       debug "Failed to initialize: #{self} - #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
       raise
@@ -320,9 +334,9 @@ module Carnivore
     # @return [TrueClass]
     def process(*args)
       begin
+        async.receive_messages
+        @processing = true
         while(run_process && !callbacks.empty?)
-          @processing = true
-          async.receive_messages
           if(message_loop.empty? && message_remote.empty?)
             wait(:messages_available)
           end
@@ -335,20 +349,24 @@ module Carnivore
             end
           end.compact
           msgs.each do |msg|
-            if(respond_to?(:orphan_callback))
+            if(multiple_callbacks? || respond_to?(:orphan_callback))
               valid_callbacks = callbacks.find_all do |name|
                 callback_supervisor[callback_name(name)].valid?(msg)
               end
             else
               valid_callbacks = callbacks
             end
-            valid_callbacks.each do |name|
-              debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{callback_name(name)})>"
-              callback_supervisor[callback_name(name)].async.call(msg)
-            end
             if(valid_callbacks.empty?)
               warn "Received message was not processed through any callbacks on this source: #{msg}"
-              orphan_callback(current_actor, msg) if respond_to?(:orphan_callback)
+              orphan_callback(msg) if respond_to?(:orphan_callback)
+            elsif(valid_callbacks.size > 1 && !multiple_callbacks?)
+              error "Received message is valid for multiple callbacks but multiple callbacks are disabled: #{msg}"
+              multiple_callback(msg) if respond_to?(:multiple_callback)
+            else
+              valid_callbacks.each do |name|
+                debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{callback_name(name)})>"
+                callback_supervisor[callback_name(name)].async.call(msg)
+              end
             end
           end
         end
@@ -409,6 +427,15 @@ module Carnivore
       false
     end
 
+    # Allow sending payload to multiple matching callbacks. Custom
+    # sources should override this method to disable multiple
+    # callback matches if desired.
+    #
+    # @return [TrueClass, FalseClass]
+    def multiple_callbacks?
+      allow_multiple_matches
+    end
+
     # Load and initialize the message registry
     #
     # @return [MessageRegistry] new registry

data/lib/carnivore/supervisor.rb

@@ -58,6 +58,13 @@ module Carnivore
         true
       end
 
+      # Check if default supervisor is alive
+      #
+      # @return [TrueClass, FalseClass]
+      def alive?
+        supervisor && supervisor.alive?
+      end
+
     end
 
     # @return [Celluloid::Registry]

data/lib/carnivore/utils/logging.rb

@@ -26,6 +26,14 @@ module Carnivore
         end
       end
 
+      # Log exception
+      #
+      # @param e [Exception]
+      def exception_log(e)
+        error "#{e.class}: #{e}"
+        debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+      end
+
     end
 
   end

data/lib/carnivore/utils/smash.rb

@@ -6,6 +6,7 @@ module Carnivore
     # Customized Hash
     class Smash < Hash
       include Hashie::Extensions::IndifferentAccess
+      include Hashie::Extensions::MergeInitializer
       include Hashie::Extensions::DeepMerge
       include Hashie::Extensions::Coercion
 
@@ -21,10 +22,15 @@ module Carnivore
         end
         super *args
         if(base)
-          self.replace(base)
+          self.replace(base.to_smash)
         end
       end
 
+      def merge!(hash)
+        hash = hash.to_smash unless hash.is_a?(::Smash)
+        super(hash)
+      end
+
       # Get value at given path
       #
       # @param args [String, Symbol] key path to walk
@@ -81,7 +87,11 @@ class Hash
   #
   # @return [Smash]
   def to_smash
-    ::Smash.new.replace(self)
+    ::Smash.new.tap do |smash|
+      self.each do |k,v|
+        smash[k.is_a?(Symbol) ? k.to_s : k] = v.is_a?(::Hash) && !v.is_a?(::Smash) ? v.to_smash : v
+      end
+    end
   end
   alias_method :hulk_smash, :to_smash
 

data/lib/carnivore/version.rb

@@ -3,5 +3,5 @@ module Carnivore
   class Version < Gem::Version
   end
   # Current version of library
-  VERSION = Version.new('0.2.2')
+  VERSION = Version.new('0.2.4')
 end

data/lib/carnivore.rb

@@ -1,7 +1,5 @@
 require 'carnivore/runner'
 require 'carnivore/version'
-# Load in celluloid as required
-require 'celluloid/autostart'
 
 # Message consumer and processor
 module Carnivore

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid