beanstalk-worker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 747f1337fedc7cbca793183f32dc521ba23d1e16
-  data.tar.gz: 63928a5068cdc5dfe60efa991b05f0e183ea8592
+  metadata.gz: 22dfef308ff22569b14a565dd2d78a3a6098a20e
+  data.tar.gz: 6eb8800cc64532916884e53eeb069d750523fed9
 SHA512:
-  metadata.gz: 5b06b4a51c0bf6c3357dba3ac8515beb0a62d5ebd71219fcf4dd1b4b183a5d625875e6e4b6cc58e8e162a1432f450a87b2241c11277bd78cf0d471225cd96005
-  data.tar.gz: a0e371c1a9accffd9d93d54b71558b270e23228b74dee58ca9f824d3d22af4d0b2ca26ecb99a885321e8a963dc24b4f6acdb059fd4a0b13c3e70031eea151b59
+  metadata.gz: ac258a3cc776fd5366e7ca792a7a75ad1887e7f2040f7611357ded9d7c970cb0b078120f898d93282020bb9bddf3842190c8b1ca79458073516eefe7d1cf3d09
+  data.tar.gz: b0569f32ab64bf72febf57ac5a9b7d410025237c1e96ece266676665ece3e7640b70725c5466fe87a2f45d68746c166bbabc65ee84e86848a07d99b22dd38c80

data/lib/beanstalk-worker/config.rb

@@ -19,9 +19,9 @@ class BeanStalk::Worker
       # Support merging via coercion to symbols.
       #
       # @param [ Hash ] hash The configuration hash to symbolize and merge.
-      alias basic_merge! merge!
+      alias :base_merge! :merge!
       def merge!(hash)
-        basic_merge!(hash.deep_symbolize_keys)
+        base_merge!(configuration.deep_merge(hash.deep_symbolize_keys))
       end
     end
 
@@ -54,8 +54,7 @@ class BeanStalk::Worker
     # @param [ String ] filename The file to read.
     # @param [ String ] environment The environment to use.
     def self.from_file_yaml(filename, environment)
-      configuration.merge!(
-        YAML.load_file(filename).deep_symbolize_keys[environment])
+      merge!(YAML.load_file(filename).deep_symbolize_keys[environment])
     end
 
     # Loads a given json file and merges the current context
@@ -78,7 +77,7 @@ class BeanStalk::Worker
     # @param [ String ] input The json configuration input.
     def self.from_stream_json(input, *args)
       parser = Yajl::Parser.new(:symbolize_keys => true)
-      configuration.merge!(parser.parse(input))
+      merge!(parser.parse(input))
     end
 
     # Helper method for generation the beanstalk uri

data/lib/beanstalk-worker.rb

@@ -2,7 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 module BeanStalk
   class Worker
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalk-worker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Artem Veremey