sneakers 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5b3a5d3740de3c7404234fad5dfe7286d8684a
-  data.tar.gz: fce6b1c8aedb2f0755a16be3d493205badb985a2
+  metadata.gz: aeb60ce69dfdcd3827ba365bc9e7a2b57ea4e6b7
+  data.tar.gz: 5dfc47a8211dd79822bb3fe8c4ec61f51a5b6d92
 SHA512:
-  metadata.gz: b4f462c76d5c6a36bf1d8b2731b1329461f529c12a77604ad9e2cb5f526832ffcfc94aed16239bade4b18f89626c40fd5469e4d2295b97d38bc6df130e87c828
-  data.tar.gz: 7fd337c1fd808b6c1ec19e186b0a70879ee10f8fbb7a81ae5527a9ba5df4434468ce8a90a3532a7de0f0a6970b105a9b79aa128ccc3d9c2b04d0fa8fe376db20
+  metadata.gz: 36c682fb4bca53a96ea72016677c617245be8092dea6c48d612bffed0b3c2b37c4be9db6fb238b0358998b01eca64580f8706e6dd59d20a7ff4841482a825c3b
+  data.tar.gz: 5d3431dd0cb6b027f578c5679b2c11b175e1fc8a0caede9c37de1dcce05fbe4b417c85844da990f993d33a42f8300f1c30008ecdd44124a3af897ddf8ae31fe8

data/lib/sneakers/configuration.rb

@@ -57,9 +57,7 @@ module Sneakers
 
     def merge!(hash)
       hash = hash.dup
-      hash = map_deprecated_exchange_options_key(hash, :exchange_type, :type)
-      hash = map_deprecated_exchange_options_key(hash, :exchange_arguments, :arguments)
-      hash = map_deprecated_exchange_options_key(hash, :durable, :durable)
+      hash = map_all_deprecated_options(hash)
 
       # parse vhost from amqp if vhost is not specified explicitly, only
       # if we're not given a connection to use.
@@ -99,16 +97,24 @@ module Sneakers
     alias_method :inspect_without_redaction, :inspect
     alias_method :inspect, :inspect_with_redaction
 
-    def map_deprecated_exchange_options_key(hash = {}, deprecated_key, key)
+    def map_all_deprecated_options(hash)
+      hash = map_deprecated_options_key(:exchange_options, :exchange_type, :type, true, hash)
+      hash = map_deprecated_options_key(:exchange_options, :exchange_arguments, :arguments, true, hash)
+      hash = map_deprecated_options_key(:exchange_options, :durable, :durable, false, hash)
+      hash = map_deprecated_options_key(:queue_options, :durable, :durable, true, hash)
+      hash = map_deprecated_options_key(:queue_options, :arguments, :arguments, true, hash)
+      hash
+    end
+
+    def map_deprecated_options_key(target_key, deprecated_key, key, delete_deprecated_key, hash = {})
       return hash if hash[deprecated_key].nil?
-      hash = deep_merge({ exchange_options: { key => hash[deprecated_key] } }, hash)
-      hash = deep_merge({ queue_options: { key => hash[deprecated_key] } }, hash) if deprecated_key == :durable
-      hash.delete(deprecated_key)
+      hash = deep_merge({ target_key => { key => hash[deprecated_key] } }, hash)
+      hash.delete(deprecated_key) if delete_deprecated_key
       hash
     end
 
     def deep_merge(first, second)
-      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+      merger = proc { |_, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
       first.merge(second, &merger)
     end
   end

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/spec/sneakers/worker_spec.rb

@@ -117,7 +117,8 @@ class WithDeprecatedExchangeOptionsWorker
   from_queue 'defaults',
              :durable => false,
              :exchange_type => :topic,
-             :exchange_arguments => { 'x-arg' => 'value' }
+             :exchange_arguments => { 'x-arg' => 'value' },
+             :arguments => { 'x-arg2' => 'value2' }
 
   def work(msg)
   end
@@ -279,7 +280,7 @@ describe Sneakers::Worker do
             :durable => false,
             :auto_delete => false,
             :exclusive => false,
-            :arguments => {}
+            :arguments => { 'x-arg2' => 'value2' }
           },
           :hooks => {},
           :handler => Sneakers::Handlers::Oneshot,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine