daemon_objects 0.1.5 → 0.1.6

data/daemon_objects.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "daemons", "~> 1.1"
   spec.add_dependency "activesupport", "~> 3.2"
-  spec.add_dependency "amqp", "~> 0.9"
+  spec.add_dependency "bunny", "~> 1.1.0"
   spec.add_dependency "rake"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry-nav"
 end

data/lib/daemon_objects.rb

@@ -1,8 +1,8 @@
 require "daemon_objects/version"
 require 'active_support/core_ext/string'
 require 'daemons'
-require 'amqp'
 require 'logger'
+require 'bunny'
 
 module DaemonObjects; end
 

data/lib/daemon_objects/amqp/runner.rb

@@ -8,29 +8,29 @@ module DaemonObjects::AmqpSupport
   def run
     logger.info "Preparing to start the AMQP watcher."
 
-    AMQP.start(endpoint) do |connection, open_ok|
-      logger.info "Starting up the AMQP watcher."
+    connection = Bunny.new("#{endpoint.gsub("/", "%2F")}") 
+    connection.start
 
-      channel  = AMQP::Channel.new(connection)
-      channel.prefetch(1) if prefetch
+    logger.info "Starting up the AMQP watcher."
 
-      worker   = worker_class.new(
-        channel, 
-        get_consumer, 
-        {
-          :queue_name => queue,
-          :logger     => logger,
-          :arguments  => arguments
-        })
+    channel  = connection.create_channel
+    channel.prefetch(1) if prefetch
 
-      worker.start
+    worker   = worker_class.new(
+      channel, 
+      get_consumer, 
+      {
+        :queue_name => queue,
+        :logger     => logger,
+        :arguments  => arguments
+      })
+    worker.start
 
-      logger.info "AMQP worker started"
+    logger.info "AMQP worker started"
 
-      Signal.trap("INT") do
-        logger.info "Received signal 'INT'.  Exiting process"
-        connection.close { EventMachine.stop } 
-      end
+    Signal.trap("INT") do
+      logger.info "Received signal 'INT'.  Exiting process"
+      connection.close { EventMachine.stop } 
     end
   end
 end

data/lib/daemon_objects/amqp/worker.rb

@@ -27,17 +27,17 @@ class DaemonObjects::Amqp::Worker
   end
 
   def start
-    queue = channel.queue(queue_name, :durable => true, :ack => true, :arguments => arguments)
+    queue = channel.queue(queue_name, :durable => true, :arguments => arguments)
     queue.bind(exchange, :routing_key => routing_key) if exchange
 
-    queue.subscribe(:ack => true) do |metadata, payload|
-      exception = handle_message(metadata, payload)
+    queue.subscribe(:block => true, :ack => true) do |delivery_info, properties, payload|
+      exception = handle_message(channel, delivery_info.delivery_tag, payload)
 
       response_payload = consumer.get_response(payload, exception) if consumer.respond_to?(:get_response)
       if response_payload
         channel.default_exchange.publish(response_payload.to_json, 
-                                         :routing_key    => metadata.reply_to, 
-                                         :correlation_id => metadata.message_id)
+                                         :routing_key    => delivery_info.routing_key, 
+                                         :correlation_id => properties.message_id)
       end
     end
   end
@@ -46,12 +46,12 @@ class DaemonObjects::Amqp::Worker
     raise StandardError, "ERROR channel-level exception: code = #{channel_close.reply_code}, message = #{channel_close.reply_text}"
   end
 
-  def handle_message(metadata, payload)
+  def handle_message(channel, delivery_tag, payload)
     response = consumer.handle_message (payload)
-    metadata.ack
+    channel.acknowledge(delivery_tag, false)
     response
   rescue Exception => e
-    metadata.reject
+    channel.reject(delivery_tag)
     logger.error "Error occurred handling message, the payload was: #{payload}, the error was: '#{e}'."
     e
   end

data/lib/daemon_objects/version.rb

@@ -1,3 +1,3 @@
 module DaemonObjects
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/lib/daemon_objects/base_spec.rb

@@ -72,9 +72,9 @@ describe DaemonObjects::Base do
     let(:endpoint){ }
 
     before :each do
-      MyWorker = Class.new do
+      MyWorker = Class.new(DaemonObjects::Amqp::Worker) do
         def initialize(*args); end
-        def run; end
+        def start; end
       end
     end
 
@@ -90,7 +90,8 @@ describe DaemonObjects::Base do
                       :worker_class => MyWorker
       end
 
-      AMQP.should_receive(:start).with('amqp://localhost:4567').and_return(true)
+      bunny = double(Bunny).as_null_object
+      Bunny.should_receive(:new).with('amqp:%2F%2Flocalhost:4567').and_return(bunny)
       MyDaemon.run
     end
 
@@ -98,7 +99,7 @@ describe DaemonObjects::Base do
       MyConsumer = Class.new(DaemonObjects::ConsumerBase)
       MyDaemon = Class.new(DaemonObjects::Base)
 
-      AMQP.should_not_receive(:start)
+      Bunny.should_not_receive(:new)
       MyDaemon.run
 
     end
@@ -111,12 +112,10 @@ describe DaemonObjects::Base do
                       :worker_class => MyWorker
       end
 
-      def AMQP.start(endpoint)
-        yield "connection", "open"
-      end
-
-      channel = double(AMQP::Channel)
-      AMQP::Channel.stub(:new).and_return(channel)
+      bunny = double(Bunny).as_null_object
+      Bunny.stub(:new).and_return(bunny)
+      channel = double(Bunny::Channel)
+      bunny.stub(:create_channel).and_return(channel)
       channel.should_not_receive(:prefetch)
 
       worker  = MyWorker.new
@@ -144,14 +143,12 @@ describe DaemonObjects::Base do
                       :worker_class => MyWorker
       end
 
-      def AMQP.start(endpoint)
-        yield "connection", "open"
-      end
-
-      channel = double(AMQP::Channel)
+      bunny = double(Bunny).as_null_object
+      Bunny.stub(:new).and_return(bunny)
+      channel = double(Bunny::Channel)
       channel.should_receive(:prefetch).with(1)
 
-      AMQP::Channel.stub(:new).and_return(channel)
+      bunny.stub(:create_channel).and_return(channel)
 
       worker  = MyWorker.new
       consumer = MyDaemon.get_consumer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemon_objects
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: amqp
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement