banter 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjNmODc0ZTMwNjliZGQ1ZDg4MmU2YjNjNGU5NmUwMjgzY2NlZjY1Mw==
-  data.tar.gz: !binary |-
-    YTQzM2Y1NzQ2YThkZTNkMzhhMjk4NGRmMWU5MTJhOTk3ZmE2NTlkOA==
+SHA1:
+  metadata.gz: cd09b360f3b05bd5eface4120f9d009441365f68
+  data.tar.gz: 29d94a28bcebce70d175d53e16ca6173b75b05f9
 SHA512:
-  metadata.gz: !binary |-
-    ZTY2OTk1OGFmNTU2M2RkOWQxYzBiYzlhODIyNjVlOTRkMThkZDhkNDUzNTcw
-    OTMxOTM0MjFhNjkwN2Y3MTllNzlhNjM3ZWYzNzkyODBlM2ZmZDI0NzM4OWNk
-    MzRjM2FjZTU1NjE3NDRkNTc2YmU5NTcyYTcwZDAzMGRiMDg0NDA=
-  data.tar.gz: !binary |-
-    MzU2MjY4ODU0NTYwOTNmYmU5MGE5NzI2ODJmNTA0MmJmYTUyYjJlOThhMjA3
-    MTNiYTUyMjc1N2NhYjcwZjI0MTg0MmJlMTYxOWVmMTljYjAwZDBiY2ZmMjM5
-    NWE2MTBmMjIyMGEwM2VkODZmMWM2Y2U0NzJkMzBhMmQ4MzkwODA=
+  metadata.gz: dc29fc38a2604b657ff4ff8e103cb33c591bfd15e0a58a96105d35f879a404e4a1b09aa26c1f93239b371829476cc62817ace3c1593120d8027f7901a736f7fb
+  data.tar.gz: 0f94f10f1627c52cbc79be446544311f722eb1dbbee5cac85276453f9e942619dda5e208d45b5c321b0f7a0247a0b69fd8fbd9af971e8bd5b5b49c03b04eacc9

data/lib/banter/configuration.rb

@@ -47,7 +47,7 @@ module Banter
     def self.configure_with(environment_name, yaml_file = nil)
       @@yaml_file = yaml_file.nil? ? "config/banter.yml" : yaml_file
       @@all_conf = Hashie::Mash.new(YAML.load_file(@@yaml_file) )
-      @@conf = @@all_conf[environment_name.to_sym]
+      @@conf = @@all_conf[environment_name]
       self
     end
 

data/lib/banter/message.rb

@@ -26,12 +26,12 @@ module Banter
 
     def parse(envelope)
       contents = Hashie::Mash.new(::JSON.parse(envelope))
-      @ts = contents[:ts]
-      @pub = contents[:pub]
+      @ts = contents.ts
+      @pub = contents.pub
       # Version used for messaging can get updated if we need to add extra header information, and need
       # to move each section of the library separately.
-      @version = contents[:v]
-      @payload = contents[:payload]
+      @version = contents.v
+      @payload = contents.payload
       @context = ::Banter::Context.from_json(contents[:context])
       to_hash
     end

data/lib/banter/server/client_queue_listener.rb

@@ -32,7 +32,7 @@ module Banter
 
       def message_received(delivery_info, properties, envelope)
         Banter::RabbitLogger.log(::Logger::DEBUG, "Message received by listener on #{worker_class.name} with payload: #{envelope[:payload]}")
-        worker = worker_class.new(delivery_info, properties, envelope[:context])
+        worker  = worker_class.new(delivery_info, properties, envelope[:context])
         payload = envelope[:payload]
         track_message_received(worker, payload)
         worker.perform!(payload)
@@ -40,21 +40,25 @@ module Banter
       rescue ::Banter::PayloadValidationError => banter_error
         track_message_failed(banter_error, false)
         Banter::RabbitLogger.log(::Logger::ERROR, { worker: worker_class.name, message: banter_error.message, envelope: envelope })
-        Airbrake.notify("Validation error for #{worker_class.name}",
+        Airbrake.notify(banter_error,
                         params: {
                           info:       delivery_info,
                           properties: properties,
                           context:    envelope[:context],
-                          payload:    envelope[:payload] })
+                          payload:    envelope[:payload],
+                          message:    "Validation error for #{worker_class.name}"
+                        })
       rescue => e
         track_message_failed(e, true)
         Banter::RabbitLogger.log(::Logger::DEBUG, "Failed message for #{worker_class.name} #{e.message}")
