cfa 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f23e76c32a5d06c47db240cebb1a663a2a8ac46f
-  data.tar.gz: 957023925e970a78e46e37871c3eec06d57eea0b
+  metadata.gz: 462483ae4713b64048bae7313e741675c32e14ce
+  data.tar.gz: 3ae2dffb60221cf96ba4e7d09d22c558dbbf7ab9
 SHA512:
-  metadata.gz: 5d9d85bb04225dcf40c5899aa936429b6a30f9dd09104b74d69a7895a4c5fe2dae976b0affefada166424647999e8c45a4cfbc41766ae8efd901e03554a6d8b3
-  data.tar.gz: aa047a24855850d80377e0aa665aa47d307459db71111c1d1ae54a7cc598177300f065e0785725bc0ec814c69e27f593cb111cefcf75d7880aec5e8053c9c2a8
+  metadata.gz: 566cd667bcca679f1ce4e95105f8293f042822f9da63ad10063b2e717a6dca90dc57e20796f43332b9eadb27a4c3566ae4f412cf1203fd0bb0e3c0e92c6759d7
+  data.tar.gz: 26207c7926c12a48f003ca46366e5a3f58931852b872b01bf2620fcbb47c6546ce4534cc33f3db0af3edf7725772eac15f5f4517fbee60af34fe0b554224b2b3

data/lib/cfa/augeas_parser.rb

@@ -125,13 +125,12 @@ module CFA
 
     # @note for internal usage only
     # @private
-    def load_from_augeas(aug, prefix)
-      matches = aug.match("#{prefix}/*")
-
-      @data = matches.map do |aug_key|
+    def load_from_augeas(aug, prefix, keys_cache)
+      @data = keys_cache.keys_for_prefix(prefix).map do |key|
+        aug_key = prefix + "/" + key
         {
           key:   load_key(prefix, aug_key),
-          value: load_value(aug, aug_key)
+          value: load_value(aug, aug_key, keys_cache)
         }
       end
     end
@@ -178,16 +177,20 @@ module CFA
     end
 
     def load_key(prefix, aug_key)
-      key = aug_key.sub(/^#{Regexp.escape(prefix)}\//, "")
-      key.sub(/\[\d+\]$/, "[]")
+      # clean from key prefix and for collection remove number inside []
+      # +1 for size due to ending '/' not part of prefix
+      key = aug_key[(prefix.size + 1)..-1]
+      key.end_with?("]") ? key.sub(/\[\d+\]$/, "[]") : key
     end
 
-    def load_value(aug, aug_key)
-      nested = !aug.match("#{aug_key}/*").empty?
+    def load_value(aug, aug_key, keys_cache)
+      subkeys = keys_cache.keys_for_prefix(aug_key)
+
+      nested = !subkeys.empty?
       value = aug.get(aug_key)
       if nested
         subtree = AugeasTree.new
-        subtree.load_from_augeas(aug, aug_key)
+        subtree.load_from_augeas(aug, aug_key, keys_cache)
         value ? AugeasTreeValue.new(subtree, value) : subtree
       else
         value
@@ -220,8 +223,10 @@ module CFA
         aug.set("/input", raw_string)
         report_error(aug) unless aug.text_store(@lens, "/input", "/store")
 
+        keys_cache = AugeasKeysCache.new(aug)
+
         tree = AugeasTree.new
-        tree.load_from_augeas(aug, "/store")
+        tree.load_from_augeas(aug, "/store", keys_cache)
 
         return tree
       end
@@ -263,3 +268,52 @@ module CFA
     end
   end
 end
+
+# Cache that holds all avaiable keys in augeas tree. It is used to
+# prevent too many aug.match calls which are expensive.
+class AugeasKeysCache
+  STORE_PREFIX = "/store".freeze
+  STORE_LEN = STORE_PREFIX.size
+  STORE_LEN_1 = STORE_LEN + 1
+
+  # initialize cache from passed augeas object
+  def initialize(aug)
+    fill_cache(aug)
+  end
+
+  # returns list of keys available on given prefix
+  def keys_for_prefix(prefix)
+    cut = prefix.length > STORE_LEN ? STORE_LEN_1 : STORE_LEN
+    path = prefix[cut..-1]
+    path = path.split("/")
+    matches = path.reduce(@cache) { |a, e| a[e] }
+
+    matches.keys
+  end
+
+private
+
+  def fill_cache(aug)
+    @cache = {}
+    search_path = "#{STORE_PREFIX}/*"
+    loop do
+      matches = aug.match(search_path)
+      break if matches.empty?
+      assign_matches(matches, @cache)
+
+      search_path += "/*"
+    end
+  end
+
+  def assign_matches(matches, cache)
+    matches.each do |match|
+      path = match[STORE_LEN_1..-1].split("/")
+      leap = path.pop
+      target = path.reduce(cache) do |acc, p|
+        acc[p]
+      end
+
+      target[leap] = {}
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfa
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-augeas