super_stack 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/super_stack/manager.rb +11 -4
- data/lib/super_stack/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2226a65ef0d9c22fa07c216de3c7959998b81033
|
4
|
+
data.tar.gz: e532b941b5b66f4135227f7326f2aed1243584b2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 97bbba767f156421c9bc8b64465ee0a09c24068852efc2d578f7d224c4c2fb2c8b9accdff3ff34320c8066ca92a66bb05787e0fc13c7e0a4e342d5f7b32081df
|
7
|
+
data.tar.gz: 03b1c5f6a2f139eb2add02481c2f20581ab3e6dbfff42a16da3f7ea99ba45b4df799c0e00141d09b4b26c839e91bf504bca2f69bb6a0f0a2be23de5b2f6e9f47
|
data/lib/super_stack/manager.rb
CHANGED
@@ -32,21 +32,20 @@ module SuperStack
|
|
32
32
|
return [] if layers.empty?
|
33
33
|
return layers[0] if layers.count == 1
|
34
34
|
first_layer = layers.shift
|
35
|
+
first_layer = first_layer.disabled? ? SuperStack::Layer.new : first_layer
|
35
36
|
res = layers.inject(first_layer) do |stack, layer|
|
36
37
|
if layer.disabled?
|
37
38
|
stack
|
38
39
|
else
|
39
40
|
policy_to_apply = layer.merge_policy.nil? ? default_merge_policy : layer.merge_policy
|
40
|
-
policy_to_apply.merge stack, layer
|
41
|
+
policy_to_apply.merge stack, stringify_keys(layer)
|
41
42
|
end
|
42
43
|
end
|
43
44
|
if filter.nil?
|
44
45
|
# Trick to return a bare hash
|
45
46
|
{}.merge res
|
46
47
|
else
|
47
|
-
|
48
|
-
value = res[filter.to_s] if filter.is_a? Symbol and value.nil?
|
49
|
-
value
|
48
|
+
res[filter.to_s]
|
50
49
|
end
|
51
50
|
end
|
52
51
|
|
@@ -103,6 +102,14 @@ module SuperStack
|
|
103
102
|
|
104
103
|
private
|
105
104
|
|
105
|
+
def stringify_keys(hash)
|
106
|
+
hash.inject({}){|stringified_hash, (key, value)|
|
107
|
+
stringified_hash[key.to_s] = value
|
108
|
+
stringified_hash
|
109
|
+
}
|
110
|
+
end
|
111
|
+
|
112
|
+
|
106
113
|
def get_existing_layer(layer_or_layer_name, error_message)
|
107
114
|
layer_name = layer_or_layer_name.to_s if layer_or_layer_name.is_a? Symbol
|
108
115
|
layer_name = layer_or_layer_name if layer_or_layer_name.is_a? String
|
data/lib/super_stack/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: super_stack
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Laurent B.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|