super_stack 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252c5d3c0c7502cd8d199660fd2366328c1a0b62
-  data.tar.gz: e8f0846916ab97dce8071ceffe9b6bf692ae7c3d
+  metadata.gz: 2226a65ef0d9c22fa07c216de3c7959998b81033
+  data.tar.gz: e532b941b5b66f4135227f7326f2aed1243584b2
 SHA512:
-  metadata.gz: 66082adea0c2facc15445c0bbef7e04bd42c66a80465e775456fb127b8f8a7c96c7f3c6bd31558e8966a177fb0883dd30dfe8401b07f3450cd351b1f41132955
-  data.tar.gz: 2f735111b2053ad0363fc775affc39f7ff3a267fdf207cffc463db46b199560e16f75d7df55b860a068d6fed80eb515e486056187a3e58219dbb7ad534b2a275
+  metadata.gz: 97bbba767f156421c9bc8b64465ee0a09c24068852efc2d578f7d224c4c2fb2c8b9accdff3ff34320c8066ca92a66bb05787e0fc13c7e0a4e342d5f7b32081df
+  data.tar.gz: 03b1c5f6a2f139eb2add02481c2f20581ab3e6dbfff42a16da3f7ea99ba45b4df799c0e00141d09b4b26c839e91bf504bca2f69bb6a0f0a2be23de5b2f6e9f47

data/lib/super_stack/manager.rb

@@ -32,21 +32,20 @@ module SuperStack
       return [] if layers.empty?
       return layers[0] if layers.count == 1
       first_layer = layers.shift
+      first_layer = first_layer.disabled? ? SuperStack::Layer.new : first_layer
       res = layers.inject(first_layer) do |stack, layer|
         if layer.disabled?
           stack
         else
           policy_to_apply = layer.merge_policy.nil? ? default_merge_policy : layer.merge_policy
-          policy_to_apply.merge stack, layer
+          policy_to_apply.merge stack, stringify_keys(layer)
         end
       end
       if filter.nil?
         # Trick to return a bare hash
         {}.merge res
       else
-        value = res[filter]
-        value = res[filter.to_s] if filter.is_a? Symbol and value.nil?
-        value
+        res[filter.to_s]
       end
     end
 
@@ -103,6 +102,14 @@ module SuperStack
 
     private
 
+    def stringify_keys(hash)
+      hash.inject({}){|stringified_hash, (key, value)|
+        stringified_hash[key.to_s] = value
+        stringified_hash
+      }
+    end
+
+
     def get_existing_layer(layer_or_layer_name, error_message)
       layer_name = layer_or_layer_name.to_s if layer_or_layer_name.is_a? Symbol
       layer_name = layer_or_layer_name if layer_or_layer_name.is_a? String

data/lib/super_stack/version.rb

@@ -1,3 +1,3 @@
 module SuperStack
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_stack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler