untied-publisher 0.0.5 → 0.0.6

data/.travis.yml

@@ -3,3 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 1.8.7
+services:
+  - rabbitmq

data/CHANGELOG.mkd

@@ -1,3 +1,9 @@
+# 0.0.6
+
+- Refactor event and payload representer
+- Implements sync producer (and makes it possible to choose through config)
+- Improve failsafeness (issue #5 and #6)
+
 # 0.0.4
 
 - Don't relying on ActiveSupport for serializing Untied::Event

data/README.md

@@ -2,7 +2,7 @@
 
 This is the publisher part of Untied. Untied is an observer pattern implementation to distributed systems.
 
-For usage information, please visit the [Untied](http://github.com.br/redu/untied) page.
+For usage information, please visit the [Untied](http://github.com/redu/untied) page.
 
 [![Build Status](https://travis-ci.org/redu/untied-publisher.png)](https://travis-ci.org/redu/untied-publisher)
 

data/lib/untied-publisher.rb

@@ -2,37 +2,58 @@ require "untied-publisher/version"
 
 require 'rubygems'
 require 'bundler/setup'
-require 'amqp/utilities/event_loop_helper'
+
+require 'untied-publisher/event_representer'
+require 'untied-publisher/event'
+require 'untied-publisher/doorkeeper'
+require 'untied-publisher/default_doorkeeper'
+require 'untied-publisher/config'
+require 'untied-publisher/observer'
+require 'untied-publisher/base_producer'
+require 'untied-publisher/amqp'
+require 'untied-publisher/bunny'
+require 'untied-publisher/base'
 
 module Untied
   module Publisher
-    def self.start
-      Thread.abort_on_exception = false
-
-      self.run do
-        AMQP.start
+    # Configures untied-publisher.
+    def self.configure(&block)
+      yield(config) if block_given?
+      if config.deliver_messages
+        adapter.start
+      else
+        config.adapter = :Base
+        adapter.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 } }
+    def self.config
+      @config ||= Config.new
+    end
+
+    def self.adapter
+      producer_booter = "Untied::Publisher::#{self.config.adapter}"
+
+      @adapter ||= begin
+        begin
+          constantize(producer_booter)
+        rescue NameError
+          config.logger.info "#{producer_booter} is not defined. Falling back " +\
+            "to Untied::Publisher::Bunny"
+          Untied::Publisher::Bunny
         end
-      else
-        AMQP::Utilities::EventLoopHelper.run { @block.call }
+     end
+    end
+
+    # Transforms string into constant
+    def self.constantize(class_name)
+      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ class_name
+        raise NameError, "#{class_name.inspect} is not a valid constant name!"
       end
+
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
     end
   end
 end
 
-
-require 'untied-publisher/event_representer'
-require 'untied-publisher/event'
-require 'untied-publisher/config'
-require 'untied-publisher/doorkeeper'
-require 'untied-publisher/observer'
-require 'untied-publisher/producer'
 require 'untied-publisher/railtie' if defined?(Rails)

data/lib/untied-publisher/amqp.rb

@@ -0,0 +1,16 @@
+require 'amqp/utilities/event_loop_helper'
+require 'untied-publisher/amqp/producer'
+
+module Untied
+  module Publisher
+    module AMQP
+      def self.start
+        config.channel ||= ::AMQP::Channel.new(::AMQP.connection)
+      end
+
+      def self.producer
+        Untied::Publisher::AMQP::Producer
+      end
+    end
+  end
+end

data/lib/untied-publisher/amqp/producer.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+require 'amqp'
+
+module Untied
+  module Publisher
+    module AMQP
+      class Producer < BaseProducer
+        # Encapsulates both the Channel and Exchange (AMQP).
+
+        def initialize(opts={})
+          super
+          check_em_reactor
+          if ::AMQP.channel || opts[:channel]
+            say "Using defined AMQP.channel"
+            @channel = ::AMQP.channel || opts[:channel]
+          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 safe_publish(e)
+          on_exchange do |exchange|
+            exchange.publish(e.to_json, :routing_key => @routing_key)
+          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 " + \
+              "eventmachine loop"
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/untied-publisher/base.rb

@@ -0,0 +1,12 @@
+module Untied
+  module Publisher
+    module Base
+      def self.start
+      end
+
+      def self.producer
+        Untied::Publisher::BaseProducer
+      end
+    end
+  end
+end

data/lib/untied-publisher/base_producer.rb

@@ -0,0 +1,62 @@
+# -*- encoding : utf-8 -*-
+
+module Untied
+  module Publisher
+    # Generic class to provide message publishing.
+    class BaseProducer
+      attr_reader :routing_key, :service_name, :deliver_messages
+
+      def initialize(opts={})
+        extract_options!(opts)
+      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)
+        if deliver_messages
+          safe_publish(event)
+          say "Publishing event with routing key #{routing_key}: #{event.to_json}"
+        else
+          say "Event produced but not delivered. If you want to deliver it " + \
+              "try to set Untied::Publisher.config.deliver_messages to true. " + \
+              "Event: #{event.to_json}"
+        end
+      end
+
+      private
+
+      def extract_options!(opts)
+        options = {
+          :service_name => Publisher.config.service_name,
+          :deliver_messages => Publisher.config.deliver_messages,
+          :channel => nil,
+        }.merge(opts)
+        options[:routing_key] = "untied.#{options[:service_name]}"
+
+        options.each do |k,v|
+          instance_variable_set(:"@#{k}", v)
+        end
+
+        unless options[:service_name]
+          msg = "you should inform service_name option or configure it " + \
+                "through Untied::Publisher.configure block"
+          raise ArgumentError.new(msg)
+        end
+
+        say "Producer intialized with options " + \
+            "#{options.inspect} and routing key #{routing_key}"
+
+        if !deliver_messages
+          say "Channel was not setted up because message delivering is disabled."
+        end
+      end
+
+      protected
+
+      def say(msg)
+        Publisher.config.logger.info "#{self.class.to_s}: #{msg}"
+      end
+    end
+  end
+end

data/lib/untied-publisher/bunny.rb

@@ -0,0 +1,15 @@
+require 'untied-publisher/bunny/producer'
+
+module Untied
+  module Publisher
+    module Bunny
+      def self.start
+        # Nothing to do here
+      end
+
+      def self.producer
+        Untied::Publisher::Bunny::Producer
+      end
+    end
+  end
+end

data/lib/untied-publisher/bunny/producer.rb

@@ -0,0 +1,45 @@
+require 'bunny'
+
+module Untied
+  module Publisher
+    module Bunny
+      class Producer < BaseProducer
+        def initialize(opts={})
+          super
+
+          begin
+            connection.start
+          rescue ::Bunny::TCPConnectionFailed => e
+            say "Can't connect to RabbitMQ: #{e.message}"
+          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 safe_publish(event)
+          if connection.status == :open
+            exchange.publish(event.to_json, :routing_key => routing_key)
+          else
+            say "Event not sent. Connection status is #{connection.status}: " + \
+                "#{event.to_json}"
+          end
+        end
+
+        protected
+
+        def connection
+          @connection ||= ::Bunny.new
+        end
+
+        def exchange
+          @exchange ||= channel.topic('untied', :auto_delete => true)
+        end
+
+        def channel
+          @channel ||= connection.create_channel
+        end
+      end
+    end
+  end
+end

data/lib/untied-publisher/config.rb

@@ -4,28 +4,19 @@ require 'logger'
 
 module Untied
   module Publisher
-    def self.configure(&block)
-      yield(config) if block_given?
-      if config.deliver_messages
-        Untied::Publisher.start
-        EventMachine.next_tick do
-          config.channel ||= AMQP::Channel.new(AMQP.connection)
-        end
-      end
-    end
-
-    def self.config
-      @config ||= Config.new
-    end
-
     class Config
       include Configurable
 
+      # Logger used by untied. Default: STDOUT
       config :logger, Logger.new(STDOUT)
+      # Deliver the messages to AMQP broker. Default: true
       config :deliver_messages, true
-      config :service_name
-      config :doorkeeper, nil
-      config :channel, nil
+      # An unique identifier to the publisher. Default: untied_publisher
+      config :service_name, 'untied_publisher'
+      # Doorkeeper class name. Default: DefaultDoorkeeper
+      config :doorkeeper, Untied::Publisher::DefaultDoorkeeper
+      # RabbitMQ adapter
+      config :adapter, :Bunny
     end
   end
 end

data/lib/untied-publisher/default_doorkeeper.rb

@@ -0,0 +1,8 @@
+module Untied
+  module Publisher
+    # Default Doorkeeper. Don't let anyone pass.
+    class DefaultDoorkeeper
+      include Doorkeeper
+    end
+  end
+end

data/lib/untied-publisher/event.rb

@@ -8,14 +8,30 @@ module Untied
       @config = {
         :name => "after_create",
         :payload => nil,
-        :origin => nil
+        :origin => nil,
+        :payload_representer => nil
       }.merge(attrs)
 
       raise "You should inform the origin service" unless @config[:origin]
 
       @name = @config.delete(:name)
-      @payload = @config.delete(:payload)
+      @payload = represent(@config.delete(:payload))
       @origin = @config.delete(:origin)
+
+      self.extend(Publisher::EventRepresenter)
+    end
+
+    protected
+
+    # Extends payload with representer and returns the hash. In cases there is
+    # no representer, the raw payload is returned
+    def represent(payload)
+      if representer = @config[:payload_representer]
+        payload.extend(representer)
+        payload.to_hash
+      else
+        payload
+      end
     end
   end
 end

data/lib/untied-publisher/event_representer.rb

@@ -3,13 +3,17 @@
 require 'representable/json'
 
 module Untied
-  module EventRepresenter
-    include Representable::JSON
+  module Publisher
+    module EventRepresenter
+      # Publisher::Event is extended with this module at runtime. It defines
+      # how the event will be serialized.
 
-    self.representation_wrap = true
+      include Representable::JSON
+      self.representation_wrap = true
 
-    property :name
-    property :payload
-    property :origin
+      property :name
+      property :payload
+      property :origin
+    end
   end
 end

data/lib/untied-publisher/observer.rb

@@ -28,17 +28,14 @@ module Untied
       protected
 
       def produce_event(callback, model, options={})
-        if representer = options[:with_representer]
-          model = model.extend(representer)
-        end
-        e = Event.new(:name => callback,
-                      :payload => model, :origin => Publisher.config.service_name)
-        e.extend(EventRepresenter)
+        e = Event.new(:name => callback, :payload => model,
+                      :origin => Publisher.config.service_name,
+                      :payload_representer => options[:represent_with])
         producer.publish(e)
       end
 
       def producer
-        Producer.new
+        Publisher.adapter.producer.new
       end
 
       def publisher

data/lib/untied-publisher/railtie.rb

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

data/lib/untied-publisher/version.rb

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

data/spec/amqp/amqp_producer_spec.rb

@@ -0,0 +1,66 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+module Untied
+  module Publisher
+    module AMQP
+      describe Producer do
+        context "configuration" do
+          it "should use service name configured" do
+            mock_reactor_and_amqp do |c|
+              Producer.new.service_name.should == 'core'
+            end
+          end
+        end
+
+        it "should initilize producer" do
+          mock_reactor_and_amqp do |c|
+            Producer.new.should be_a Producer
+          end
+        end
+
+        it "should raise RuntimeError when trying to run without connection" do
+          expect {
+            Producer.new(:deliver_messages => true)
+          }.to raise_error
+        end
+
+        it "should raise RuntimeError if EM is not running" do
+          mock_reactor_and_amqp do |c|
+            EM.stub("reactor_running?" => false)
+            expect {
+              Producer.new(:channel => c, :deliver_messages => true)
+            }.to raise_error
+          end
+        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|
+              producer = Producer.new(:channel => channel, :deliver_messages => true)
+              producer.should_receive(:safe_publish).with(event)
+              producer.publish(event)
+            end
+          end
+        end
+
+        def mock_reactor_and_amqp
+          # Do nothing when calling start
+          Untied.stub(:start).and_return(nil)
+          # Simulate reactor running
+          EM.stub(:reactor_running?).and_return(true)
+
+          exchange = double('Exchange')
+          channel = double('Channel')
+          channel.stub(:topic).and_return(exchange)
+
+          yield(channel)
+        end
+      end
+    end
+  end
+end

data/spec/base_producer_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Untied
+  module Publisher
+    describe BaseProducer do
+      context ".new" do
+        it "should raise exception when there is no service_name" do
+          Publisher.config.stub(:service_name).and_return(nil)
+          expect {
+            BaseProducer.new
+          }.to raise_error(ArgumentError, /you should inform service_name/)
+        end
+
+        %w(routing_key service_name deliver_messages).each do |attr|
+          it "should have #{attr} attr reader" do
+            BaseProducer.new.should respond_to(attr)
+          end
+        end
+
+        it "should log when message delivering is setted to false" do
+          Publisher.config.logger.should_receive(:info).
+            with(/Producer intialized with options/)
+          Publisher.config.logger.should_receive(:info).
+            with(/Channel was not/)
+          BaseProducer.new(:deliver_messages => false)
+        end
+      end
+
+    end
+  end
+end

data/spec/bunny/bunny_producer_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+module Untied
+  module Publisher
+    module Bunny
+      describe Producer do
+        context ".new" do
+          it "call super" do
+            Producer.should_receive(:new)
+            Producer.new
+          end
+        end
+
+        context "failing connection" do
+          let(:bunny) do
+            bunny = double('Bunny')
+          end
+          before do
+            bunny.stub(:start).
+              and_raise(::Bunny::TCPConnectionFailed.new(nil, "host", "port"))
+
+            Producer.any_instance.stub(:connection).and_return(bunny)
+          end
+          let(:logger) { Publisher.config.logger }
+
+          context ".new" do
+
+            it "should log when connection is refused" do
+              Producer.any_instance.stub(:connection).and_return(bunny)
+              expect { Producer.new }.to_not raise_error
+            end
+
+            it "should log properly" do
+              logger.should_receive(:info).with(/Channel was not setted up/)
+              logger.should_receive(:info).with(/Producer intialized/)
+              logger.should_receive(:info).with(/Can't connect to RabbitMQ/)
+
+              Producer.new
+            end
+          end
+
+          context "#publish" do
+            it "should log properly" do
+              subject = Producer.new
+              bunny.stub(:status).and_return(:closed)
+              logger.should_receive(:info).with(/Event not sent/)
+              subject.safe_publish({})
+            end
+          end
+        end
+
+        context "#publish" do
+          let(:connection) { ::Bunny.new }
+          let(:channel) { connection.create_channel }
+          let(:exchange) { channel.topic('untied', :auto_delete => true) }
+          let(:event) do
+            Event.new(:name => "create", :payload => { :foo => 'bar' },
+                      :origin => :core)
+          end
+          before do
+            connection.start
+            Publisher.config.deliver_messages = true
+          end
+          after do
+            connection.close
+            Publisher.config.deliver_messages = false
+          end
+
+          it "should route the message correctly" do
+            queue = channel.queue("", :exclusive => true).
+              bind(exchange, :routing_key => "untied.core")
+            subject.publish(event)
+
+            sleep(0.5)
+
+            queue.message_count.should == 1
+            channel.close
+          end
+        end
+      end
+    end
+  end
+end

data/spec/event_representer_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Untied
+  describe Event do
+    before(:all) do
+      module PostRepresenter
+        include Representable::JSON
+
+        property :title
+      end
+    end
+    let(:post) { Post.create(:title => "DIY") }
+
+    context "#to_json" do
+      it "should serialize according with EventRepresenter" do
+        event = Event.new(:name => "foo", :payload => {}, :origin => :bar)
+        JSON.parse(event.to_json).to_a.sort.should ==
+          { "event" =>
+            { "name" => "foo", "origin" => "bar", "payload" => {  } } }.to_a.sort
+      end
+
+      it "should represent payload" do
+        event = Event.new(:name => "foo", :payload => post, :origin => :bar,
+                         :payload_representer => PostRepresenter)
+
+        JSON.parse(event.to_json).to_a.sort.should ==
+          { "event" =>
+            { "name" => "foo", "origin" => "bar",
+              "payload" => { "title" => "DIY" } } }.to_a.sort
+      end
+
+      it "should fallback to default to_json when there is no representer" do
+        person = User.create(:name => "Guila")
+        event = Event.new(:name => "foo", :payload => person, :origin => :bar)
+
+        JSON.parse(event.to_json).to_a.sort.should ==
+          { "event" =>
+            { "name" => "foo", "origin" => "bar",
+              "payload" => JSON.parse(person.to_json) } }.to_a.sort
+      end
+    end
+  end
+end

data/spec/{publisher_observer_spec.rb → observer_spec.rb}

@@ -1,16 +1,21 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
+require 'representable/json'
 
 module Untied
   module Publisher
     describe Observer do
+      before(:all) do
+        module UserRepresenter
+          include Representable::JSON
+          property :name
+        end
+      end
       before do
         class ::FooDoorkeeper
           include Untied::Publisher::Doorkeeper
         end
         Untied::Publisher.config.doorkeeper = ::FooDoorkeeper
-        module UserRepresenter
-        end
       end
       let(:doorkeeper) { ::FooDoorkeeper.new }
 
@@ -32,11 +37,12 @@ module Untied
           Observer.instance.send(:after_create, user)
         end
 
-        context "passing :with_representer" do
-          it "should call user.extend(UserRepresenter)" do
-            user.should_receive(:extend).with(UserRepresenter)
+        context "passing :represent_with" do
+          it "should create a new Event with :payload_representer option" do
+            Event.should_receive(:new).
+              with(hash_including(:payload_representer))
             Observer.instance.
-              send(:after_create, user, :with_representer => UserRepresenter)
+              send(:after_create, user, :represent_with => UserRepresenter)
           end
         end
       end

data/spec/support/setup_ar_and_schema.rb

@@ -12,6 +12,7 @@ module SetupActiveRecord
   ActiveRecord::Schema.define do
     create_table :posts, :force => true do |t|
       t.string :title
+      t.timestamps
     end
     create_table :users, :force => true do |t|
       t.string :name

data/untied-publisher.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "configurable"
   gem.add_runtime_dependency "json"
   gem.add_runtime_dependency "representable"
+  gem.add_runtime_dependency "bunny", "0.9.0.pre6"
 
   if RUBY_VERSION < "1.9"
     gem.add_development_dependency "ruby-debug"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: untied-publisher
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Guilherme Cavalcanti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-20 00:00:00 Z
+date: 2013-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -131,6 +131,24 @@ dependencies:
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 2794158613
+        segments: 
+        - 0
+        - 9
+        - 0
+        - pre
+        - 6
+        version: 0.9.0.pre6
+  prerelease: false
+  type: :runtime
+  name: bunny
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,7 +160,7 @@ dependencies:
   prerelease: false
   type: :development
   name: ruby-debug
-  requirement: *id009
+  requirement: *id010
 description: Provides the Publisher part of the Untied gem.
 email: 
 - guiocavalcanti@gmail.com
@@ -162,18 +180,27 @@ files:
 - README.md
 - Rakefile
 - lib/untied-publisher.rb
+- lib/untied-publisher/amqp.rb
+- lib/untied-publisher/amqp/producer.rb
+- lib/untied-publisher/base.rb
+- lib/untied-publisher/base_producer.rb
+- lib/untied-publisher/bunny.rb
+- lib/untied-publisher/bunny/producer.rb
 - lib/untied-publisher/config.rb
+- lib/untied-publisher/default_doorkeeper.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
 - lib/untied-publisher/version.rb
+- spec/amqp/amqp_producer_spec.rb
+- spec/base_producer_spec.rb
+- spec/bunny/bunny_producer_spec.rb
 - spec/doorkeeper_spec.rb
+- spec/event_representer_spec.rb
 - spec/event_spec.rb
-- spec/producer_spec.rb
-- spec/publisher_observer_spec.rb
+- spec/observer_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup_ar_and_schema.rb
 - untied-publisher.gemspec
@@ -211,9 +238,12 @@ signing_key:
 specification_version: 3
 summary: Untied is a Observer Pattern implementation for distributed systems. Think as a cross-application ActiveRecord::Observer. This gem handles the publishing of events
 test_files: 
+- spec/amqp/amqp_producer_spec.rb
+- spec/base_producer_spec.rb
+- spec/bunny/bunny_producer_spec.rb
 - spec/doorkeeper_spec.rb
+- spec/event_representer_spec.rb
 - spec/event_spec.rb
-- spec/producer_spec.rb
-- spec/publisher_observer_spec.rb
+- spec/observer_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup_ar_and_schema.rb

data/lib/untied-publisher/producer.rb

@@ -1,73 +0,0 @@
-# -*- encoding : utf-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,
-          :deliver_messages => Publisher.config.deliver_messages,
-          :channel => nil,
-        }.merge(opts)
-
-        Publisher.config.logger.info "Untied::Publisher: Producer intialized with options #{@opts.inspect}"
-
-        @routing_key = "untied.#{@opts[:service_name]}"
-
-        if !@opts[:deliver_messages]
-          Publisher.config.logger.info \
-            "AMQP.channel was not setted up because message delivering is disabled."
-          return
-        end
-
-        check_em_reactor
-
-        if AMQP.channel || @opts[:channel]
-          Publisher.config.logger.info "Using defined AMQP.channel"
-          @channel = AMQP.channel || @opts[:channel]
-        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]
-          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 \
-            "The event #{ e.inspect} was not delivered. Try to set " + \
-            "Untied::Publisher.config.deliver_messages to true"
-        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 " + \
-            "eventmachine loop"
-        end
-      end
-    end
-  end
-end

data/spec/producer_spec.rb

@@ -1,61 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-module Untied
-  module Publisher
-    describe Producer do
-      context "configuration" do
-        it "should use service name configured" do
-          opts = Producer.new.instance_variable_get(:@opts)
-          opts[:service_name].should == 'core'
-        end
-      end
-
-      it "should initilize producer" do
-        Producer.new.should be_a Producer
-      end
-
-      it "should raise RuntimeError when trying to run without connection" do
-        expect {
-          Producer.new(:deliver_messages => true)
-        }.to raise_error
-      end
-
-      it "should raise RuntimeError if EM is not running" do
-        mock_reactor_and_amqp do |c|
-          EM.stub("reactor_running?" => false)
-          expect {
-            Producer.new(:channel => c, :deliver_messages => true)
-          }.to raise_error
-        end
-      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|
-            producer = Producer.new(:channel => channel, :deliver_messages => true)
-            producer.should_receive(:safe_publish).with(event)
-            producer.publish(event)
-          end
-        end
-      end
-
-      def mock_reactor_and_amqp
-        # Do nothing when calling start
-        Untied.stub(:start).and_return(nil)
-        # Simulate reactor running
-        EM.stub(:reactor_running?).and_return(true)
-
-        exchange = double('Exchange')
-        channel = double('Channel')
-        channel.stub(:topic).and_return(exchange)
-
-        yield(channel)
-      end
-    end
-  end
-end