cfa 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a1b7d04b80d8f3847c52a299c581eb93ce99504aa21df9ff777766fbdd9a693
-  data.tar.gz: eb11d86a2949be4b60227c4e6a2d834ad8c8fa9f142db99bbd4b011827cc27aa
+  metadata.gz: fd707324d0e3ad8265613743072f4557a1907be8c4db9074e323134eaa7acfe6
+  data.tar.gz: 0a7fc0fb5020ce4edbad0f47f6124b28904fdd039f8ccf0382e7781688f35a50
 SHA512:
-  metadata.gz: 0f6e65715be7e500b23ab82c025082c97c035af9ca878f76543fa571b3a22ea3feda7dc535fd974704d5e6b2a13465723068fa066dcd7eef75a1e28b9023d4bf
-  data.tar.gz: c4e7641eb00264924223db6491e09a80f4acb1c987074c579e63e78b22eae6caa94fe57319ba28d9fe4b4fea5a703f097579ce9a413641fc29c52decc364f09e
+  metadata.gz: b5b04935b9112cad8cbe806d6a23d3933d27c1ee2a6c0d198e92a30a72e493d9034883424e1e46301b740eea7e49f6324ec3d7c760ca0cc58c1f13e487d9e53b
+  data.tar.gz: 42c7343d2933ad4ef95d363ccbaf55d9d366d35ef98eb7cc0dfc4d506b52f2cc0044f085afd0bb9754c9653f47fde430eeb332e23e8f66b84410a09819f02bad

data/lib/cfa/augeas_parser/writer.rb

@@ -301,12 +301,35 @@ module CFA
       # @param preceding [LocatedEntry]
       def path_after(preceding)
         paths = aug.match(preceding.prefix + "/*")
-        preceding_index = paths.index(preceding.path)
-        # it can happen, that insertion change previous entry from
-        # e.g. #comment to #comment[1]. Can happen only if it switch from
-        # single entry to collection
-        preceding_index ||= paths.index(preceding.path + "[1]")
-        paths[preceding_index + 1]
+        paths[find_preceding_index(paths, preceding) + 1]
+      end
+
+      def find_preceding_index(paths, preceding)
+        path = preceding.path
+        # common case, just included
+        return paths.index(path) if paths.include?(path)
+
+        # not found, so it means that some collection or single entry switch
+        new_path = +"/"
+        path.split("/").each do |element|
+          new_path << "/" unless new_path.end_with?("/")
+          new_path << pick_candidate(paths, new_path, element)
+        end
+
+        paths.index(new_path) ||
+          raise("Cannot find path #{preceding.path} in #{paths.inspect}")
+      end
+
+      # it returns variant of element that exists in path
+      def pick_candidate(paths, new_path, element)
+        # NOTE: order here is important due to early matching
+        candidates = [element + "/", element + "[1]",
+                      element.sub(/\[\d+\]/, ""), element]
+        paths.each do |p|
+          candidates.each do |c|
+            return c if p.start_with?(new_path + c)
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-augeas