untied-publisher 0.0.4 → 0.0.5

data/CHANGELOG.mkd

@@ -1,3 +1,8 @@
+# 0.0.4
+
+- Don't relying on ActiveSupport for serializing Untied::Event
+- Fixes #1
+
 # 0.0.3
 
 - ``abort_on_exception`` configuration

data/lib/untied-publisher/doorkeeper.rb

@@ -58,9 +58,11 @@ module Untied
       # _notify_untied__publisher_observer_for_after_create is created on User's
       # model. This method is called when the after_create callback is fired.
       def define_callbacks
+        logger.debug "Untied::Publisher: defining callbacks"
         observed.each do |(klass, callbacks, options)|
           ActiveRecord::Callbacks::CALLBACKS.each do |callback|
             next unless callbacks.include?(callback)
+            logger.debug "Untied::Publisher: seting up callback #{callback} for #{klass}"
             setup_observer(klass, callback, options)
           end
         end
@@ -68,6 +70,10 @@ module Untied
 
       protected
 
+      def logger
+        Publisher.config.logger
+      end
+
       def setup_observer(klass, callback, options={})
         observer = Untied::Publisher::Observer
         observer_name = observer.name.underscore.gsub('/', '__')

data/lib/untied-publisher/event.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require 'representable/json'
-
 module Untied
   class Event
     attr_accessor :name, :payload, :origin
@@ -20,14 +18,4 @@ module Untied
       @origin = @config.delete(:origin)
     end
   end
-
-  module EventRepresenter
-    include Representable::JSON
-
-    self.representation_wrap = true
-
-    property :name
-    property :payload
-    property :origin
-  end
 end

data/lib/untied-publisher/event_representer.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+require 'representable/json'
+
+module Untied
+  module EventRepresenter
+    include Representable::JSON
+
+    self.representation_wrap = true
+
+    property :name
+    property :payload
+    property :origin
+  end
+end

data/lib/untied-publisher/producer.rb

@@ -4,6 +4,8 @@ require 'amqp'
 module Untied
   module Publisher
     class Producer
+      # Encapsulates both the Channel and Exchange (AMQP).
+
       def initialize(opts={})
         @opts = {
           :service_name => Publisher.config.service_name,
@@ -26,21 +28,26 @@ module Untied
         if AMQP.channel || @opts[:channel]
           Publisher.config.logger.info "Using defined AMQP.channel"
           @channel = AMQP.channel || @opts[:channel]
-          @exchange = @channel.topic("untied", :auto_delete => true)
         end
       end
 
+      # Publish the given event.
+      #   event: object which is going to be serialized and sent through the
+      #   wire. It should respond to #to_json.
       def publish(event)
         safe_publish(event)
       end
 
       protected
 
+      # Publishes if message delivering is enabled. Otherwise just warns.
       def safe_publish(e)
         if @opts[:deliver_messages]
-          @exchange.publish(e.to_json, :routing_key => @routing_key) do
-            Publisher.config.logger.info \
-              "Publishing event #{e.inspect} with routing key #{@routing_key}"
+          on_exchange do |exchange|
+            exchange.publish(e.to_json, :routing_key => @routing_key) do
+              Publisher.config.logger.info \
+                "Publishing event #{e.inspect} with routing key #{@routing_key}"
+            end
           end
         else
           Publisher.config.logger.info \
@@ -49,6 +56,12 @@ module Untied
         end
       end
 
+      # Creates a new exchange and yields it to the block passed when it's ready
+      def on_exchange(&block)
+        return unless @channel
+        @channel.topic('untied', :auto_delete => true, &block)
+      end
+
       def check_em_reactor
         if !defined?(EventMachine) || !EM.reactor_running?
           raise "In order to use the producer you must be running inside an " + \

data/lib/untied-publisher/railtie.rb

@@ -8,7 +8,14 @@ module Untied
         config.active_record.observers ||= []
         ActiveRecord::Base.observers << Untied::Publisher::Observer
         config.active_record.observers << Untied::Publisher::Observer
-        Untied::Publisher::Observer.instance
+        unless File.basename($0) == 'rake'
+          Publisher.config.logger.debug "Untied::Publisher: initializing observer"
+          Untied::Publisher::Observer.instance
+        end
+      end
+
+      config.to_prepare do
+        Untied::Publisher.config.doorkeeper.new.define_callbacks
       end
     end
   end

data/lib/untied-publisher/version.rb

@@ -1,5 +1,5 @@
 module Untied
   module Publisher
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/untied-publisher.rb

@@ -9,13 +9,27 @@ module Untied
     def self.start
       Thread.abort_on_exception = false
 
-      AMQP::Utilities::EventLoopHelper.run do
+      self.run do
         AMQP.start
       end
     end
+
+    def self.run(&block)
+      @block = block
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          EM.stop if forked && EM.reactor_running?
+          Thread.new { EM.run { @block.call } }
+        end
+      else
+        AMQP::Utilities::EventLoopHelper.run { @block.call }
+      end
+    end
   end
 end
 
+
+require 'untied-publisher/event_representer'
 require 'untied-publisher/event'
 require 'untied-publisher/config'
 require 'untied-publisher/doorkeeper'

data/spec/producer_spec.rb

@@ -31,13 +31,15 @@ module Untied
       end
 
       context "#publish" do
+        let(:event) do
+          Event.new(:name => "create", :payload => { :foo => 'bar' }, :origin => :core)
+        end
+
         it "should call Channel#publish" do
           mock_reactor_and_amqp do |channel|
-            e = Event.new(:name => "create",
-                          :payload => { :foo => 'bar' }, :origin => :core)
-            channel.topic.should_receive(:publish)
             producer = Producer.new(:channel => channel, :deliver_messages => true)
-            producer.publish(e)
+            producer.should_receive(:safe_publish).with(event)
+            producer.publish(event)
           end
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: untied-publisher
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Guilherme Cavalcanti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 Z
+date: 2012-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -165,6 +165,7 @@ files:
 - lib/untied-publisher/config.rb
 - lib/untied-publisher/doorkeeper.rb
 - lib/untied-publisher/event.rb
+- lib/untied-publisher/event_representer.rb
 - lib/untied-publisher/observer.rb
 - lib/untied-publisher/producer.rb
 - lib/untied-publisher/railtie.rb