cpi-event-connector 0.0.13 → 0.0.14

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in cpi-event-connector.gemspec
-gem 'bunny', :git => "https://github.com/ruby-amqp/bunny.git"
 gemspec

data/Gemfile.lock

@@ -1,15 +1,9 @@
-GIT
-  remote: https://github.com/ruby-amqp/bunny.git
-  revision: af6d5e35c7fcd5667807b595c8eb22f08780c0aa
-  specs:
-    bunny (0.8.0.pre1)
-
 PATH
   remote: .
   specs:
-    cpi-event-connector (0.0.12)
+    cpi-event-connector (0.0.13)
       activesupport (~> 3)
-      bunny
+      bunny (~> 0.8.0)
       uuidtools (~> 2.1.2)
 
 GEM
@@ -19,6 +13,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     backports (2.5.1)
+    bunny (0.8.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     justinf-unification_assertion (0.0.2)
@@ -38,7 +33,6 @@ PLATFORMS
 
 DEPENDENCIES
   backports
-  bunny!
   cpi-event-connector!
   justinf-unification_assertion
   rspec

data/cpi-event-connector.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "backports"
   s.add_development_dependency "justinf-unification_assertion"
 
-  s.add_runtime_dependency "bunny"
+  s.add_runtime_dependency "bunny", "~> 0.8.0"
   s.add_runtime_dependency "activesupport", "~> 3"
   s.add_runtime_dependency "uuidtools", "~> 2.1.2"
 end

data/lib/cpi_event_connector/connector.rb

@@ -3,9 +3,10 @@ require 'bunny'
 
 module Cpi
   class Connector
-    def initialize params={}
+    def initialize params={}, logger
       @queue = params.delete(:queue)
       @params = params
+      @logger = logger
     end
 
     def transmit(message, options = nil)
@@ -21,19 +22,27 @@ module Cpi
       end
     end
 
+    def connectivity_test
+      @started = false
+      start
+      "Event Connector can connect to AMQP server at #{@params[:host]}:#{@params[:port]}"
+    rescue StandardError => e
+      e.message
+    end
+
     private
 
     def start
       return if @started
 
-      Event.logger.debug "Connecting to Rabbit with params #{@params.inspect}"
+      @logger.debug "Connecting to Rabbit with params #{@params.inspect}"
       @bunny = Bunny.new @params
       @bunny.start
       @bunny.tx_select
       @exchange = @bunny.exchange('')
 
       @started = true
-      Event.logger.debug "Connection established"
+      @logger.debug "Connection established"
     end
 
     def with_retries(*args, &block)
@@ -49,15 +58,15 @@ module Cpi
       begin
         yield
       rescue *exceptions => e
-        Event.logger.debug "Exception caught in #with_retries:\n#{e.message}"
+        @logger.debug "Exception caught in #with_retries:\n#{e.message}"
         if retried < options[:retries]
           retried += 1
-          Event.logger.debug "Trying again. Have tried #{retried} times so far."
+          @logger.debug "Trying again. Have tried #{retried} times so far."
           sleep options[:sleep]
           options[:before_retry].call
           retry
         else
-          Event.logger.debug "Gave up on retries, throwing: #{e.message}" 
+          @logger.debug "Gave up on retries, throwing: #{e.message}" 
           raise e
         end
       end

data/lib/cpi_event_connector/event.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/string'
 
 module Cpi
+  THREAD_LOCAL_VARIABLE = :cpi_connector
+
   class Event
     class << self
       attr_accessor :connection_params
@@ -31,10 +33,19 @@ module Cpi
       @logger.debug "Transmission complete"
     end
 
+    def self.connectivity_test
+      if !@enabled
+        return 'Event Connector is not enabled.'
+      end
+
+      self.connector.connectivity_test
+    end
+
     private
 
     def self.connector
-      Thread.current[:cpi_connector] ||= Cpi::Connector.new(self.connection_params)
+      Thread.current[THREAD_LOCAL_VARIABLE] ||= Cpi::Connector.new(self.connection_params, @logger)
     end
+
   end
 end

data/lib/cpi_event_connector/version.rb

@@ -1,3 +1,3 @@
 module Cpi
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/connector_spec.rb

@@ -7,6 +7,7 @@ describe Cpi::Connector do
   let(:bunny) { double(Bunny) }
   let(:params) { {:host => "", :port => "", :username => "", :password => "", :queue => "cpi"} }
   let(:queue) { double("a queue")}
+  let(:logger) { Logger.new("/dev/null") }
   let(:exchange) { double("an exchange")}
 
 
@@ -19,7 +20,7 @@ describe Cpi::Connector do
   end
 
   describe "#transmit" do
-    let(:connector) { Cpi::Connector.new params }
+    let(:connector) { Cpi::Connector.new params, logger }
     let(:event) { "event" }
 
     before do

data/spec/event_spec.rb

@@ -6,6 +6,14 @@ require 'unification_assertion'
 describe Cpi::Event do
   let(:config) { { :enabled => true, :key => "value" } }
   let(:logger) { stub("Logger", debug: nil, info: nil) }
+  let(:real_config) { {
+      host: "localhost",
+      port: "5672",
+      username: "guest",
+      password: "guest",
+      queue: "connector-test",
+      enabled: "true"
+    } }
 
   describe ".configure" do
     let(:connector) { double(Cpi::Connector) }
@@ -24,14 +32,7 @@ describe Cpi::Event do
   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
@@ -90,4 +91,22 @@ describe Cpi::Event do
       expect {Cpi::Event.transmit("message", nil, "content")}.to raise_error(ArgumentError)
     end
   end
+
+  describe ".connectivity_test" do
+    it "tells you when the connector is not enabled" do
+      Cpi::Event.configure({enabled: false}, logger)
+      Cpi::Event.connectivity_test.should == 'Event Connector is not enabled.'
+    end
+
+    it "tells you when the connection params are correct" do
+      Cpi::Event.configure(real_config, logger)
+      Cpi::Event.connectivity_test.should == 'Event Connector can connect to AMQP server at localhost:5672'
+    end
+
+    it "returns false when the connection params are incorrect" do
+      real_config[:host] = "doesntwork"
+      Cpi::Event.configure(real_config, logger)
+      Cpi::Event.connectivity_test.should == "getaddrinfo: Name or service not known"
+    end
+  end
 end

data/spec/integration_spec.rb

@@ -13,9 +13,10 @@ port: 5672
 username: guest
 password: guest
 queue: connector-test"}
+  let(:logger) { Logger.new("/dev/null") }
 
   it "sends a message to an amqp server" do
-    connector = Cpi::Connector.new(YAML::load(yaml_config).symbolize_keys!)
+    connector = Cpi::Connector.new(YAML::load(yaml_config).symbolize_keys!, logger)
     connector.transmit("message")
 
     b = Bunny.new
@@ -26,7 +27,7 @@ queue: connector-test"}
   end
 
   it "sends a message when a queue is specified" do
-    connector = Cpi::Connector.new(YAML::load(yaml_config).symbolize_keys!)
+    connector = Cpi::Connector.new(YAML::load(yaml_config).symbolize_keys!, logger)
     connector.transmit("message", :queue => "my queue")
 
     b = Bunny.new

data/spec/spec_helper.rb

@@ -2,4 +2,9 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.color_enabled = true
+
+  config.before(:each) do
+    # make sure we get a new connector for every test
+    Thread.current[Cpi::THREAD_LOCAL_VARIABLE] = nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpi-event-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23871620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23871620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &23871200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23871200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: justinf-unification_assertion
-  requirement: &23870780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23870780
-- !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: &23870360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *23870360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &23869860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *23869860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &23869360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *23869360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 description: see summary
 email:
 - engineering@nulogy.com
@@ -99,7 +129,6 @@ files:
 - spec/generator_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb
-- spec_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -120,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sends events to CPI

data/spec_helper.rb

@@ -1,7 +0,0 @@
-Dir[File.dirname(__FILE__) + "/spec/support/**/*.rb"].each {|f| require f}
-
-require 'rspec'
-
-RSpec.configure do |config|
-  config.color_enabled = true
-end