codeclimate-yaml 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8744a4c6ac64def6988bfdcd0b4ffb820e3d54ee
-  data.tar.gz: 1e6901cf5ed4cdd3cf28fcfb7e7f25728145ad2d
+  metadata.gz: 71d782fa25bad738efd94fcc20f94902ac73d485
+  data.tar.gz: c22fdb5275b93887fefd1f6cb11a925089fd4a30
 SHA512:
-  metadata.gz: 5c1ea958544066b658210a893375fef2137cec9f2ec62a5b236b59e8336cd3c65679d68b216fbc4a696412c87d2ce7258e3a1ddc1775b23387339142ce3337ba
-  data.tar.gz: d8b3704063ac92cdbf72437d354ac3c5c99ddb9fdfa213f4972fd05bd5e7a14eef461b528caedde8f81fb4fd0bfb1eea9482ebe3c6045a5bae2a3b0c2d7fa3bf
+  metadata.gz: e876bb9daf725313ac2ded6d0ded54464b4bfe57e38e4dff07aaf371d2daa51dd646dd19fd3bdc4202f3a4c05c80f1f55ede032e8cad96c6a388a4f23b01c7b3
+  data.tar.gz: bc1ff4e054002bb4b3c100805100de89adee6fd9438538860134d3a2d3c61865299f43004f69f74b53044bfc72cab9d7f2965c1d14ace12df4181acf2a4f0a83

data/lib/cc/yaml/nodes.rb

@@ -10,6 +10,7 @@ module CC
       autoload :GlobList, "cc/yaml/nodes/glob_list"
       autoload :LanguageList, "cc/yaml/nodes/language_list"
       autoload :Mapping, "cc/yaml/nodes/mapping"
+      autoload :NestedConfig, "cc/yaml/nodes/nested_config"
       autoload :Node, "cc/yaml/nodes/node"
       autoload :OpenMapping, "cc/yaml/nodes/open_mapping"
       autoload :Ratings, "cc/yaml/nodes/ratings"

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

@@ -1,7 +1,7 @@
 module CC
   module Yaml
     module Nodes
-      class EngineConfig < OpenMapping
+      class EngineConfig < NestedConfig
         prefix_scalar :file
       end
     end

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

@@ -35,7 +35,7 @@ module CC::Yaml
         define_method("#{key}?") { | | !!self[key]     } unless method_defined? "#{key}?"
       end
 
-      def self.subnode_for(key)
+      def self.subnode_for_key(key)
         mapping[aliases.fetch(key.to_s, key.to_s)]
       end
 
@@ -72,13 +72,12 @@ module CC::Yaml
       end
 
       def visit_key_value(visitor, key, value)
-        node = subnode_for(key)
-        self[key] = node
-        visitor.accept(node, value)
+        node = subnode_for_key(key)
+        assign_node_and_visit(node, key, value, visitor)
       end
 
       def set_warnings(key)
-        if subnode_for(key)
+        if subnode_for_key(key)
           check_duplicates(key)
         else
           warning("unexpected key %p, dropping", key)
@@ -114,8 +113,8 @@ module CC::Yaml
         self.class.mapping.include? key
       end
 
-      def subnode_for(key)
-        type = self.class.subnode_for(key)
+      def subnode_for_key(key)
+        type = self.class.subnode_for_key(key)
         type.new(self) if type
       end
 
@@ -141,7 +140,7 @@ module CC::Yaml
       def verify_required
         self.class.required.each do |key|
           next if @mapping.include? key
-          type = self.class.subnode_for(key)
+          type = self.class.subnode_for_key(key)
           if type.has_default?
             warning "missing key %p, defaulting to %p", key, type.default
             @mapping[key] = type.new(self)
@@ -183,6 +182,11 @@ module CC::Yaml
 
       protected
 
+      def assign_node_and_visit(node, key, value, visitor)
+        self[key] = node
+        visitor.accept(node, value)
+      end
+
       def dup_values
         duped_mapping = @mapping.map { |key, value| [key.dup, value.dup] }
         @mapping      = Hash[duped_mapping]

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

@@ -0,0 +1,24 @@
+module CC
+  module Yaml
+    module Nodes
+      class NestedConfig < OpenMapping
+        def visit_key_value(visitor, key, value)
+          node = subnode_for_pair(key, value)
+          assign_node_and_visit(node, key, value, visitor)
+        end
+
+        protected
+
+        def subnode_for_pair(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)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module CC::Yaml
         @default_type ||= superclass.respond_to?(:default_type) ? superclass.default_type : Scalar
       end
 
-      def self.subnode_for(key)
+      def self.subnode_for_key(key)
         super(key) || default_type
       end
 

data/lib/cc/yaml/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Yaml
-    VERSION = "0.2.3".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-yaml
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: secure_string
@@ -55,6 +55,7 @@ files:
 - lib/cc/yaml/nodes/glob_list.rb
 - lib/cc/yaml/nodes/language_list.rb
 - lib/cc/yaml/nodes/mapping.rb
+- lib/cc/yaml/nodes/nested_config.rb
 - lib/cc/yaml/nodes/node.rb
 - lib/cc/yaml/nodes/open_mapping.rb
 - lib/cc/yaml/nodes/ratings.rb