vx-lib-consumer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fda1f920de953cad74aad9f480269b511a2ea6d
-  data.tar.gz: 88cd289d7a38409548f5e768d8bae0549b7b9510
+  metadata.gz: ace1d62d962a0d5a67d5086e1284c258d47daf47
+  data.tar.gz: 5632632683d9fb9a118cfe4df1db3655555e5019
 SHA512:
-  metadata.gz: a7676c4044041137059a8432eb34459c8340e9a162def1bc158700651528d8e5324f4bc949522166592a7ff6a9b69eaaa74bf60e5d1c55b232587daf34296779
-  data.tar.gz: cd252ac02ae73fa59b14c5f13b78e241aa79ab7507e0c40eb4414822ee12988c699984bd23879a298ad9c377dd557dbbd0fbf31b7a9b9ee97ba1a19d8656e416
+  metadata.gz: b17601c2d5e539c4ce4e169ab7a307ce4e43b9c34de763a6b5db27cf8ec9a0766ec64054ead7fe3ea5b1962238da9d2fdb108642f3a3f7858c9f1b2b7ecf825a
+  data.tar.gz: 0e2cbd3ce7012f8ebd7799e304212d56dd73a8fee7ad07ceb8a03d09fe82168c706b7337fd04956b1a9494aa7162a9de4d708cc06f6f460aacabeda08fee9776

data/.travis.yml

@@ -3,5 +3,6 @@ services:
 
 rvm:
   - 2.1
+  - 2.2
 
 script: bundle exec rspec spec/ -b

data/lib/vx/lib/consumer/configuration.rb

@@ -7,7 +7,6 @@ module Vx
 
         DEBUG = 'VX_CONSUMER_DEBUG'.freeze
 
-
         attr_accessor :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :pool_timeout,
           :heartbeat, :spawn_attempts, :content_type, :debug,

data/lib/vx/lib/consumer/serializer.rb

@@ -1,3 +1,5 @@
+require 'oj'
+
 module Vx
   module Lib
     module Consumer
@@ -56,18 +58,29 @@ module Vx
 
         define 'application/json' do
           pack do |body|
-            if body.is_a?(String)
-              body
-            else
-              ::JSON.dump body
+            encoded =
+              if body.is_a?(String)
+                body
+              else
+                ::Oj.dump(body, mode: :compat)
+              end
+
+            unless encoded.valid_encoding?
+              encoded.encode!('UTF-8', invalid: :replace)
             end
+
+            encoded
           end
 
           unpack do |payload, model|
+            unless payload.valid_encoding?
+              payload.encode!('UTF-8', invalid: :replace)
+            end
+
             if model && model.respond_to?(:from_json)
               model.from_json payload
             else
-              ::JSON.parse(payload)
+              ::Oj.load(payload)
             end
           end
         end

data/lib/vx/lib/consumer/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Consumer
-      VERSION = "0.3.2"
+      VERSION = "0.3.3"
     end
   end
 end

data/spec/lib/consumer_spec.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'oj'
 require 'timeout'
 require 'spec_helper'
 
@@ -120,7 +120,7 @@ describe Vx::Lib::Consumer do
     sleep 0.1
     consumer.cancel
 
-    expect(error[0]).to be_an_instance_of(JSON::ParserError)
+    expect(error[0]).to be_an_instance_of(Oj::ParseError)
     expect(error[1][:consumer]).to_not be_nil
   end
 

data/spec/lib/serializer_spec.rb

@@ -27,6 +27,22 @@ describe Vx::Lib::Consumer::Serializer do
     it "should unpack payload" do
       expect(s.unpack('application/json', payload.to_json, nil)).to eq("a"=>1)
     end
+
+    it "should pack invalid unicode" do
+      payload = { a: "Le Caf\xc3\xa9 \xa9" }
+      expect(payload[:a]).to_not be_valid_encoding
+      json = s.pack('application/json', payload)
+      expect(json).to be_valid_encoding
+      expect(json).to eq "{\"a\":\"Le Café �\"}"
+    end
+
+    it "should unpack invalid unicode" do
+      payload = "{\"a\":\"Le Café \xA9\"}"
+      expect(payload).to_not be_valid_encoding
+      payload = s.unpack('application/json', payload, nil)
+      expect(payload).to eq("a" => "Le Café �")
+      expect(payload["a"]).to be_valid_encoding
+    end
   end
 
   context "application/x-protobuf" do

data/vx-lib-consumer.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'bunny',               '= 1.6.3'
+  spec.add_runtime_dependency 'bunny',               '= 1.7.0'
   spec.add_runtime_dependency 'vx-lib-rack-builder', '>= 0.0.2'
+  spec.add_runtime_dependency 'oj'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-consumer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: vx-lib-rack-builder
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement