patchyaml 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09030d2cd8460fc135a5b74cc74277933efb7b9ba90c2cfa59fe14ea5de7496e'
-  data.tar.gz: 2ba8dddffcd1aa85adcaf10ae2aa92583a7ab10b61eb6c09be6771b9947adb33
+  metadata.gz: 27d24b69a097c75a45afb302b0b4199b9bc2ed45bd34d8cf141717def23e6f03
+  data.tar.gz: ec42ec73c55a184ee211cc1b9fbc3f907380d85fa2b5fc951bdaeb2abde66e69
 SHA512:
-  metadata.gz: 7e4d2de2e5ea6b51a40788003ca8284a5c73a025ddcc12c5f4cecb59359809ed055423e119fa2f7e16651ecdd93936feeca3cc1552b1db9a800f9965d7e31508
-  data.tar.gz: 0603fc03c1bbc826ddd80ec3f04d9cbf1d9a75ab065ce62e0485ad307add6146cf8ac9ef82430933aad3f02d02516343f6fb1cba33884fced9e447f98bf99b6a
+  metadata.gz: 579bec7e6859c1befd69cebcbf7e67d1ab7c4352bfd377160838fbd89d22d98602d251e64772d26d1428fa9e801202cd881ed7e2d35625b5e499a7498328c3f2
+  data.tar.gz: c0e4cdc1e179f6832663a102585e838a79f7083f8c7f1abad058685214ef5af8c2b3f1531acaf40543aeb8cdf6fe3fa77b856e0b1a957f087aafdc3ad44ea700

data/lib/patchyaml/editor.rb

@@ -15,7 +15,7 @@ module PatchYAML
     #
     # Returns true if the path exists, false otherwise.
     def exist?(path)
-      value, parent = find(@stream, path)
+      value, = find(@stream, path)
       !value.nil?
     end
 
@@ -73,7 +73,7 @@ module PatchYAML
     private
 
     def reload(data)
-      @data = data
+      @data = data.end_with?("\n") ? data : data.concat("\n")
       @line_sizes = [0] + data.split("\n").map { it.length + 1 }
       begin
         @stream = Psych.parse_stream(data)

data/lib/patchyaml/find.rb

@@ -29,7 +29,7 @@ module PatchYAML
 
           [find_node(node, part), node]
         when NilClass
-          return []
+          []
         else
           raise "patchyaml: Unexpected node #{from.first.class} in #find_node"
         end

data/lib/patchyaml/pipeline.rb

@@ -104,6 +104,22 @@ module PatchYAML
       end
     end
 
+    def detect_stripped_whitespace(from)
+      stripped = []
+      loop do
+        case @data[from]
+        when " ", "\t"
+          stripped << @data[from]
+          from -= 1
+        when "\n"
+          stripped << "\n"
+          return stripped.reverse.join
+        else
+          return ""
+        end
+      end
+    end
+
     # TODO: update_* does not take into consideration adding a complex, multiline
     # value into an inline parent. This will certainly break things.
     def update_mapping(value, parent, new_value)
@@ -112,15 +128,33 @@ module PatchYAML
       start_at = start_offset(value)
       end_at = end_offset(value)
       yaml_value = dump_yaml(new_value, indent: key.start_column + 2)
-      indent = if new_value.is_a?(Hash) || (new_value.is_a?(Array) && parent.style != Psych::Nodes::Mapping::FLOW)
-        start_at -= 1 while @data[start_at - 1] == " "
+      start_at -= 1 while @data[start_at - 1] == " "
+
+      # Psych assumes trailing whitespaces belong to the current value,
+      # which may cause newlines to be stripped when replacing a whole
+      # block. Here we detect how much was removed, so we can re-add it
+      # later when reassembling the file.
+      stripped = detect_stripped_whitespace(end_at - 1)
+
+      # rubocop:disable Lint/DuplicateBranch
+      indent = case
+      when new_value.is_a?(Hash)
         "\n#{" " * (key.start_column + 2)}"
+      when new_value.is_a?(Array) && value.style == Psych::Nodes::Sequence::FLOW && value.children.empty?
+        "\n#{" " * (key.start_column + 2)}"
+      when new_value.is_a?(Array) && parent.style != Psych::Nodes::Mapping::FLOW
+        (" " * (key.start_column + 2)).to_s
+      when new_value.is_a?(String)
+        " "
       else
-        ""
+        (" " * (key.start_column + 2)).to_s
       end
+      # rubocop:enable Lint/DuplicateBranch
+
       @data = @data[...start_at]
         .concat(indent)
         .concat(yaml_value)
+        .concat(stripped)
         .concat(@data[end_at...])
     end
 

data/lib/patchyaml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Patchyaml
-  VERSION = "0.1.2"
-end
+  VERSION = "0.1.4"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patchyaml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Vito Sartori