banter 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392e9d855319d4d23abbd43c12932480857be977
-  data.tar.gz: 261063589e891676943f98a1429a984de59c11f9
+  metadata.gz: 97c5a20be7d8609e0189b266838385bf77752b6c
+  data.tar.gz: e33e3ebf5bb8ee35134109633b8124751e61467c
 SHA512:
-  metadata.gz: 8b784e6a0f3f7d1b7de9fceececf8fb96baa10f2c34bcd78df6d0c8c86483a2e7edf5866add7357ab58e8e8b19b615effa9eb8633e743d39347ae62c04d52acd
-  data.tar.gz: 112fb318896f313aaf75116ca135b33653a6bc0663dd33f77f5b5ec47c871ab1f3c9e44df0e6b2bf0ba2aafc7ae2d70097f62bab278ec237cb5bd3fdf4a92af8
+  metadata.gz: a59bb462b03b2370748f3f39ccb78a27f5babf8272bf1e08ede78fa985bafdf26c14c1eabaec75c7bcda8ec196dabb557825c75b33d3b8076675b9e2aaeffdac
+  data.tar.gz: ccb12a8ff6288e19e08bff59ff89bde6988fcad5c1403b9256f1c4d75d8f09a1af20e9665361e3ff62855c7b09467b882903dbc6e1ebc6113a0c261ea36a4179

data/Gemfile

@@ -5,9 +5,9 @@ gemspec
 
 gem 'json'
 group :test do
-  gem 'rack-test'
   gem 'rspec-its'
   gem 'timecop'
+  gem 'activesupport', '~> 4.2'
   gem 'awesome_print', '~> 1.6', '>= 1.6.1'
   gem "factory_girl", "~> 4.0"
 end

data/banter.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bunny", "~> 1.5.1"
   spec.add_runtime_dependency "hashie", "~> 1.2", ">=1.2.0"
   spec.add_runtime_dependency "json", "~> 1.8", ">=1.8.0"
-  spec.add_runtime_dependency "celluloid", "~> 0.16", ">=0.16.0"
-  spec.add_runtime_dependency "celluloid-io", "~> 0.16.0", ">=0.16.1"
+  spec.add_runtime_dependency "celluloid", "~> 0.17", ">=0.17.0"
+  spec.add_runtime_dependency "celluloid-io", "~> 0.17.0", ">=0.17.1"
 end

data/lib/banter/message.rb

@@ -31,6 +31,15 @@ module Banter
       contents = Hashie::Mash.new(::JSON.parse(envelope))
       from_hash(contents)
       to_hash
+    rescue => e
+      ::Hashie::Mash.new({
+        ts: Time.now.to_f,
+        pub: "unknown",
+        v: "unknown",
+        payload: envelope,
+        context: { "format" => "invalid" }.as_json
+      })
+
     end
 
     def from_hash(contents)

data/lib/banter/version.rb

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

data/spec/banter/message_spec.rb

@@ -66,6 +66,19 @@ describe Banter::Message do
       end
     end
 
+    context "non-banter message" do
+      let(:payload) { "non_banter_message" }
+      let(:result) { subject.parse(payload) }
+
+      it "should not fail" do
+        expect{ result }.not_to raise_error
+        expect(result.payload).to eq(payload)
+        expect(result.context["format"]).to eq("invalid")
+      end
+
+
+    end
+
     context "dead lettered message" do
       let(:complete_val) { 1 }
       let(:payload) do

data/spec/spec_helper.rb

@@ -11,23 +11,16 @@ require 'banter/server'
 require 'support/test_notifier'
 ENV['RAILS_ENV'] ||= "test"
 ENV['RACK_ENV'] ||= "test"
-require 'rack/test'
 require 'timecop'
 require 'factory_girl'
 require 'rspec/its'
 
-module RSpecMixin
-  include Rack::Test::Methods
-  def app() Banter::Web::Application end
-end
-
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
-  config.include RSpecMixin
 
   config.before(:each) {
     t = Time.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Honest Company
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,40 +141,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.1
 description: Publish & subscribe to messages
 email:
 - webadmin@honest.com