background_bunnies 0.0.2 → 0.0.3

data/background_bunnies.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "bunny", ">= 0.9.0.pre7"
+  gem.add_dependency "amqp"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
 end

data/lib/background_bunnies/bunny.rb

@@ -1,11 +1,13 @@
 require 'thread'
+require 'bunny'
+require 'amqp'
 require_relative 'job'
 
 module BackgroundBunnies
   module Bunny
 
     module BunnyConfigurators
-
+      DEFAULT_CONNECTION_OPTIONS = {:threaded=>true}
       def group(group_name)
         @group_name = group_name
       end
@@ -22,6 +24,14 @@ module BackgroundBunnies
         @queue_name || demodulized_class_name
       end
 
+      def connection_options
+        @connection_options || DEFAULT_CONNECTION_OPTIONS.dup
+      end
+
+      def connection_options=(options)
+        @connection_options
+      end
+
       def demodulized_class_name
         path = name
         if i = path.rindex('::')
@@ -48,36 +58,41 @@ module BackgroundBunnies
       self.class.queue_name
     end
 
+    def connection_options
+      self.class.connection_options
+    end
+
     attr_reader :channel
     attr_reader :queue
     attr_reader :consumer
+    attr_reader :exchange
+    attr_reader :thread
 
     #
-    # Starts the Worker
+    # Starts the Worker with the given connection or group name
     #
-    def start(connection)
-      @channel = connection.create_channel
+    def start(connection_or_group)
+      @connection = connection_or_group
+      @channel = AMQP::Channel.new(@connection)
       @queue = @channel.queue(queue_name)
-      @consumer = @queue.subscribe(block: false, ack: true) do |info, properties, payload|
-        job = Job.new(JSON.parse!(payload), info, properties)
-        err = nil
+      @consumer = @queue.subscribe(:ack=>true) do |metadata, payload|
+        info = metadata
+        properties = nil
         begin 
+          job = Job.new(JSON.parse!(payload), info, properties)
+          err = nil
           self.process(job) 
-        rescue =>e
-          err = e
-        end
-        unless err
-          @channel.ack(info.delivery_tag, false)
-        else
+          metadata.ack
+        rescue =>err
           # processing went wrong, requeing message
-          @channel.reject(info.delivery_tag, true)
           on_error(job, err)
+          metadata.reject(:requeue=>true)
         end
       end
     end
 
     def on_error(job, err)
-        log_error "Error processing #{job.info.delivery_tag}: #{err.message}, #{err.backtrace.join('\n')}"
+      log_error "Error processing #{job.info.delivery_tag}: #{err.message}, #{err.backtrace.join('\n')}"
     end
 
     def log_error(a)

data/lib/background_bunnies/job.rb

@@ -3,6 +3,7 @@ module BackgroundBunnies
     attr_reader :info
     attr_reader :properties
     attr_reader :payload
+    alias :metadata :info
 
     def initialize(payload, info = nil, properties = nil)
       @info = info

data/lib/background_bunnies/producer.rb

@@ -7,12 +7,8 @@ module BackgroundBunnies
     attr_reader :queue_name
     attr_reader :connection
 
-    def initialize(connection, queue_name)
-      if connection.is_a? Symbol
-        @connection = BackgroundBunnies.connections[connection]
-      else
-        @connection = connection
-      end
+    def initialize(connection_or_group, queue_name)
+      @connection = BackgroundBunnies.connect connection_or_group
       @queue_name = queue_name.to_s
       @channel = @connection.create_channel
       @queue = @connection.queue(@queue_name)

data/lib/background_bunnies/version.rb

@@ -1,3 +1,3 @@
 module BackgroundBunnies
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/background_bunnies.rb

@@ -5,6 +5,8 @@ require "background_bunnies/producer"
 require "background_bunnies/job"
 require "background_bunnies/workers"
 require "thread"
+require "bunny"
+require "amqp"
 
 module BackgroundBunnies
 
@@ -17,30 +19,51 @@ module BackgroundBunnies
       @configs || @configs = {}
     end
 
-    alias connections configurations
+    DEFAULT_CONNECTION_OPTIONS={:threaded=>false}.freeze
 
     #
     # Configures the connection of a group
     #
-    def configure(group, connection)
-      info "Configuring #{group} connection"
-      configurations[group] = connection
-      if connection.status == :not_connected
-        connection.start
+    def configure(group, url, options = DEFAULT_CONNECTION_OPTIONS)
+      info "Configuring #{group} connection with #{url} and options #{options}"
+      configurations[group] = {
+        :url=>url,
+        :options=>options
+      }
+    end
+
+    #
+    # Creates a new connection based on a group configuration
+    #
+    def connect(connection_or_group, options=DEFAULT_CONNECTION_OPTIONS)
+      unless connection_or_group.is_a? Symbol
+        return connection_or_group
       end
+      configuration = self.configurations[connection_or_group] || DEFAULT_CONNECTION_OPTIONS
+      configuration = configuration.dup.merge!(options)
+      raise "Unable to connect. Missing configuration for group #{connection_or_group}" unless configuration
+      conn = ::Bunny.new(configuration[:url], configuration[:options])
+      conn.start
+      conn
     end
 
     #
     # Runs all the tasks in the given group and waits.
     #
     def run(group)
-      connection = configurations[group]
       klasses = describe_group(group)
-      info "Running #{group} workers: #{ klasses.join(',') }"
-      klasses.each do |klass|
-        instance = klass.new
-        instance.start connection
-        info "Started worker: #{klass.demodulized_class_name}"
+      instances = []
+      EventMachine.run do
+        url = configurations[group][:url]
+        puts "Group Connection: #{url}"
+        connection = AMQP.connect(url)
+        info "Running #{group} workers: #{ klasses.join(',') }"
+        klasses.each do |klass|
+          instance = klass.new
+          instance.start connection
+          info "Started worker: #{klass.demodulized_class_name}"
+          instances << instance
+        end
       end
       Thread.current.join
     end

data/test/background_bunnies_test.rb

@@ -130,6 +130,12 @@ describe BackgroundBunnies::Bunny do
               self.delivery_tag = delivery_tag
             end
 
+            attr_accessor :rejected
+
+            def reject(delivery_tag, multiple)
+              @rejected = true
+            end
+
           end
           channel_klass.new
         end
@@ -143,6 +149,7 @@ describe BackgroundBunnies::Bunny do
       worker = StartTest.new
       worker.start connection
       worker.channel.delivery_tag.must_be_nil
+      worker.channel.rejected.must_be :==, true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: background_bunnies
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0.pre7
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement