super_stack 0.4.0 → 0.4.1

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 252c5d3c0c7502cd8d199660fd2366328c1a0b62
4
- data.tar.gz: e8f0846916ab97dce8071ceffe9b6bf692ae7c3d
3
+ metadata.gz: 2226a65ef0d9c22fa07c216de3c7959998b81033
4
+ data.tar.gz: e532b941b5b66f4135227f7326f2aed1243584b2
5
5
  SHA512:
6
- metadata.gz: 66082adea0c2facc15445c0bbef7e04bd42c66a80465e775456fb127b8f8a7c96c7f3c6bd31558e8966a177fb0883dd30dfe8401b07f3450cd351b1f41132955
7
- data.tar.gz: 2f735111b2053ad0363fc775affc39f7ff3a267fdf207cffc463db46b199560e16f75d7df55b860a068d6fed80eb515e486056187a3e58219dbb7ad534b2a275
6
+ metadata.gz: 97bbba767f156421c9bc8b64465ee0a09c24068852efc2d578f7d224c4c2fb2c8b9accdff3ff34320c8066ca92a66bb05787e0fc13c7e0a4e342d5f7b32081df
7
+ data.tar.gz: 03b1c5f6a2f139eb2add02481c2f20581ab3e6dbfff42a16da3f7ea99ba45b4df799c0e00141d09b4b26c839e91bf504bca2f69bb6a0f0a2be23de5b2f6e9f47
@@ -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
- value = res[filter]
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
@@ -1,3 +1,3 @@
1
1
  module SuperStack
2
- VERSION = '0.4.0'
2
+ VERSION = '0.4.1'
3
3
  end
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.0
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-26 00:00:00.000000000 Z
11
+ date: 2015-01-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler