yaml_ref_resolver 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ffeab1d9592dea1cb891998e1f8a804a12079f2
-  data.tar.gz: c43a4ced279e3ab1efaa91156cb67f8ac76969f5
+  metadata.gz: 3d7f42af28ee1b2b85cb5657be83f8096e3f34bc
+  data.tar.gz: dcba469e9cf920b111a14b480a6aacb3b4d70d59
 SHA512:
-  metadata.gz: 7b56653ef77227ba2de13f9218ad6fbb02939ba2cd123056b8a055fe67d86154690774061660540b7462d67f471ca82de278438005e8bfca7e81fd4064960f5f
-  data.tar.gz: 3d3ee1d47be56c22ea65d255f64731f7d696b219a99e85e6e8e27d4590724636307af1c0fdc4ba3fc0ce3c4e476ba30201d48d9763f0375f63710d0652d47168
+  metadata.gz: 6339ebc5a39a7224861642ad2fe480196eb2c494b694d7087cdeb32f18c3cb061a18dac42a64c186929af3854e6911203a145028648734339df754f8f1976225
+  data.tar.gz: 689dac3c5b409db892cf78b99767142939f58dca790ef44db9d914ab0b21a5465831aa51106f07c71cc173eaa0e6f56785b77fa4ca15253808806819d55731a0

data/lib/yaml_ref_resolver/version.rb

@@ -1,3 +1,3 @@
 class YamlRefResolver
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/yaml_ref_resolver.rb

@@ -4,37 +4,73 @@ require "yaml"
 class YamlRefResolver
   def initialize(opts = {})
     @key = opts[:key] || '$ref'
+    @yaml = {}
   end
 
   def resolve(path)
-    resolve_refs(YAML.load_file(path), File.dirname(path))
+    entry_point = File.expand_path(path)
+    preload_ref_yamls(entry_point)
+
+    resolve_refs(@yaml[entry_point], entry_point)
   end
 
   private
 
-  def resolve_refs(obj, base)
-    return resolve_hash(obj, base)  if obj.is_a? Hash
-    return resolve_array(obj, base) if obj.is_a? Array
+  def preload_ref_yamls(abs_path)
+    return if @yaml.has_key?(abs_path)
+
+    @yaml[abs_path] = YAML.load_file(abs_path)
+    find_refs(@yaml[abs_path]).each do |ref_target|
+      rel_path, pos = ref_target.split('#')
+      preload_ref_yamls(File.expand_path(rel_path, File.dirname(abs_path)))
+    end
+  end
+
+  def find_refs(obj)
+    do_find_refs(obj).flatten.compact
+  end
+
+  def do_find_refs(obj)
+    return do_find_refs_hash(obj)  if obj.is_a? Hash
+    return do_find_refs_array(obj) if obj.is_a? Array
+    return []
+  end
+
+  def do_find_refs_hash(hash)
+    hash.inject([]) {|acc, (key, val)| acc << (key == @key ? val : do_find_refs(val)) }
+  end
+
+  def do_find_refs_array(array)
+    array.map {|e| find_refs(e) }
+  end
+
+  def resolve_refs(obj, referrer)
+    return resolve_hash(obj, referrer)  if obj.is_a? Hash
+    return resolve_array(obj, referrer) if obj.is_a? Array
     return obj
   end
 
-  def resolve_hash(hash, base)
-    resolved = hash.map do |k, v|
-      if k == @key
-        path, pos = v.split('#')
-        ref_path = File.join(base, path)
-        ref = self.resolve(ref_path)
+  def resolve_hash(hash, referrer)
+    resolved = hash.map do |key, val|
+      if key == @key
+        path, pos = val.split('#')
+        ref_path = File.expand_path(path, File.dirname(referrer))
+        pos_keys = pos.split('/').reject {|s| s == "" }
 
-        pos.split('/').reject {|e| e == "" }.inject(ref) {|obj, key| obj[key] }
+        if pos_keys.size == 0
+          resolve_refs(@yaml[ref_path], ref_path)
+        else
+          resolve_refs(@yaml[ref_path].dig(*pos_keys), ref_path)
+        end
       else
-        Hash[k, resolve_refs(v, base)]
+        Hash[key, resolve_refs(val, referrer)]
       end
     end
 
     resolved.inject{|h1, h2| h1.merge h2 }
   end
 
-  def resolve_array(array, base)
-    array.map {|e| resolve_refs(e, base) }
+  def resolve_array(array, referrer)
+    array.map {|e| resolve_refs(e, referrer) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_ref_resolver
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joe-noh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Resolves referencing to other YAML files.