philotic 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0f8544430bd4ed0961e39da04d9f8b31de77fb
-  data.tar.gz: 8179fe31b21760200bed1315dda3c2241998523b
+  metadata.gz: e65a02c82dad79dbb1413340b4613cdc73c26205
+  data.tar.gz: 4fef3510ebc2b80f251c3fa77ed6acb9d2203da1
 SHA512:
-  metadata.gz: bf07ca965eb1503d85fa28910d37410d5076256f9dfe2f6d938643fa1cc0d43ce708541da7235f37172cd01da22520a695271d8b851248c7b9feb660a3e246b6
-  data.tar.gz: c37eedc369ed1c0f4257ba819f1596e6d41d177a0f4a1236f6fec432506b43f12f99a37b7a695532d7ef3ccf2c93f8fe9b517b4287c2003c75db32be1449cf3d
+  metadata.gz: c36cd0b54fca4fc789b96c2a1ec13d41e91d32c2267eea262ee3cfc8a6dfa638d280dc420f1a65cf24a4566e85b2dee7e18fef3bb153e1e6c29b7d0558d1c02f
+  data.tar.gz: 3bc4043bc5db4291c0f33b0c75227285c266d46814ddb06765dd854302964abc7c0f5e4adaadbb4ec86a8583e7a97cacf52f4add1a990fcb42a13b7547aeec4f

data/lib/philotic/config.rb

@@ -7,7 +7,7 @@ require 'cgi'
 require 'bunny/session'
 require 'logger'
 require 'philotic/config/defaults'
-require 'active_support/inflections'
+require 'active_support/all'
 
 module Philotic
   class Config

data/lib/philotic/connection.rb

@@ -2,7 +2,7 @@ require 'json'
 require 'bunny'
 require 'logger'
 require 'bunny'
-require 'active_support/all'
+require 'i18n/core_ext/hash'
 require 'philotic/constants'
 require 'philotic/config'
 require 'philotic/publisher'

data/lib/philotic/message.rb

@@ -1,6 +1,6 @@
 require 'philotic/constants'
 require 'philotic/singleton'
-require 'active_support/inflections'
+require 'active_support/all'
 
 module Philotic
   class Message
@@ -80,7 +80,7 @@ module Philotic
     end
 
     def delivery_tag
-      delivery_info.try(:delivery_tag)
+      delivery_info && delivery_info.delivery_tag
     end
 
     def payload

data/lib/philotic/serialization/encryptor.rb

@@ -1,6 +1,7 @@
 require 'encryptor'
-require 'philotic/serialization/serializer'
 require 'base64'
+require 'i18n/core_ext/hash'
+require 'philotic/serialization/serializer'
 
 module Philotic
   module Serialization
@@ -44,7 +45,7 @@ module Philotic
       end
 
       def load(payload, metadata)
-        headers = metadata[:headers].deep_dup.deep_symbolize_keys
+        headers = Marshal.load(Marshal.dump(metadata[:headers])).deep_symbolize_keys
 
         iv = Base64.decode64 headers[:encryption][:iv]
         salt = Base64.decode64 headers[:encryption][:salt]

data/lib/philotic/serialization/serializer.rb

@@ -1,3 +1,5 @@
+require 'i18n/core_ext/hash'
+
 module Philotic
   module Serialization
     module Serializer
@@ -27,7 +29,7 @@ module Philotic
 
       private
       def _transform(dump_or_load, payload, metadata)
-        headers = metadata[:headers].deep_dup.deep_symbolize_keys
+        headers = Marshal.load(Marshal.dump(metadata[:headers])).deep_symbolize_keys
 
         serializations = headers[:philotic_serializations]
 

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/philotic.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'timecop', '~> 0.8'
 
   gem.add_dependency 'activesupport', '>= 3.2'
-  gem.add_dependency 'encryptor', '~> 1.3'
   gem.add_dependency 'bunny', '~> 2.2'
+  gem.add_dependency 'encryptor', '~> 1.3'
+  gem.add_dependency 'i18n', '>= 0.7'
   gem.add_dependency 'multi_json', '~> 1.11'
   gem.add_dependency 'oj', '~> 2.12'
 end

data/spec/philotic/subscriber_spec.rb

@@ -133,7 +133,7 @@ describe Philotic::Subscriber do
 
     specify do
       expect(subject.connection).to receive(:channel).and_return(channel)
-      expect(message).to receive(:delivery_info).and_return(delivery_info)
+      expect(message).to receive(:delivery_info).twice.and_return(delivery_info)
       expect(delivery_info).to receive(:delivery_tag).and_return(delivery_tag)
       expect(channel).to receive(:acknowledge).with(delivery_tag, false)
       subject.acknowledge(message)
@@ -149,7 +149,7 @@ describe Philotic::Subscriber do
 
     specify do
       expect(subject.connection).to receive(:channel).and_return(channel)
-      expect(message).to receive(:delivery_info).and_return(delivery_info)
+      expect(message).to receive(:delivery_info).twice.and_return(delivery_info)
       expect(delivery_info).to receive(:delivery_tag).and_return(delivery_tag)
       expect(channel).to receive(:reject).with(delivery_tag, true)
       subject.reject(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philotic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: encryptor
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement