yamlook 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 968d1897a00350db31375552a70066d04d14c4edd7e52406ed2188e4951bb3e2
-  data.tar.gz: e45f29b9f4c56114fb8c5d546cc25d91f37c785575c1331879c774523b9ed8f6
+  metadata.gz: 0d23b18e7844fe59fd4e63d9031a8664748974e4701177a55d1fe130fcf6230e
+  data.tar.gz: 45ec40c52375b01174e55fa3a06774de919617e19a48580bed1b07b3029f075b
 SHA512:
-  metadata.gz: 3a667a39333140b85e9710f5d8a87e89b3e951fe634065e2f464ddc7e4d7beb23fbfac0096acd72bf01aeaa28a0a322221dca11d1174fbc88728a0f59703a735
-  data.tar.gz: a1415e35e038896b2205d5fa409483aceedefee8566d43a636471b23c89bb423b1ca7b4c3c650a0f23d5af8d05ea8a9c39865443baa0aeecc12cf9771eca2880
+  metadata.gz: a685cdb2af04bea727585f6ee62dff5cb2df9fdc7f2071bb8232bbc765c459a4a42ed00cfe9f17bea4909d6d58098b0ff0b966c878efc59a39f40b91fe3a9a3b
+  data.tar.gz: dbf70802c820a5a381788d7242c5fd8156dade79e2ca1e9b5c1a2be37e7de1bf729d5ff5bd7898a1b1af54000295fa7877a52a4cc92236756a7f4a62003b2d49

data/lib/yamlook/node.rb

@@ -6,13 +6,6 @@ module Yamlook
     attr_reader :value, :line, :column
     attr_accessor :filename
 
-    def initialize(value:, line:, column:, filename: nil)
-      @value = value
-      @line = line
-      @column = column
-      @filename = filename
-    end
-
     def self.from_scalar(scalar)
       return unless scalar
 
@@ -23,6 +16,13 @@ module Yamlook
       )
     end
 
+    def initialize(value:, line:, column:, filename: nil)
+      @value = value
+      @line = line
+      @column = column
+      @filename = filename
+    end
+
     def to_s
       "#{filename}:#{line}:#{column}\n#{value}"
     end

data/lib/yamlook/node_list.rb

@@ -8,6 +8,10 @@ module Yamlook
   class NodeList
     attr_reader :nodes
 
+    def self.from_mapping(mapping)
+      new(mapping.children)
+    end
+
     def initialize(nodes)
       @nodes = nodes
     end
@@ -16,11 +20,10 @@ module Yamlook
       keys.map.with_index do |_, index|
         key = keys[0..index].join('.')
         rest_keys = keys[index + 1..-1]
-
         result = find(key)
 
         case result
-        when NodeList then result.search(rest_keys)
+        when Mapping then NodeList.from_mapping(result).search(rest_keys)
         when Scalar then Node.from_scalar(result)
         end
       end
@@ -29,16 +32,11 @@ module Yamlook
     private
 
     def find(key)
-      scalar_index = find_scalar_index(key)
-      return unless scalar_index
-
-      result = nodes[scalar_index + 1]
-      return NodeList.new(result.children) if result.is_a?(Mapping)
-
-      result
+      key_node_index = find_key_node_index(key)
+      nodes[key_node_index + 1] if key_node_index
     end
 
-    def find_scalar_index(key)
+    def find_key_node_index(key)
       nodes.find_index { |node| node.is_a?(Scalar) && node.value == key }
     end
   end

data/lib/yamlook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yamlook
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamlook
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Viacheslav Mefodin