untied-consumer 0.0.3 → 0.0.4

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 *.swp
 *.swo
 .rspec
+pkg

data/CHANGELOG.mkd

@@ -1,3 +1,6 @@
+- Fixes #1
+
 # 0.0.3
 
 - ``abort_on_exception`` configuration
+

data/lib/untied-consumer/observer.rb

@@ -70,6 +70,7 @@ module Untied
         return nil unless CALLBACKS.include? event_name
         return nil unless service == observed_service
         return nil unless observed_classes.include? klass
+        return nil unless respond_to?(event_name)
 
         self.send(event_name, entity)
       end

data/lib/untied-consumer/processor.rb

@@ -11,17 +11,17 @@ module Untied
 
       def process(headers, message)
         begin
-          message = JSON.parse(message, :symbolize_names => true)
+          message = JSON.parse(message)
         rescue JSON::ParserError => e
           Consumer.config.logger "Untied::Processor: Parsing error #{e}"
           return
         end
 
-        message = message.fetch(:event, {})
-        payload = message.fetch(:payload, {})
-        service = message[:origin].try(:to_sym)
-        event_name = message[:name].try(:to_sym)
-        klass = payload.keys.first
+        message = message.fetch("event", {})
+        payload = message.fetch("payload", {})
+        service = message["origin"].try(:to_sym)
+        event_name = message["name"].try(:to_sym)
+        klass = payload.keys.first.try(:to_sym)
 
         Consumer.config.logger.info \
           "Untied::Processor: processing event #{event_name} from #{service} with " + \

data/lib/untied-consumer/tasks/untied.tasks

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'untied-consumer/worker'
 require 'amqp'
 
@@ -5,12 +7,7 @@ namespace :untied do
   namespace :consumer do
     desc "Starts untied's worker"
     task :work do
-      AMQP.start do |connection|
-        channel  = AMQP::Channel.new(connection)
-        exchange = channel.topic("untied", :auto_delete => true)
-        worker = Untied::Consumer::Worker.new(:channel => channel, :exchange => exchange)
-        worker.start
-      end
+      worker = Untied::Consumer::Worker.start
     end
   end
 end

data/lib/untied-consumer/tasks/untied_rails.tasks

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'untied-consumer/worker'
 require 'amqp'
 
@@ -5,12 +7,7 @@ namespace :untied do
   namespace :consumer do
     desc "Starts untied's worker"
     task :work => :environment do
-      AMQP.start do |connection|
-        channel  = AMQP::Channel.new(connection)
-        exchange = channel.topic("untied", :auto_delete => true)
-        worker = Untied::Consumer::Worker.new(:channel => channel, :exchange => exchange)
-        worker.start
-      end
+      Untied::Consumer::Worker.start
     end
   end
 end

data/lib/untied-consumer/version.rb

@@ -1,5 +1,5 @@
 module Untied
   module Consumer
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/untied-consumer/worker.rb

@@ -2,19 +2,58 @@
 module Untied
   module Consumer
     class Worker
-      def initialize(opts)
-        @channel = opts[:channel]
+      def initialize(opts={})
         @queue_name = opts[:queue_name] || ""
-        @consumer = opts[:consumer] || Processor.new
-        @exchange = opts[:exchange]
+        @consumer = opts[:processor] || Processor.new
+      end
 
-        Consumer.config.logger.info "Worker initialized and listening"
+      # Initializes the worker and calls the start method
+      def self.start(opts={})
+        worker = new(opts)
+        worker.start
+        worker
       end
 
+      # Daemonizes the current worker. Remember you'll need the daemons Gem
+      # in order to this method work correctly.
+      #
+      # Options:
+      #   :pids_dir => '/some/dir' Absolute path to the dir where pid files will live
+      #   :log_dir => '/some/dir' Absolute path to the dir where log files will live
+      def daemonize(opts={})
+        require 'daemons' # just in case
+
+        config = {
+          :backtrace  => true,
+          :log_output => true,
+          :dir_mode   => :normal,
+          :dir        => opts[:pids_dir],
+          :log_dir    => nil,
+        }.merge(opts)
+
+        if !(config[:dir] && config[:log_dir])
+          raise ArgumentError "You need to provide pids_dir and log_dir"
+        end
+
+        FileUtils.mkdir_p(config[:dir])
+        FileUtils.mkdir_p(config[:log_dir])
+
+        @worker = self
+        Daemons.run_proc('untiedc', config) { @worker.start }
+      end
+
+      # Listens to the mssage bus for relevant events. This method blocks the
+      # current thread.
       def start
-        @channel.queue(@queue_name, :exclusive => true) do |queue|
-          queue.bind(@exchange, :routing_key => "untied.#").subscribe do |h,p|
-            safe_process { @consumer.process(h,p) }
+        AMQP.start do |connection|
+          channel  = AMQP::Channel.new(connection)
+          exchange = channel.topic("untied", :auto_delete => true)
+
+          channel.queue(@queue_name, :exclusive => true) do |queue|
+            queue.bind(exchange, :routing_key => "untied.#").subscribe do |h,p|
+              Consumer.config.logger.info "Worker initialized and listening"
+              safe_process { @consumer.process(h,p) }
+            end
           end
         end
       end

data/spec/observer_spec.rb

@@ -109,6 +109,12 @@ module Untied
           subject.should_not_receive(:after_create)
           subject.notify
         end
+
+        it "should not raise error when no callback method is defined" do
+          expect {
+            subject.notify(:after_commit, :user, :core, { :user => {} })
+          }.to_not raise_error(NoMethodError, /undefined method `after_commit'/)
+        end
       end
     end
   end

data/spec/processor_spec.rb

@@ -49,7 +49,7 @@ module Untied
 
         it "should call Observer#notify with correct arguments" do
           SomeObserver.instance.should_receive(:notify).
-            with(:after_create, :user, :core, { :user => { :name => "Guila" } })
+            with(:after_create, :user, :core, { "user" => { "name" => "Guila" } })
           MyProcessor.new.process({}, message.to_json)
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: untied-consumer
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Guilherme Cavalcanti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-23 00:00:00 Z
+date: 2012-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement