safe_yaml 0.6.2 → 0.6.3

data/lib/safe_yaml/syck_resolver.rb

@@ -19,12 +19,17 @@ module SafeYAML
       map = node.value
 
       hash = {}
+
+      # Take the "<<" key nodes first, as these are meant to approximate a form of inheritance.
+      inheritors = map.keys.select { |node| resolve_node(node) == "<<" }
+      inheritors.each do |key|
+        value_node = map.delete(key)
+        hash.merge!(resolve_node(value_node))
+      end
+
+      # All that's left should be normal (non-"<<") nodes.
       map.each do |key_node, value_node|
-        if resolve_node(key_node) == "<<"
-          hash.merge!(resolve_node(value_node))
-        else
-          hash[resolve_node(key_node)] = resolve_node(value_node)
-        end
+        hash[resolve_node(key_node)] = resolve_node(value_node)
       end
 
       return hash
@@ -32,7 +37,6 @@ module SafeYAML
 
     def resolve_seq(node)
       seq = node.value
-
       seq.map { |node| resolve_node(node) }
     end
 

data/lib/safe_yaml/version.rb

@@ -1,3 +1,3 @@
 module SafeYAML
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/safe_yaml_spec.rb

@@ -108,6 +108,29 @@ describe YAML do
         }
       }
     end
+
+    it "correctly prefers explicitly defined values over default values from included sections" do
+      # Repeating this test 100 times to increase the likelihood of running into an issue caused by
+      # non-deterministic hash key enumeration.
+      100.times do
+        result = YAML.safe_load <<-YAML
+          defaults: &defaults
+            foo: foo
+            bar: bar
+            baz: baz
+          custom:
+            <<: *defaults
+            bar: custom_bar
+            baz: custom_baz
+        YAML
+
+        result["custom"].should == {
+          "foo" => "foo",
+          "bar" => "custom_bar",
+          "baz" => "custom_baz"
+        }
+      end
+    end
   end
 
   describe "unsafe_load_file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safe_yaml
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies: []
 description: Parse YAML safely, without that pesky arbitrary object deserialization
   vulnerability
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SameYAML provides an alternative implementation of YAML.load suitable for