carnivore 0.1.10 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.2.0
+* Remove `fog` from dependency list
+* Add common spec helper for testing
+* Only start sources if callbacks are defined
+* Add custom supervisor with isolated registry
+* Include auto-restart support
+* Loop local messages internally instead of transmit/retrieve loop
+* Use auto loading to clean things up
+
 # v0.1.10
 * Remove builtin sources
 * Allow optional auto-symbolize

data/README.md

@@ -30,7 +30,7 @@ Under the hood, callbacks are built into `Carnivore::Callback`
 instances. This class can be subclassed and provided directly
 instead of a simple block. This has the added bonus of being
 able to define the number of worker instances to be created
-for the callback (blocks default to 1):
+for the callback (blocks only get 1):
 
 ```ruby
 require 'carnivore'
@@ -56,7 +56,7 @@ end.start!
 
 ### Block execution
 
-It is important to note that when providing blocks, they will
+It is important to note that when providing blocks they will
 lose all reference to the scope in which they are defined. This
 is due to how `Callback` is implemented and is by design. Simply
 ensure that blocks are fully autonomous and everything will be

data/carnivore.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/carnivore-rb/carnivore'
   s.description = 'Message processing helper'
   s.require_path = 'lib'
-  s.add_dependency 'fog'
   s.add_dependency 'celluloid'
   s.add_dependency 'mixlib-config'
-  s.files = Dir['**/*']
+  s.add_dependency 'multi_json'
+  s.files = Dir['lib/**/*'] + %w(carnivore.gemspec README.md CHANGELOG.md)
 end

data/lib/carnivore/autoloader.rb

@@ -0,0 +1,13 @@
+# Register all base autoloading requirements
+
+module Carnivore
+  autoload :Config, 'carnivore/config'
+  autoload :Callback, 'carnivore/callback'
+  autoload :Container, 'carnivore/container'
+  autoload :Error, 'carnivore/errors'
+  autoload :Message, 'carnivore/message'
+  autoload :Source, 'carnivore/source'
+  autoload :Supervisor, 'carnivore/supervisor'
+  autoload :Utils, 'carnivore/utils'
+  autoload :Version, 'carnivore/version'
+end

data/lib/carnivore/callback.rb

@@ -1,4 +1,4 @@
-require 'carnivore/utils'
+require 'carnivore'
 
 module Carnivore
   class Callback
@@ -9,10 +9,14 @@ module Carnivore
     end
 
     include Celluloid
-    include Utils::Logging
+    include Carnivore::Utils::Logging
 
     attr_reader :name
 
+    # name:: Name of the callback
+    # block:: Optional `Proc` to define the callback behavior
+    # Creates a new callback. Optional block to define callback
+    # behavior must be passed as a `Proc` instance, not a block.
     def initialize(name, block=nil)
       @name = name
       if(block.nil? && self.class == Callback)
@@ -42,9 +46,10 @@ module Carnivore
     # Pass message to registered callbacks
     def call(message)
       if(valid?(message))
+        debug ">> Received message is valid for this callback (#{message})"
         execute(message)
       else
-        debug 'Received message not valid for this callback'
+        debug "Invalid message for this callback #{message})"
       end
     rescue => e
       error "[callback: #{self}, source: #{message[:source]}, message: #{message[:message].object_id}]: #{e.class} - #{e}"

data/lib/carnivore/config.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'mixlib/config'
+require 'carnivore'
 
 module Carnivore
   class Config
@@ -8,6 +9,8 @@ module Carnivore
 
     class << self
 
+      # v:: Boolean value
+      # Set/get automatic symbolization of hash keys
       def auto_symbolize(v=nil)
         unless(v.nil?)
           @hash_symbolizer = !!v
@@ -51,9 +54,7 @@ module Carnivore
       #    Config.get(:other_app, :port) => nil
       #    Config.get(:my_app, :mail, :server) => nil
       def get(*ary)
-        value = ary.flatten.inject(self) do |memo, key|
-          memo[key.to_s] || memo[key.to_sym] || break
-        end
+        value = Carnivore::Utils.retrieve(self, *ary)
         if(value.is_a?(Hash) && auto_symbolize)
           Carnivore::Utils.symbolize_hash(value)
         else

data/lib/carnivore/container.rb

@@ -1,4 +1,4 @@
-require 'carnivore/utils'
+require 'carnivore'
 require 'celluloid/logger'
 
 module Carnivore

data/lib/carnivore/errors.rb

@@ -0,0 +1,7 @@
+require 'carnivore'
+
+module Carnivore
+  class Error < StandardError
+    class DeadSupervisor < Error; end
+  end
+end

data/lib/carnivore/message.rb

@@ -1,4 +1,4 @@
-require 'carnivore/source'
+require 'carnivore'
 
 module Carnivore
   class Message
@@ -12,22 +12,29 @@ module Carnivore
       @args = args.dup
     end
 
+    # Helper method to return keys available from `args`
+    def keys
+      args.keys
+    end
+
+    # k:: key
+    # Accessor into message
     def [](k)
-      if(k.to_sym == :source)
-        Celluloid::Actor[@args[:source]]
-      else
-        @args[k.to_sym] || @args[k.to_s]
-      end
+      args[k.to_sym] || args[k.to_s]
     end
 
+    # args:: Arguments
+    # Confirm message was received on source
     def confirm!(*args)
-      self[:source].confirm(*([self] + args))
+      self[:source].confirm(*([self] + args).flatten(1).compact)
     end
 
+    # Formatted inspection string
     def inspect
-      "<Carnivore::Message[#{self.object_id}] @args=#{args}>"
+      "<Carnivore::Message[#{self.object_id}] @args=#{args.inspect}>"
     end
 
+    # String representation
     def to_s
       "<Carnivore::Message:#{self.object_id}>"
     end

data/lib/carnivore/runner.rb

@@ -1,29 +1,48 @@
-require 'celluloid'
-require 'carnivore/config'
-require 'carnivore/source'
-require 'carnivore/container'
+require 'carnivore/autoloader'
 
 module Carnivore
   class << self
+
+    # block:: Block of configuration
+    # Add configuration to Carnivore
     def configure(&block)
       mod = Container.new
       mod.instance_exec(mod, &block)
       self
     end
 
+    # Start carnivore
     def start!
       supervisor = nil
       begin
         require 'carnivore/supervisor'
-        supervisor = Carnivore::Supervisor.run!
+        supervisor = Carnivore::Supervisor.build!
         Source.sources.each do |source|
+          source.klass.reset_comms!
           supervisor.supervise_as(
             source.source_hash[:name],
             source.klass,
-            source.source_hash
+            source.source_hash.dup
           )
         end
-        supervisor.wait(:kill_all_humans)
+        loop do
+          # We do a sleep loop so we can periodically check on the
+          # supervisor and ensure it is still alive. If it has died,
+          # raise exception to allow cleanup and restart attempt
+          sleep Carnivore::Config.get(:carnivore, :supervisor, :poll) || 5 while supervisor.alive?
+          Celluloid::Logger.error 'Carnivore supervisor has died!'
+          raise Carnivore::Error::DeadSupervisor.new
+        end
+      rescue Carnivore::Error::DeadSupervisor
+        Celluloid::Logger.warn "Received dead supervisor exception. Attempting to restart."
+        begin
+          supervisor.terminate
+        rescue => e
+          Celluloid::Logger.debug "Exception raised during supervisor termination (restart cleanup): #{e}"
+        end
+        Celluloid::Logger.debug "Pausing restart for 10 seconds to prevent restart thrashing cycles"
+        sleep 10
+        retry
       rescue Exception => e
         supervisor.terminate
         # Gracefully shut down

data/lib/carnivore/source.rb

@@ -1,31 +1,11 @@
+require 'digest/sha2'
 require 'celluloid'
-require 'carnivore/utils'
-require 'carnivore/callback'
-require 'carnivore/message'
+require 'carnivore'
 
 module Carnivore
   class Source
 
-    class SourceContainer
-
-      attr_reader :klass
-      attr_reader :source_hash
-
-      # class_name:: Name of source class
-      # args:: argument hash to pass to source instance
-      def initialize(class_name, args={})
-        @klass = class_name
-        @source_hash = args || {}
-        @source_hash[:callbacks] = {}
-      end
-
-      # name:: Name of callback
-      # klass:: Class of callback (optional)
-      # Add a callback to a source via Class or block
-      def add_callback(name, klass=nil, &block)
-        @source_hash[:callbacks][name] = klass || block
-      end
-    end
+    autoload :SourceContainer, 'carnivore/source_container'
 
     class << self
 
@@ -48,12 +28,17 @@ module Carnivore
         inst
       end
 
+      # type:: Symbol of type of source
+      # require_path:: Path to feed to `require`
+      # Registers a source
       def provide(type, require_path)
         @source_klass ||= {}
         @source_klass[type.to_sym] = require_path
         true
       end
 
+      # type: Symbol of source type
+      # Returns register path for given type of source
       def require_path(type)
         @source_klass ||= {}
         @source_klass[type.to_sym]
@@ -82,6 +67,19 @@ module Carnivore
       def sources
         @sources ? @sources.values : []
       end
+
+      def reset_comms!
+        self.class_eval do
+          unless(method_defined?(:reset_communications?))
+            alias_method :custom_transmit, :transmit
+            alias_method :transmit, :_transmit
+            def reset_communications?
+              true
+            end
+          end
+        end
+      end
+
     end
 
     include Celluloid
@@ -93,14 +91,22 @@ module Carnivore
     attr_reader :auto_process
     attr_reader :run_process
     attr_reader :callback_supervisor
+    attr_reader :message_registry
+    attr_reader :message_loop
+    attr_reader :processing
 
     def initialize(args={})
       @callbacks = []
+      @message_loop = []
       @callback_names = {}
       @auto_process = args.fetch(:auto_process, true)
-      @run_process = @auto_process
+      @run_process = true
       @auto_confirm = !!args[:auto_confirm]
-      @callback_supervisor = Celluloid::SupervisionGroup.run!
+      @callback_supervisor = Carnivore::Supervisor.create!.last
+      if(args[:prevent_duplicates])
+        init_registry
+      end
+      @processing = false
       @name = args[:name] || Celluloid.uuid
       if(args[:callbacks])
         args[:callbacks].each do |name, block|
@@ -109,45 +115,72 @@ module Carnivore
       end
       setup(args)
       connect
-      async.process if @auto_process
+      if(auto_process && !callbacks.empty?)
+        async.process
+      end
     rescue => e
       debug "Failed to initialize: #{self} - #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
       raise
     end
 
+    # Ensure we cleanup our internal supervisor before bailing out
+    def terminate
+      callback_supervisor.terminate
+      super
+    end
+
+    # Automatically confirm messages after dispatch
     def auto_confirm?
       @auto_confirm
     end
 
+    # Return string for inspection
     def inspect
       "<#{self.class.name}:#{object_id} @name=#{name} @callbacks=#{Hash[*callbacks.map{|k,v| [k,v.object_id]}.flatten]}>"
     end
 
+    # Return string of instance
     def to_s
       "<#{self.class.name}:#{object_id} @name=#{name}>"
     end
 
+    # args:: Argument hash used to initialize instance
+    # Setup called during initialization for child sources to override
     def setup(args={})
       debug 'No custom setup declared'
     end
 
+    # args:: Argument hash
+    # Connection method to be overridden in child sources
     def connect(args={})
       debug 'No custom connect declared'
     end
 
+    # args:: number of messages to read
+    # Returns messages from source
     def receive(n=1)
       raise NoMethodError.new('Abstract method not valid for runtime')
     end
 
-    def transmit(message, original_message, args={})
+    # message:: Payload to transmit
+    # original_message:: Original `Carnivore::Message`
+    # args:: Custom arguments
+    # Transmit message on source
+    def transmit(message, original_message=nil, args={})
       raise NoMethodError.new('Abstract method not valid for runtime')
     end
 
+    # message:: Carnivore::Message
+    # Confirm receipt of the message on source
     def confirm(message)
       debug 'No custom confirm declared'
     end
 
-    def add_callback(name, block_or_class)
+    # callback_name:: Name of callback
+    # block_or_class:: Carnivore::Callback class or a block
+    # Adds the given callback to the source for message processing
+    def add_callback(callback_name, block_or_class)
+      name = "#{self.name}:#{callback_name}"
       if(block_or_class.is_a?(Class))
         size = block_or_class.workers || 1
         if(size < 1)
@@ -155,19 +188,21 @@ module Carnivore
           return self
         elsif(size == 1)
           debug "Adding callback class (#{block_or_class}) under supervision. Name: #{callback_name(name)}"
-          @callback_supervisor.supervise_as callback_name(name), block_or_class, name
+          callback_supervisor.supervise_as callback_name(name), block_or_class, name
         else
           debug "Adding callback class (#{block_or_class}) under supervision pool (#{size} workers). Name: #{callback_name(name)}"
-          @callback_supervisor.pool block_or_class, as: callback_name(name), size: size, args: [name]
+          callback_supervisor.pool block_or_class, as: callback_name(name), size: size, args: [name]
         end
       else
         debug "Adding custom callback class  from block (#{block_or_class}) under supervision. Name: #{callback_name(name)}"
-        @callback_supervisor.supervise_as callback_name(name), Callback, name, block_or_class
+        callback_supervisor.supervise_as callback_name(name), Callback, name, block_or_class
       end
-      @callbacks.push(name).uniq!
+      callbacks.push(name).uniq!
       self
     end
 
+    # name:: Name of callback
+    # Remove the named callback from the source
     def remove_callback(name)
       unless(@callbacks.include?(callback_name(name)))
         raise NameError.new("Failed to locate callback named: #{name}")
@@ -177,6 +212,8 @@ module Carnivore
       self
     end
 
+    # name:: Name of callback
+    # Returns namespaced name (prefixed with source name and instance id)
     def callback_name(name)
       unless(@callback_names[name])
         @callback_names[name] = [@name, self.object_id, name].join(':').to_sym
@@ -184,26 +221,99 @@ module Carnivore
       @callback_names[name]
     end
 
+    # msg:: New message received from source
+    # Returns formatted Carnivore::Message
     def format(msg)
-      Message.new(
-        :message => msg,
-        :source => self.name
-      )
+      actor = Carnivore::Supervisor.supervisor[name]
+      if(actor)
+        Message.new(
+          :message => msg,
+          :source => actor
+        )
+      else
+        abort "Failed to locate self in registry (#{name})"
+      end
     end
 
-    def process
-      while(run_process)
-        msgs = Array(receive).flatten.compact.map do |m|
-          format(m)
+    # m:: Carnivore::Message
+    # Returns true if message is valid to be processed
+    def valid_message?(m)
+      if(message_registry)
+        if(message_registry.valid?(m))
+          true
+        else
+          warn "Message was already received. Discarding: #{m.inspect}"
+          false
         end
-        msgs.each do |msg|
-          @callbacks.each do |name|
-            debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{callback_name(name)})>"
-            Celluloid::Actor[callback_name(name)].async.call(msg)
+      else
+        true
+      end
+    end
+
+    # args:: Arguments
+    # Start processing messages from source
+    def process(*args)
+      begin
+        while(run_process && !callbacks.empty?)
+          @processing = true
+          loop_msgs = future.loop_receive unless loop_msgs
+          remote_msgs = future.receive unless remote_msgs
+          if(loop_msgs.ready?)
+            msgs = loop_msgs.value
+            loop_msgs = nil
+          elsif(remote_msgs.ready?)
+            msgs = remote_msgs.value
+            remote_msgs = nil
+          else
+            msgs = []
+          end
+          msgs = [msgs].flatten.compact.map do |m|
+            if(valid_message?(m))
+              format(m)
+            end
+          end.compact
+          msgs.each do |msg|
+            @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
+          sleep(1) if msgs.empty?
         end
+      ensure
+        @processing = false
       end
     end
 
+    # args:: unused
+    # Return queued message from internal loop
+    def loop_receive(*args)
+      @message_loop.shift
+    end
+
+    # message:: Message for delivery
+    # original_message:: unused
+    # args:: unused
+    # Push message onto internal loop queue
+    def loop_transmit(message, original_message=nil, args={})
+      @message_loop.push message
+    end
+
+    # args:: transmit args
+    # Send to local loop if processing otherwise use regular transmit
+    def _transmit(*args)
+      if(processing)
+        loop_transmit(*args)
+      else
+        custom_transmit(*args)
+      end
+    end
+
+    # Load and initialize the message registry
+    def init_registry
+      require 'carnivore/message_registry'
+      @message_registry = MessageRegistry.new
+    end
+
   end
 end

data/lib/carnivore/source_container.rb

@@ -0,0 +1,30 @@
+require 'carnivore'
+
+module Carnivore
+  class Source
+
+    # Container for holding source configuration. This allows setup to
+    # occur prior to the supervisor actually starting the sources
+    class SourceContainer
+
+      attr_reader :klass
+      attr_reader :source_hash
+
+      # class_name:: Name of source class
+      # args:: argument hash to pass to source instance
+      def initialize(class_name, args={})
+        @klass = class_name
+        @source_hash = args || {}
+        @source_hash[:callbacks] = {}
+      end
+
+      # name:: Name of callback
+      # klass:: Class of callback (optional)
+      # Add a callback to a source via Class or block
+      def add_callback(name, klass=nil, &block)
+        @source_hash[:callbacks][name] = klass || block
+      end
+    end
+
+  end
+end

data/lib/carnivore/spec_helper.rb

@@ -0,0 +1,60 @@
+require 'carnivore'
+require 'celluloid'
+require 'minitest/autorun'
+
+Celluloid.logger.level = 4
+
+if(File.directory?(dir = File.join(Dir.pwd, 'test', 'specs')))
+  Dir.glob(File.join(dir, '*.rb')).each do |path|
+    require path
+  end
+else
+  puts 'Failed to locate `test/specs` directory. Are you in project root directory?'
+  exit -1
+end
+
+MiniTest::Spec.before do
+  Celluloid.shutdown
+  Celluloid.boot
+end
+
+# Simple waiter method to stall testing
+def source_wait(name='wait')
+  sleep(ENV.fetch("CARNIVORE_SOURCE_#{name.to_s.upcase}", 0.2).to_f)
+end
+
+# dummy store that should never be used for anything real
+class MessageStore
+  class << self
+
+    def init
+      @messages = []
+    end
+
+    def messages
+      @messages
+    end
+
+  end
+end
+
+# dummy source to hold final tranmission and stuff payload in store
+module Carnivore
+  class Source
+    class Spec < Source
+      def setup(*args)
+        MessageStore.init
+      end
+
+      def receive(*args)
+        wait(:forever)
+      end
+
+      def transmit(*args)
+        MessageStore.messages << args.first
+      end
+    end
+  end
+end
+
+Carnivore::Source.provide(:spec, 'carnivore/spec_helper')

data/lib/carnivore/supervisor.rb

@@ -1,4 +1,57 @@
+require 'carnivore'
+require 'celluloid/supervision_group'
+
 module Carnivore
   class Supervisor < Celluloid::SupervisionGroup
+
+    class << self
+
+      attr_reader :registry, :supervisor
+
+      # Build a new supervisor
+      def build!
+        @registry, @supervisor = create!
+        @supervisor
+      end
+
+      # Create a new supervisor
+      # Returns [registry,supervisor]
+      def create!
+        registry = Celluloid::Registry.new
+        [registry, run!(registry)]
+      end
+
+      # Destroy the registered supervisor
+      def terminate!
+        if(supervisor)
+          begin
+            supervisor.terminate
+          rescue Celluloid::DeadActorError
+          end
+          @supervisor = nil
+          @registry = nil
+        end
+        true
+      end
+
+    end
+
+    # name:: Name of source
+    # Return source
+    def [](name)
+      instance = @registry[name]
+      unless(instance)
+        if(member = @members.detect{|m| m && m.name.to_s == name.to_s})
+          Celluloid::Logger.warn "Found missing actor in member list. Attempting to restart manually."
+          restart_actor(member.actor, true)
+          instance = @registry[name]
+          unless(instance)
+            Celluloid::Logger.error "Actor restart failed to make it available in the registry! (#{name})"
+          end
+        end
+      end
+      instance
+    end
+
   end
 end

data/lib/carnivore/utils/logging.rb

@@ -0,0 +1,28 @@
+require 'celluloid'
+
+module Carnivore
+  module Utils
+
+    module Logging
+
+      # Define base logging types
+      %w(debug info warn error).each do |key|
+        define_method(key) do |string|
+          log(key, string)
+        end
+      end
+
+      # Log message
+      def log(*args)
+        if(args.empty?)
+          Celluloid::Logger
+        else
+          severity, string = args
+          Celluloid::Logger.send(severity.to_sym, "#{self}: #{string}")
+        end
+      end
+
+    end
+
+  end
+end

data/lib/carnivore/utils/message_registry.rb

@@ -0,0 +1,41 @@
+module Carnivore
+  module Utils
+      # Registry used for preventing duplicate message processing
+    class MessageRegistry
+      def initialize
+        @store = []
+        @size = 100
+      end
+
+      # message:: Carnivore::Message
+      # Returns true if message has not been processed
+      def valid?(message)
+        checksum = sha(message)
+        found = @store.include?(checksum)
+        unless(found)
+          push(checksum)
+        end
+        !found
+      end
+
+      # item:: checksum
+      # Pushes checksum into store
+      def push(item)
+        @store.push(item)
+        if(@store.size > @size)
+          @store.shift
+        end
+        self
+      end
+
+      # thing:: Instance
+      # Return checksum for give instance
+      def sha(thing)
+        unless(thing.is_a?(String))
+          thing = MultiJson.dump(thing)
+        end
+        (Digest::SHA512.new << thing).hexdigest
+      end
+    end
+  end
+end

data/lib/carnivore/utils/params.rb

@@ -0,0 +1,40 @@
+module Carnivore
+  module Utils
+
+    module Params
+
+      # hash:: Hash
+      # Symbolize keys in hash
+      def symbolize_hash(hash)
+        Hash[*(
+            hash.map do |k,v|
+              if(k.is_a?(String))
+                key = k.gsub(/(?<![A-Z])([A-Z])/, '_\1').sub(/^_/, '').downcase.to_sym
+              else
+                key = k
+              end
+              [
+                key,
+                v.is_a?(Hash) ? symbolize_hash(v) : v
+              ]
+            end.flatten(1)
+        )]
+      end
+
+      # hash:: Hash
+      # args:: Symbols or strings
+      # Follow path in hash provided by args and return value or nil
+      # if path is not valid
+      def retrieve(hash, *args)
+        valids = [::Hash, hash.is_a?(Class) ? hash : hash.class]
+        args.flatten.inject(hash) do |memo, key|
+          break unless valids.detect{ |valid_type|
+            memo.is_a?(valid_type) || memo == valid_type
+          }
+          memo[key.to_s] || memo[key.to_sym] || break
+        end
+      end
+    end
+
+  end
+end

data/lib/carnivore/utils.rb

@@ -1,47 +1,13 @@
-require 'celluloid'
+require 'carnivore'
 
 module Carnivore
-  module Utils
 
-    module Params
-      def symbolize_hash(hash)
-        Hash[*(
-            hash.map do |k,v|
-              if(k.is_a?(String))
-                key = k.gsub(/(?<![A-Z])([A-Z])/, '_\1').sub(/^_/, '').downcase.to_sym
-              else
-                key = k
-              end
-              [
-                key,
-                v.is_a?(Hash) ? symbolize_hash(v) : v
-              ]
-            end.flatten(1)
-        )]
-      end
-    end
+  module Utils
+    autoload :Params, 'carnivore/utils/params'
+    autoload :Logging, 'carnivore/utils/logging'
+    autoload :MessageRegistry, 'carnivore/utils/message_registry'
 
     extend Params
-
-    module Logging
-
-      %w(debug info warn error).each do |key|
-        define_method(key) do |string|
-          log(key, string)
-        end
-      end
-
-      def log(*args)
-        if(args.empty?)
-          Celluloid::Logger
-        else
-          severity, string = args
-          Celluloid::Logger.send(severity.to_sym, "#{self}: #{string}")
-        end
-      end
-
-    end
-
     extend Logging
 
   end

data/lib/carnivore/version.rb

@@ -1,5 +1,7 @@
 module Carnivore
   class Version < Gem::Version
   end
-  VERSION = Version.new('0.1.10')
+  VERSION = Version.new('0.2.0')
 end
+
+require 'carnivore'

data/lib/carnivore.rb

@@ -1,2 +1,5 @@
-require 'carnivore/version'
 require 'carnivore/runner'
+require 'carnivore/version'
+
+# Load in celluloid as required
+autoload :Celluloid, 'celluloid'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -66,29 +66,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/carnivore/callback.rb
+- lib/carnivore/errors.rb
 - lib/carnivore/supervisor.rb
 - lib/carnivore/source/test.rb
 - lib/carnivore/source.rb
 - lib/carnivore/version.rb
 - lib/carnivore/runner.rb
+- lib/carnivore/spec_helper.rb
+- lib/carnivore/utils/message_registry.rb
+- lib/carnivore/utils/logging.rb
+- lib/carnivore/utils/params.rb
+- lib/carnivore/autoloader.rb
 - lib/carnivore/config.rb
 - lib/carnivore/message.rb
+- lib/carnivore/source_container.rb
 - lib/carnivore/utils.rb
 - lib/carnivore/container.rb
 - lib/carnivore.rb
-- test/spec.rb
-- test/specs/source.rb
-- test/specs/config.rb
-- test/specs/message.rb
-- test/specs/utils.rb
-- test/specs/container.rb
-- examples/test_http.rb
-- examples/test_class.rb
-- examples/test_block.rb
-- Gemfile
+- carnivore.gemspec
 - README.md
 - CHANGELOG.md
-- carnivore.gemspec
 homepage: https://github.com/carnivore-rb/carnivore
 licenses: []
 post_install_message: 

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'minitest'
-
-gemspec

data/examples/test_block.rb

@@ -1,10 +0,0 @@
-require 'carnivore'
-
-Carnivore.configure do
-  s = Carnivore::Source.build(:type => :test, :args => {})
-
-  s.add_callback(:printer) do |message|
-    info "GOT MESSAGE: #{message[:message]} - source: #{message[:source]} - instance: #{self}"
-  end
-
-end.start!

data/examples/test_class.rb

@@ -1,20 +0,0 @@
-require 'carnivore'
-
-class CustomCallback < Carnivore::Callback
-
-  self.workers = 5
-
-  def setup
-    info "Custom callback setup called!"
-  end
-
-  def execute(message)
-    info "GOT MESSAGE: #{message[:message]} - source: #{message[:source]} - instance: #{self}"
-  end
-end
-
-Carnivore.configure do
-  s = Carnivore::Source.build(:type => :test, :args => {})
-  s.add_callback(:printer, CustomCallback)
-
-end.start!

data/examples/test_http.rb

@@ -1,10 +0,0 @@
-require 'carnivore'
-
-Carnivore.configure do
-  s = Carnivore::Source.build(:type => :http, :args => {:bind => '0.0.0.0', :port => 3000})
-
-  s.add_callback(:printer) do |message|
-    info "GOT MESSAGE: #{message[:message][:body]} - path: #{message[:message][:request].url} - method: #{message[:message][:request].method} - source: #{message[:source]} - instance: #{self}"
-  end
-
-end.start!

data/test/spec.rb

@@ -1,11 +0,0 @@
-require 'celluloid'
-Celluloid.logger.level = 4
-
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'specs/*.rb')).each do |path|
-  require path
-end
-
-MiniTest::Spec.before do
-  Celluloid.shutdown
-  Celluloid.boot
-end

data/test/specs/config.rb

@@ -1,31 +0,0 @@
-require 'minitest/autorun'
-require 'carnivore/config'
-
-describe 'Carnivore::Config' do
-  describe 'Direct Configuration' do
-    it 'allows direct configuration set' do
-      Carnivore::Config[:direct] = true
-      Carnivore::Config[:direct].must_equal true
-    end
-
-    it 'returns nil when configuration is undefined' do
-      Carnivore::Config[:missing].must_be_nil
-    end
-
-    it 'raises exception when accessing nested keys that do not exist' do
-      -> { Carnivore::Config[:missing][:key] }.must_raise NoMethodError
-    end
-
-  end
-
-  describe '#get helper' do
-    it 'returns the nested configuration value' do
-      Carnivore::Config[:nested] = {:value => 'hello world'}
-      Carnivore::Config.get(:nested, :value).must_equal 'hello world'
-    end
-
-    it 'returns `nil` when nested configuration does not exist' do
-      Carnivore::Config.get(:value, :does, :not, :exist).must_be_nil
-    end
-  end
-end

data/test/specs/container.rb

@@ -1,13 +0,0 @@
-require 'minitest/autorun'
-require 'carnivore/container'
-
-describe 'Carnivore::Container' do
-  it 'provides logging helpers' do
-    c = Carnivore::Container.new
-    Carnivore::Container.must_respond_to :log
-    c.must_respond_to :log
-    %w(debug info warn error).each do |key|
-      c.must_respond_to key
-    end
-  end
-end

data/test/specs/message.rb

@@ -1,29 +0,0 @@
-require 'minitest/autorun'
-require 'carnivore/message'
-
-describe 'Carnivore::Message' do
-
-  it 'requires a Source to be provided' do
-    -> { Carnivore::Message.new(:message => 'hi') }.must_raise ArgumentError
-  end
-
-  it 'provides argument access via `[]`' do
-    message = Carnivore::Message.new(:source => true, :message => 'hi')
-    message[:source].must_equal true
-    message[:message].must_equal 'hi'
-  end
-
-  it 'provides direct argument hash access via `args`' do
-    message = Carnivore::Message.new(:source => true, :message => 'hi')
-    message.args.must_be_kind_of Hash
-  end
-
-  it 'provides `confirm!` confirmation helper to Source' do
-    source = MiniTest::Mock.new
-    message = Carnivore::Message.new(:source => source, :message => 'hi')
-    source.expect(:confirm, true, [message])
-    message.confirm!
-    source.verify
-  end
-
-end

data/test/specs/source.rb

@@ -1,82 +0,0 @@
-require 'minitest/autorun'
-require 'carnivore/source'
-
-describe 'Carnivore::Source' do
-  describe 'Carnivore::Source::SourceContainer' do
-    before do
-      @src_ctn = Carnivore::Source::SourceContainer.new(:my_name, {:arg1 => true})
-    end
-
-    it 'should store name in `klass` attribute' do
-      @src_ctn.klass.must_equal :my_name
-    end
-
-    it 'should store argument hash in `source_hash` attribute' do
-      @src_ctn.source_hash.must_equal :arg1 => true, :callbacks => {}
-    end
-
-    describe 'callback additions' do
-      before do
-        @block = lambda{ 'hi' }
-        @src_ctn.add_callback(:hi, &@block)
-      end
-
-      it 'should store callback by name in `source_hash` under `:callbacks`' do
-        @src_ctn.source_hash.keys.must_include :callbacks
-        @src_ctn.source_hash[:callbacks].keys.must_include :hi
-        @src_ctn.source_hash[:callbacks].values.must_include @block
-      end
-    end
-  end
-
-  describe 'Custom source providers' do
-
-    before do
-      Carnivore::Source.provide(:meat_bag, 'carnivore-meat-bag/meat_bag')
-    end
-
-    it 'gives expected require path if registered' do
-      Carnivore::Source.require_path(:meat_bag).must_equal 'carnivore-meat-bag/meat_bag'
-    end
-
-    it 'gives `nil` require path if not registered' do
-      Carnivore::Source.require_path(:test).must_be_nil
-    end
-  end
-
-  describe 'Source registration' do
-    before do
-      @inst = Object.new
-      Carnivore::Source.register(:my_source, @inst)
-    end
-
-    it 'provides list of registered sources' do
-      Carnivore::Source.sources.must_include @inst
-    end
-
-    it 'allows accessing registered source by name' do
-      Carnivore::Source.source(:my_source).must_equal @inst
-    end
-  end
-
-  describe 'Processing with base Source instance' do
-    it 'should raise an exception' do
-      -> {
-        Carnivore::Source.new(:auto_process => false).process
-      }.must_raise NoMethodError
-    end
-  end
-
-  describe 'Source test instance' do
-    describe 'with no name argument' do
-      before do
-        require 'carnivore/source/test'
-        @source = Carnivore::Source::Test.new
-      end
-
-      it 'should generate name if none provided' do
-        @source.name.wont_be :empty?
-      end
-    end
-  end
-end

data/test/specs/utils.rb

@@ -1,47 +0,0 @@
-require 'minitest/autorun'
-require 'carnivore/utils'
-
-describe 'Carnivore::Utils' do
-  describe 'Carnivore::Utils::Logging' do
-    before do
-      @obj = Object.new
-      @obj.extend(Carnivore::Utils::Logging)
-      Celluloid.logger.level = 0
-    end
-
-    after do
-      Celluloid.logger.level = 4
-    end
-
-    it 'adds logging methods' do
-      %w(debug info warn error).each do |key|
-        @obj.must_respond_to(key)
-      end
-    end
-
-    it 'includes object information in logging output' do
-      out, err = capture_subprocess_io do
-        @obj.info 'hello world'
-      end
-      err.must_match %r{I,\s*\[.*?\]\s*INFO\s*--\s*:\s*#{Regexp.escape(@obj.inspect)}:\s*hello world\n}
-    end
-  end
-
-  describe 'Carnivore::Utils::Params' do
-    before do
-      @obj = Object.new
-      @obj.extend(Carnivore::Utils::Params)
-    end
-
-    it 'adds `symbolize_hash` method' do
-      @obj.must_respond_to :symbolize_hash
-    end
-
-    it 'converts hash keys to symbols' do
-      h = {'string' => {'another' => {'OneHere' => 'more'}}}
-      converted = @obj.symbolize_hash(h)
-      converted.keys.first.must_equal :string
-      converted[:string][:another].keys.first.must_equal :one_here
-    end
-  end
-end