beanstalk-worker 0.0.6 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/beanstalk-worker/config.rb +4 -5
- data/lib/beanstalk-worker.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 22dfef308ff22569b14a565dd2d78a3a6098a20e
|
|
4
|
+
data.tar.gz: 6eb8800cc64532916884e53eeb069d750523fed9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ac258a3cc776fd5366e7ca792a7a75ad1887e7f2040f7611357ded9d7c970cb0b078120f898d93282020bb9bddf3842190c8b1ca79458073516eefe7d1cf3d09
|
|
7
|
+
data.tar.gz: b0569f32ab64bf72febf57ac5a9b7d410025237c1e96ece266676665ece3e7640b70725c5466fe87a2f45d68746c166bbabc65ee84e86848a07d99b22dd38c80
|
|
@@ -19,9 +19,9 @@ class BeanStalk::Worker
|
|
|
19
19
|
# Support merging via coercion to symbols.
|
|
20
20
|
#
|
|
21
21
|
# @param [ Hash ] hash The configuration hash to symbolize and merge.
|
|
22
|
-
alias
|
|
22
|
+
alias :base_merge! :merge!
|
|
23
23
|
def merge!(hash)
|
|
24
|
-
|
|
24
|
+
base_merge!(configuration.deep_merge(hash.deep_symbolize_keys))
|
|
25
25
|
end
|
|
26
26
|
end
|
|
27
27
|
|
|
@@ -54,8 +54,7 @@ class BeanStalk::Worker
|
|
|
54
54
|
# @param [ String ] filename The file to read.
|
|
55
55
|
# @param [ String ] environment The environment to use.
|
|
56
56
|
def self.from_file_yaml(filename, environment)
|
|
57
|
-
|
|
58
|
-
YAML.load_file(filename).deep_symbolize_keys[environment])
|
|
57
|
+
merge!(YAML.load_file(filename).deep_symbolize_keys[environment])
|
|
59
58
|
end
|
|
60
59
|
|
|
61
60
|
# Loads a given json file and merges the current context
|
|
@@ -78,7 +77,7 @@ class BeanStalk::Worker
|
|
|
78
77
|
# @param [ String ] input The json configuration input.
|
|
79
78
|
def self.from_stream_json(input, *args)
|
|
80
79
|
parser = Yajl::Parser.new(:symbolize_keys => true)
|
|
81
|
-
|
|
80
|
+
merge!(parser.parse(input))
|
|
82
81
|
end
|
|
83
82
|
|
|
84
83
|
# Helper method for generation the beanstalk uri
|
data/lib/beanstalk-worker.rb
CHANGED