banter 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c5a20be7d8609e0189b266838385bf77752b6c
-  data.tar.gz: e33e3ebf5bb8ee35134109633b8124751e61467c
+  metadata.gz: dd2dfa466f501c97c8cf3702abe02ca15013084f
+  data.tar.gz: c0f17e5e0729ad21abf1c9cafe5a6f3e3484b684
 SHA512:
-  metadata.gz: a59bb462b03b2370748f3f39ccb78a27f5babf8272bf1e08ede78fa985bafdf26c14c1eabaec75c7bcda8ec196dabb557825c75b33d3b8076675b9e2aaeffdac
-  data.tar.gz: ccb12a8ff6288e19e08bff59ff89bde6988fcad5c1403b9256f1c4d75d8f09a1af20e9665361e3ff62855c7b09467b882903dbc6e1ebc6113a0c261ea36a4179
+  metadata.gz: a2e50ccdab095c293ec03406428849bb34069024ceab1c421e19e36f6779e4484fa994fe0c52fa16c87ab60db9214ba27af32c23547b04206132e0be85234913
+  data.tar.gz: 2ff1ad572c1fb1388792eb3ae3c2944c221e8623c2990d44eb480192d3aa8c9e9e8393d5eddba29b6462e22eded18e58480627b6229134baf01758a30b924bda

data/banter.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0", ">=3.0.0"
   spec.add_development_dependency "awesome_print", '~> 1.6', ">=1.6.1"
-  spec.add_runtime_dependency "bunny", "~> 1.5.1"
-  spec.add_runtime_dependency "hashie", "~> 1.2", ">=1.2.0"
+  spec.add_runtime_dependency "bunny", "~> 1.5", ">= 1.5.1"
+  spec.add_runtime_dependency "hashie", ">=1.2.0"
   spec.add_runtime_dependency "json", "~> 1.8", ">=1.8.0"
-  spec.add_runtime_dependency "celluloid", "~> 0.17", ">=0.17.0"
-  spec.add_runtime_dependency "celluloid-io", "~> 0.17.0", ">=0.17.1"
+  spec.add_runtime_dependency "celluloid", "~> 0.17"
+  spec.add_runtime_dependency "celluloid-io", "~> 0.17", ">=0.17.1"
 end

data/lib/banter/rabbit_logger.rb

@@ -25,8 +25,15 @@ module Banter
       internal_log(:warn, "BANTER COMPLETED", envelope, routing_key, envelope[:payload])
     end
 
-    def self.log_subscriber_failed(routing_key, delivery_info, properties, envelope)
-      internal_log(:warn, "BANTER SUBSCRIBER FAILED", envelope, routing_key,  { delivery_info: delivery_info, properties: properties, contents: envelope[:payload]} )
+    def self.log_subscriber_failed(routing_key, delivery_info, properties, envelope, contents)
+      if envelope.nil?
+        # message could not be parsed, so we have to log this one differently.
+        tags = ["BANTER SUBSCRIBER FAILED", Time.now.to_i.to_s, routing_key].map{|x| utf(x)}
+        logger.tagged(tags) { logger.send(:error, utf( "contents: #{contents.to_s} -- properties: #{properties.to_s}")) }
+      else
+        internal_log(:warn, "BANTER SUBSCRIBER FAILED", envelope, routing_key,  { delivery_info: delivery_info, properties: properties,
+          contents: envelope[:payload] } )
+      end
     end
 
     def self.log_service(service_name, message)

data/lib/banter/server/rabbit_mq_subscriber.rb

@@ -83,7 +83,7 @@ module Banter
           Banter::RabbitLogger.log(Logger::WARN, "Error in message: #{e}")
           e.backtrace.each{|line| Banter::RabbitLogger.log(Logger::WARN, "-- #{line}") }
           Banter::RabbitLogger.log(Logger::WARN, "contents: #{contents}")
-          Banter::RabbitLogger.log_subscriber_failed(delivery_info[:routing_key], delivery_info, properties, envelope)
+          Banter::RabbitLogger.log_subscriber_failed(delivery_info[:routing_key], delivery_info, properties, envelope, contents)
 
           # Does not get put back on the queue, and instead, will need to be processed either by the log parser
           # later or by dead letter exchange

data/lib/banter/subscriber.rb

@@ -150,7 +150,7 @@ module Banter
 
     def self.validate_routing_key_name(key)
       return true if key.blank?
-      key.match(/\A([a-z_]+\.?)*([a-z\_]+)\Z/).present?
+      key.match(/\A([a-z_]+[\.\d]*)*([a-z\_]+)\d*\Z/).present?
     end
 
     def self.generated_application_name(application_name)

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

data/spec/banter/rabbit_logger_spec.rb

@@ -101,14 +101,27 @@ describe Banter::RabbitLogger do
     end
 
     describe "#log_subscriber_failed" do
-      let!(:result) { subject.log_subscriber_failed(routing_key, delivery_info, properties, message)}
+      let(:contents) { {"data"=>"filler text"} }
+      context "message is badly set up" do
+        let(:message) { nil }
+        let!(:result) { subject.log_subscriber_failed(routing_key, delivery_info, properties, message, contents ) }
+
+        it "should not fail" do
+          expect{ result }.not_to raise_error()
+        end
 
-      it "should not fail" do
-        expect{ result }.not_to raise_error()
       end
 
-      it "should respect the log level of the file" do
-        expect(Banter.logger).to have_received(:warn).with(anything)
+      context "message is correct" do
+        let!(:result) { subject.log_subscriber_failed(routing_key, delivery_info, properties, message, contents )}
+
+        it "should not fail" do
+          expect{ result }.not_to raise_error()
+        end
+
+        it "should respect the log level of the file" do
+          expect(Banter.logger).to have_received(:warn).with(anything)
+        end
       end
 
     end

data/spec/banter/subscriber_spec.rb

@@ -122,10 +122,14 @@ describe Banter::Subscriber do
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef')).to eq(true) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef.asd')).to eq(true) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef/')).to eq(false) }
-    it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef.a123')).to eq(false) }
+    it { expect(Klass.send(:validate_routing_key_name, 'abcdef.abcdef.5123')).to eq(false) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.stuff_happened')).to eq(true) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcdef.')).to eq(false) }
     it { expect(Klass.send(:validate_routing_key_name, 'abcAf')).to eq(false) }
+    it { expect(Klass.send(:validate_routing_key_name, 'eis.wms.ohl.current.v0.inbound')).to eq(true) }
+    it { expect(Klass.send(:validate_routing_key_name, 'eis.wms.ohl.current.v0')).to eq(true) }
+    it { expect(Klass.send(:validate_routing_key_name, '0.inbound')).to eq(false) }
+    it { expect(Klass.send(:validate_routing_key_name, 'a0b.inbound')).to eq(true) }
   end
 
   describe "#generated_queue_name" do
@@ -134,6 +138,7 @@ describe Banter::Subscriber do
     it { expect(Klass.send(:generated_queue_name, 'abcdef', nil)).to eq('abcdef') }
     it { expect(Klass.send(:generated_queue_name, 'abcdef.abcd', nil)).to eq('abcdef.abcd') }
     it { expect(Klass.send(:generated_queue_name, 'a.b.c', nil)).to eq('a.b.c') }
+    it { expect(Klass.send(:generated_queue_name, 'eis.wms.ohl.current.v0.inbound', nil)).to eq('eis.wms.ohl.current.v0.inbound') }
   end
 
   describe '.subscribe_to' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
@@ -93,15 +96,15 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -109,9 +112,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
@@ -142,9 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,16 +149,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.1
@@ -171,7 +165,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.1