carnivore 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+# v0.1.1
+* Update block implementation within callback
+* Allow multiple queues on single SQS source
+* Custom logging to provide instance source information
+
 # v0.1.0
 * Initial release

data/README.md

@@ -54,6 +54,61 @@ Carnivore.configure do
 end.start!
 ```
 
+### Block execution
+
+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
+great.
+
+#### Example (bad):
+
+```ruby
+Carnivore.configure do
+  my_inst = AwesomeSauce.new
+  src = Source.build(:type => :test, :args => {})
+  src.add_callback(:print_message) do |msg|
+    my_inst.be_awesome!
+    puts "Received message: #{message}"
+  end
+end.start!
+```
+
+#### Example (good):
+
+```ruby
+Carnivore.configure do
+  src = Source.build(:type => :test, :args => {})
+  src.add_callback(:print_message) do |msg|
+    my_inst = AwesomeSauce.new
+    my_inst.be_awesome!
+    puts "Received message: #{message}"
+  end
+end.start!
+```
+
+So, does that mean a new `AwesomeSauce` instance will be
+created on every message processed? Yes, yes it does. However,
+the block at runtime is no longer really a block, so lets
+keep that instance around so it can be reused:
+
+#### Example (more gooder):
+
+```ruby
+Carnivore.configure do
+  src = Source.build(:type => :test, :args => {})
+  src.add_callback(:print_message) do |msg|
+    unless(@my_inst)
+      @my_inst = AwesomeSauce.new
+    end
+    @my_inst.be_awesome!
+    puts "Received message: #{message}"
+  end
+end.start!
+```
+
 ## Info
 
-* Repository: https://github.com/heavywater/carnivore
+* Repository: https://github.com/heavywater/carnivore
+* IRC: Freenode @ #heavywater

data/lib/carnivore/callback.rb

@@ -6,18 +6,15 @@ module Carnivore
     end
 
     include Celluloid
-    include Celluloid::Logger
-
-    execute_block_on_receiver :execute
 
     attr_reader :name
 
     def initialize(name, block=nil)
       @name = name
-      @block = block
-      if(@block.nil? && self.class == Callback)
+      if(block.nil? && self.class == Callback)
         raise ArgumentError.new 'Block is required for dynamic callbacks!'
       end
+      define_singleton_method(:execute, &block) if block
       setup
     end
 
@@ -25,7 +22,7 @@ module Carnivore
     end
 
     def inspect
-      "callback<#{self.object_id}>"
+      "callback<#{self.name}:#{self.object_id}>"
     end
 
     def valid?(message)
@@ -33,16 +30,31 @@ module Carnivore
     end
 
     def call(message)
-      raise TypeError.new('Invalid message for this callback!') unless valid?(message)
-      @block ? execute(message, &@block) : execute(message)
+      if(valid?(message))
+        @block ? execute(message, &@block) : execute(message)
+      else
+        debug 'Received message not valid for this callback'
+      end
     rescue => e
       error "[callback: #{self}, source: #{message[:source]}, message: #{message[:message].object_id}]: #{e.class} - #{e}"
       debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
     end
 
-    def execute(message)
-      yield message
+    # Custom logger helpers
+
+    %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
 end

data/lib/carnivore/source/sqs.rb

@@ -5,14 +5,14 @@ module Carnivore
   class Source
     class Sqs < Source
 
-      OUTPUT_REPEAT_EVERY=5
+      OUTPUT_REPEAT_EVERY=20
 
       attr_reader :pause_time
 
       def setup(args={})
         @fog = nil
         @connection_args = args[:fog]
-        @queue = args[:queue_url]
+        @queues = Array(args[:queues]).compact.flatten
         @pause_time = args[:pause] || 5
         @receive_timeout = after(args[:receive_timeout] || 30){ terminate }
         debug "Creating SQS source instance <#{name}>"
@@ -24,13 +24,15 @@ module Carnivore
 
       def receive(n=1)
         count = 0
-        m = nil
-        until(m)
-          m = nil
+        msgs = []
+        while(msgs.empty?)
+          msgs = []
           @receive_timeout.reset
-          m = @fog.receive_message(@queue, 'MaxNumberOfMessages' => n).body['Message'].first
+          msgs = @queues.map do |q|
+            @fog.receive_message(q, 'MaxNumberOfMessages' => n).body['Message']
+          end.flatten.compact
           @receive_timeout.reset
-          unless(m)
+          if(msgs.empty?)
             if(count == 0)
               debug "Source<#{name}> no message received. Sleeping for #{pause_time} seconds."
             elsif(count % OUTPUT_REPEAT_EVERY == 0)
@@ -40,7 +42,7 @@ module Carnivore
           end
           count += 1
         end
-        pre_process(m)
+        msgs.map{|m| pre_process(m) }
       end
 
       def send(message)

data/lib/carnivore/source.rb

@@ -139,10 +139,14 @@ module Carnivore
 
     def process
       loop do
-        msg = format(receive)
-        @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)
+        msgs = Array(receive).flatten.compact.map do |m|
+          format(m)
+        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)
+          end
         end
       end
     end

data/lib/carnivore/version.rb

@@ -1,5 +1,5 @@
 module Carnivore
   class Version < Gem::Version
   end
-  VERSION = Version.new('0.1.0')
+  VERSION = Version.new('0.1.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog