cpi-event-connector 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -7,22 +7,22 @@ GIT
 PATH
   remote: .
   specs:
-    cpi-event-connector (0.0.10)
-      activesupport (>= 3.1)
+    cpi-event-connector (0.0.12)
+      activesupport (~> 3)
       bunny
       uuidtools (~> 2.1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     backports (2.5.1)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     justinf-unification_assertion (0.0.2)
-    multi_json (1.3.2)
+    multi_json (1.3.6)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)

data/cpi-event-connector.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "justinf-unification_assertion"
 
   s.add_runtime_dependency "bunny"
-  s.add_runtime_dependency "activesupport", ">= 3.1"
+  s.add_runtime_dependency "activesupport", "~> 3"
   s.add_runtime_dependency "uuidtools", "~> 2.1.2"
 end

data/lib/cpi_event_connector/connector.rb

@@ -1,9 +1,10 @@
+require 'active_support/core_ext/array/extract_options'
 require 'bunny'
 
 module Cpi
   class Connector
     def initialize params={}
-      @queue_name = params.delete(:queue)
+      @queue = params.delete(:queue)
       @params = params
     end
 
@@ -13,7 +14,9 @@ module Cpi
 
       with_retries options do
         start
-        @exchange.publish(message, :key => @queue_name, :persistent => true)
+        queue = options[:queue] || @queue
+        @bunny.queue(queue, :durable => true)
+        @exchange.publish(message, :key => queue, :persistent => true)
         @bunny.tx_commit
       end
     end
@@ -28,7 +31,6 @@ module Cpi
       @bunny.tx_select
       @exchange = @bunny.exchange('')
 
-      @queue = @bunny.queue(@queue_name, :durable => true)
       @started = true
     end
 

data/lib/cpi_event_connector/event.rb

@@ -2,20 +2,29 @@ require 'active_support/core_ext/string'
 
 module Cpi
   class Event
+    class << self
+      attr_accessor :connection_params
+    end
 
-    @@enabled = false
+    @enabled = false
 
     def self.configure(params)
-      @@enabled = !!params.delete(:enabled)
-      return unless @@enabled
-      @@connector = Cpi::Connector.new(params)
+      @enabled = !!params.delete(:enabled)
+      self.connection_params = params
     end
 
-    def self.transmit(event_type, tenant_uid, root_path)
-      return unless @@enabled
+    def self.transmit(event_type, tenant_uid, root_path, options=nil)
+      return unless @enabled
       raise ArgumentError, "Tenant UID must be specified" if tenant_uid.blank?
+
       event_json = Cpi::Generator.create_event(event_type, tenant_uid, root_path)
-      @@connector.transmit(event_json)
+      self.connector.transmit(event_json, options)
+    end
+
+    private
+
+    def self.connector
+      Thread.current[:cpi_connector] ||= Cpi::Connector.new(self.connection_params)
     end
   end
 end

data/lib/cpi_event_connector/version.rb

@@ -1,3 +1,3 @@
 module Cpi
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/connector_spec.rb

@@ -27,7 +27,7 @@ describe Cpi::Connector do
       bunny.stub(:tx_commit)
     end
 
-    context "before connection established" do
+    context "before a connection is established" do
       it "connects to an amqp server" do
         Bunny.should_receive(:new).with(params).and_return(bunny)
         bunny.should_receive(:start)
@@ -35,12 +35,6 @@ describe Cpi::Connector do
         connector.transmit(event)
       end
 
-      it "connects to the specified queue" do
-        bunny.should_receive(:queue).with("cpi", :durable => true).and_return(queue)
-
-        connector.transmit(event)
-      end
-
       it "creates a transaction before sending an event" do
         bunny.should_receive(:tx_select)
 
@@ -54,18 +48,30 @@ describe Cpi::Connector do
       end
     end
 
-    context "connection already established" do
+    context "when a connection is already established" do
       before do
         connector.transmit(event)
       end
 
-      it "does not do anything" do
+      it "does not reconnect to an amqp server" do
         Bunny.should_not_receive(:new)
 
         connector.transmit(event)
       end
     end
 
+    it "connects to the default queue" do
+      bunny.should_receive(:queue).with("cpi", :durable => true).and_return(queue)
+
+      connector.transmit(event)
+    end
+
+    it "connects to the specified queue" do
+      bunny.should_receive(:queue).with("my queue", :durable => true).and_return(queue)
+
+      connector.transmit(event, :queue => "my queue")
+    end
+
     it "sends a message to an amqp server" do
       exchange.should_receive(:publish).with(event, :key => "cpi", :persistent => true)
 

data/spec/event_spec.rb

@@ -1,48 +1,34 @@
 require 'spec_helper'
 require_relative '../lib/cpi_event_connector'
-require 'yaml'
 require 'active_support'
 require 'unification_assertion'
-require 'active_support/core_ext/hash/keys' # for symbolize keys
 
 describe Cpi::Event do
-  let(:yaml_config) { "
----
-host: localhost
-port: 5672
-username: guest
-password: guest
-queue: connector-test
-enabled: true
-"}
+  let(:config) { { :enabled => true, :key => "value" } }
 
   describe ".configure" do
-
     let(:connector) { double(Cpi::Connector) }
 
     it "accepts a hash of connection information" do
-      expected_config = YAML::load(yaml_config).symbolize_keys!
-      expected_config.delete(:enabled)
-      Cpi::Connector.should_receive(:new).with(expected_config).and_return(connector)
-
-      Cpi::Event.configure(YAML::load(yaml_config).symbolize_keys!)
-    end
-
-    it "does nothing if enabled is false" do
-      yaml_config = "---
-enabled: false"
-      Cpi::Connector.should_not_receive(:new)
+      Cpi::Event.configure(config)
 
-      Cpi::Event.configure(YAML::load(yaml_config))
+      Cpi::Event.connection_params.should == { :key => "value" }
     end
   end
 
   describe ".transmit" do
-
+    let(:real_config) { {
+      host: "localhost",
+      port: "5672",
+      username: "guest",
+      password: "guest",
+      queue: "connector-test",
+      enabled: "true"
+    } }
     let(:content) { "<test />" }
 
     it "generates and sends an event" do
-      Cpi::Event.configure(YAML::load(yaml_config).symbolize_keys!)
+      Cpi::Event.configure(real_config)
 
       Cpi::Event.transmit("shipment_shipped", "stuff", content)
 
@@ -56,11 +42,29 @@ enabled: false"
       h.should unify({"event_type" => "shipment_shipped", "tenant" => "stuff", "content" => content, "uid" => :_x})
     end
 
+    it "creates a connection for each thread" do
+      Cpi::Event.configure(config)
+
+      connector1 = double("connector 1")
+      connector2 = double("connector 2")
+      Cpi::Connector.stub(:new).and_return(connector1, connector2)
+
+      connector1.should_receive(:transmit)
+      connector2.should_receive(:transmit)
+
+      Thread.new do
+        Cpi::Event.transmit("message", "tenant_uid", "content")
+      end.join
+
+      Thread.new do
+        Cpi::Event.transmit("message", "tenant_uid", "content")
+      end.join
+    end
+
     it "does not transmit when it is not enabled" do
-      config = YAML::load(yaml_config).symbolize_keys!
-      config[:enabled] = false
+      real_config[:enabled] = false
 
-      Cpi::Event.configure(config)
+      Cpi::Event.configure(real_config)
       Cpi::Generator.should_not_receive(:create_event)
       # And there shouldn't be an exception
 
@@ -73,7 +77,7 @@ enabled: false"
     end
 
     it "raises exception when no tenant_uid is passed in" do
-      Cpi::Event.configure(YAML::load(yaml_config).symbolize_keys!)
+      Cpi::Event.configure(real_config)
       Cpi::Generator.should_not_receive(:create_event)
       expect {Cpi::Event.transmit("message", nil, "content")}.to raise_error(ArgumentError)
     end

data/spec/integration_spec.rb

@@ -24,4 +24,15 @@ queue: connector-test"}
     message = q.pop
     message[:payload].should == "message"
   end
+
+  it "sends a message when a queue is specified" do
+    connector = Cpi::Connector.new(YAML::load(yaml_config).symbolize_keys!)
+    connector.transmit("message", :queue => "my queue")
+
+    b = Bunny.new
+    b.start
+    q = b.queue("my queue", :durable => true)
+    message = q.pop
+    message[:payload].should == "message"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpi-event-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement