codeclimate-yaml 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b71f5275d2290ef4dca8a75e6d16c925811fa7
-  data.tar.gz: f522feafc0362ed0e5a3b30f327f6f967ad9b29c
+  metadata.gz: 56bfd6fdea44b1984d887361fe8e8a0c0fe7b780
+  data.tar.gz: 9c2cb42b02eb6915b47016ce199a464c77a3f821
 SHA512:
-  metadata.gz: b3e247c9cc22d3cf612c0eea805a1d9d33a324855fa10db8e2d517ac41affa294bb2ae768d7b6257f11df11f491a1a47613cfca602e95445fe34fc77ec428754
-  data.tar.gz: 5e4cc074a59d32a4cf2875c3dc327e5d2c4d5ede5af6b098ce43796186275ae046587f1e6a18cb4d0e75d535c03a45f0ee4c7ee4295b51e1788909781b348396
+  metadata.gz: 436bc46332ab17eb4e393e22a3afcace0917fcb14099f4d0889fbcd3bb29aa2b4036125dc366137a9f9f2fe77ae81ebdcfcb6bc8b6cdf4644dc4085adc994dbc
+  data.tar.gz: b77518bf2d12fc22722c3eb03119f814ba484e318d3ef2f9c40321f3f81b03154d33d5e48990a954d31e6dde7fe129924bd99cc34d17eafaa3f54d54ccf4146d

data/lib/cc/yaml/nodes/mapping.rb

@@ -65,19 +65,19 @@ module CC::Yaml
 
       def visit_pair(visitor, key, value)
         key = visitor.generate_key(self, key)
-        unless set_warnings(key)
+        unless set_warnings(visitor, key, value)
           check_incompatibility(key)
           visit_key_value(visitor, key, value)
         end
       end
 
       def visit_key_value(visitor, key, value)
-        node = subnode_for_key(key)
+        node = subnode_for(visitor, key, value)
         assign_node_and_visit(node, key, value, visitor)
       end
 
-      def set_warnings(key)
-        if subnode_for_key(key)
+      def set_warnings(visitor, key, value)
+        if subnode_for(visitor, key, value)
           check_duplicates(key)
         else
           warning("unexpected key %p, dropping", key)
@@ -113,7 +113,7 @@ module CC::Yaml
         self.class.mapping.include? key
       end
 
-      def subnode_for_key(key)
+      def subnode_for(_visitor, key, _value)
         type = self.class.subnode_for_key(key)
         type.new(self) if type
       end

data/lib/cc/yaml/nodes/nested_config.rb

@@ -3,19 +3,19 @@ module CC
     module Nodes
       class NestedConfig < OpenMapping
         def visit_key_value(visitor, key, value)
-          node = subnode_for_pair(key, value)
+          node = subnode_for_pair(visitor, key, value)
           assign_node_and_visit(node, key, value, visitor)
         end
 
         protected
 
-        def subnode_for_pair(key, value)
+        def subnode_for_pair(visitor, key, value)
           if value.is_a?(::Psych::Nodes::Mapping)
             NestedConfig.new(self)
           elsif value.is_a?(::Psych::Nodes::Sequence)
             Sequence.new(self)
           else
-            subnode_for_key(key)
+            subnode_for(visitor, key, value)
           end
         end
       end

data/lib/cc/yaml/nodes/open_mapping.rb

@@ -3,11 +3,12 @@ module CC::Yaml
     class OpenMapping < Mapping
       def self.default_type(identifier = nil)
         @default_type = Nodes[identifier] if identifier
-        @default_type ||= superclass.respond_to?(:default_type) ? superclass.default_type : Scalar
+        @default_type ||= superclass.respond_to?(:default_type) ? superclass.default_type : nil
       end
 
-      def self.subnode_for_key(key)
-        super(key) || default_type
+      def subnode_for(visitor, key, value)
+        klass = self.class.subnode_for_key(key) || self.class.default_type || visitor.node_wrapper_class(value)
+        klass.new(self)
       end
 
       def accept_key?(key)

data/lib/cc/yaml/nodes/sequence.rb

@@ -11,7 +11,7 @@ module CC::Yaml
 
       def self.type(identifier = nil)
         @type = Nodes[identifier] if identifier
-        @type ||= superclass.respond_to?(:type) ? superclass.type : Scalar
+        @type ||= superclass.respond_to?(:type) ? superclass.type : nil
       end
 
       def prepare
@@ -31,7 +31,12 @@ module CC::Yaml
       end
 
       def visit_child(visitor, value)
-        child = self.class.type.new(self)
+        child =
+          if self.class.type
+            self.class.type.new(self)
+          else
+            visitor.node_wrapper_class(value).new(self)
+          end
         visitor.accept(child, value)
         @children << child
       end

data/lib/cc/yaml/parser/psych.rb

@@ -160,6 +160,17 @@ module CC::Yaml
         end
       end
 
+      def node_wrapper_class(value)
+        case value
+        when ::Psych::Nodes::Scalar   then ::CC::Yaml::Nodes::Scalar
+        when ::Psych::Nodes::Mapping  then ::CC::Yaml::Nodes::OpenMapping
+        when ::Psych::Nodes::Sequence then ::CC::Yaml::Nodes::Sequence
+        when ::Psych::Nodes::Document then ::CC::Yaml::Nodes::OpenMapping
+        when ::Psych::Nodes::Stream   then ::CC::Yaml::Nodes::Sequence
+        else raise ArgumentError, "Can't coerce #{value.inspect}"
+        end
+      end
+
       def simple(value)
         case value
         when ::Psych::Nodes::Scalar   then value.value

data/lib/cc/yaml/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Yaml
-    VERSION = "0.10.1".freeze
+    VERSION = "0.10.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-yaml
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: secure_string