-        Airbrake.notify("Failed perform for #{worker_class.name}",
+        Airbrake.notify(e,
                         params: {
                           info:       delivery_info,
                           properties: properties,
                           context:    envelope[:context],
-                          payload:    envelope[:payload] })
+                          payload:    envelope[:payload],
+                          message:    "Failed perform for #{worker_class.name}"
+                        })
 
       end
 

data/lib/banter/server/rabbit_mq_subscriber.rb

@@ -28,7 +28,7 @@ module Banter
         begin
           @connection.start
         rescue => e
-          Airbrake.notify("RabbitMQ unreachable!", params: { message: e.message }, environment_name: ENV['RAILS_ENV'])
+          Airbrake.notify(e, params: { message: e.message, what_happened: "RabbitMQ unreachable!" }, environment_name: ENV['RAILS_ENV'])
           raise e
         end
 
@@ -56,7 +56,8 @@ module Banter
         @consumer.on_delivery do |delivery_info, properties, contents|
           Banter::RabbitLogger.log(Logger::DEBUG, "Message delivery with contents: #{contents}")
           if delivery_info[:redelivered]
-            Airbrake.notify("PubSub Message redelivery", params: { info: delivery_info, props: properties, contents: contents }, environment_name: ENV['RAILS_ENV'])
+            e = StandardError.new("PubSub Message redelivery")
+            Airbrake.notify(e, params: { info: delivery_info, props: properties, contents: contents }, environment_name: ENV['RAILS_ENV'], backtrace: caller)
           end
           message = ::Banter::Message.new.parse(contents)
           Banter::RabbitLogger.log_receive(delivery_info[:routing_key], message)

data/lib/banter/subscriber.rb

@@ -110,7 +110,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_]+\.?)*([a-z\_]+)\Z/).present?
     end
 
     def self.generated_queue_name(routing_key, queue_name)
@@ -119,4 +119,4 @@ module Banter
     end
 
   end
-end
+end

data/lib/banter/version.rb

@@ -1,3 +1,3 @@
 module Banter
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/banter/message_spec.rb

@@ -21,7 +21,7 @@ describe Banter::Message do
     end
 
     it "should have the data in the payload" do
-      expect(result[:payload][:data]).to eq('found')
+      expect(result.payload.data).to eq('found')
     end
 
     it "should have the attributes readable" do
@@ -49,7 +49,7 @@ describe Banter::Message do
     end
 
     it "should have the data in the payload" do
-      expect(result[:payload][:data]).to eq('found')
+      expect(result.payload.data).to eq('found')
     end
 
     it "should have the attributes readable" do

data/spec/banter/subscriber_spec.rb

@@ -11,7 +11,7 @@ describe Banter::Subscriber do
 
     context "Routing key is 'honest.test.route'" do
       let(:routing_data) { {routing_key: "honest.test.route"} }
-      
+
       it { should eq "honest.test.route" }
     end
   end
@@ -231,6 +231,14 @@ describe Banter::Subscriber do
       end
     end
 
+    context 'underscore in routing key' do
+      before { Klass.subscribe_to 'a_b.c', on: 'foo_bar' }
+      it 'is allowed' do
+        expect(Klass.subscribed_key).to eq('a_b.c')
+        expect(Klass.subscribed_queue).to eq('foo_bar')
+      end
+    end
+
     context 'invalid routing key' do
       it 'sets the routing key and queue name' do
         expect {
@@ -256,4 +264,4 @@ describe Banter::Subscriber do
 
     end
   end
-end
+end

data/spec/banter/web/application_spec.rb

@@ -60,7 +60,7 @@ describe Banter::Web::Application do
 
     it do
       worker_ids = workers_json.map { |worker| worker['id'] }
-      expect(worker_ids).to eq([worker_1.id.to_s, worker_2.id.to_s])
+      expect(worker_ids).to match_array([worker_1.id.to_s, worker_2.id.to_s])
     end
   end
 
@@ -110,7 +110,7 @@ describe Banter::Web::Application do
 
     def includes_messages(*messages)
       message_ids = messages_json.map { |m| m['id']}
-      expect(message_ids).to eq(messages.map(&:id).map(&:to_s))
+      expect(message_ids).to match_array(messages.map(&:id).map(&:to_s))
     end
 
     context "all messages" do
@@ -178,4 +178,4 @@ describe Banter::Web::Application do
       expect(subscribers).to eq(['BarWorker1', 'BarWorker2', 'FooWorker1', 'FooWorker2'])
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,14 +31,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -59,28 +59,28 @@ dependencies:
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -101,84 +101,84 @@ dependencies:
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.15'
 description: Publish & subscribe to messages
@@ -278,17 +278,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Library for pub-sub (Message Bus)