yaml_ref_resolver 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2565dc38efb9a0e8317a54550ddc80e81fc312fd
-  data.tar.gz: 08d97334000c2e541367b696b579dca8db7e9ce2
+  metadata.gz: b15959cdb30b6bd1175233f3c88618cd02654ace
+  data.tar.gz: 11dab92dca480e42528fdcaa75018099dd70fa32
 SHA512:
-  metadata.gz: 380e942e7dd2ba9327d0d9a959d4270fa3da2af89df909b29c22afe3a1f3e26d4f3d4036bc6e4c973c73e95b95f209bd5c5cc7172ea08c6cc65ed82f6ef9c6b1
-  data.tar.gz: eb3680a4034ea315ce9794de10f2234c3579e0f3d582c791048f32fefe35b00a9d7aee21f12db24eb34ccdf2bdccb920d866161a6154fce31f5fd3beb5cabd77
+  metadata.gz: 7dbe62b28a440a9be12fe06546a4f34f7d7df1b091d22297ea4c9427febbba7dbc7d1b4e721bb5d4ef330e1cfba430a9b5638198cd948bcf36fa62081b3f4ae5
+  data.tar.gz: 4e196c70f1a6711faad5bcc72b4539fb18c3c67797a8084a8ad1307e51c15b89adbf65a0eb6766fc0443a2387f5d2f5be7c248ee2d958884bfa3ebd687ebbdd3

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/yaml_ref_resolver.svg)](https://badge.fury.io/rb/yaml_ref_resolver)
 [![Build Status](https://travis-ci.org/Joe-noh/yaml_ref_resolver.svg?branch=master)](https://travis-ci.org/Joe-noh/yaml_ref_resolver)
 
-This is a gem that resolves `$ref` references to other YAML files.
+This is a gem that resolves and expands `$ref` references to other YAML files.
 
 ## Installation
 
@@ -61,7 +61,7 @@ Optionally output file path with `-o` or `--output` can be given.
 $ yaml_ref_resolver -i ./path/to/index.yaml -o ./path/to/output.yaml
 ```
 
-`-w` or `--watch` options watches referenced yaml files and dump whole resolved yaml when one of them changed.
+`-w` or `--watch` option watches referenced yaml files and dump whole resolved yaml when one of them changed.
 
 ```console
 $ yaml_ref_resolver -i ./path/to/index.yaml -w

data/lib/yaml_ref_resolver/ref.rb

@@ -0,0 +1,24 @@
+class YamlRefResolver::Ref
+  def initialize(target, base_path)
+    @base_dir = File.dirname(base_path)
+
+    if target.start_with?("#")
+      @target_file = nil
+      @target_level = target.sub("#", "")
+    elsif !target.include?("#")
+      @target_file = target
+      @target_level = "/"
+    else
+      @target_file, @target_level = target.split("#")
+    end
+  end
+
+  def abs_path
+    File.expand_path(@target_file, @base_dir)
+  end
+
+  def target_keys
+    @target_level.split("/").reject {|s| s == "" }
+  end
+end
+

data/lib/yaml_ref_resolver/version.rb

@@ -1,3 +1,3 @@
 class YamlRefResolver
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/yaml_ref_resolver/yaml.rb

@@ -0,0 +1,36 @@
+require "yaml_ref_resolver/ref"
+require "yaml"
+
+class YamlRefResolver::Yaml
+  attr_reader :content
+
+  def initialize(path:, key: '$ref')
+    @filepath = path
+    @key = key
+    @content = YAML.load_file(path)
+  end
+
+  def refs
+    find_refs(@content).flatten.compact.map do |ref|
+      YamlRefResolver::Ref.new(ref, @filepath)
+    end
+  end
+
+  private
+
+  def find_refs(obj)
+    return find_refs_hash(obj) if obj.is_a? Hash
+    return find_refs_array(obj) if obj.is_a? Array
+    return []
+  end
+
+  def find_refs_hash(hash)
+    hash.inject([]) do |acc, (key, val)|
+      acc << (key == @key ? val : find_refs(val))
+    end
+  end
+
+  def find_refs_array(array)
+    array.map {|elem| find_refs(elem) }
+  end
+end

data/lib/yaml_ref_resolver.rb

@@ -1,58 +1,39 @@
 require "yaml_ref_resolver/version"
-require "yaml"
+require "yaml_ref_resolver/yaml"
 
 class YamlRefResolver
   def initialize(opts = {})
     @key = opts[:key] || '$ref'
-    @yaml = {}
+    @map = {}
   end
 
   def resolve(path)
     entry_point = File.expand_path(path)
-    preload_ref_yamls(entry_point)
+    preload(entry_point)
 
-    resolve_refs(@yaml[entry_point], entry_point)
+    resolve_refs(@map[entry_point].content, entry_point)
   end
 
   def reload(path)
-    @yaml.delete(path)
-    preload_ref_yamls(path)
+    @map.delete(path)
+    preload(path)
   end
 
   def files
-    @yaml.keys
+    @map.keys
   end
 
   private
 
-  def preload_ref_yamls(abs_path)
-    return if @yaml.has_key?(abs_path)
+  def preload(abs_path)
+    return if @map.has_key?(abs_path)
 
-    @yaml[abs_path] = YAML.load_file(abs_path)
-    find_refs(@yaml[abs_path]).each do |ref_target|
-      rel_path, pos = parse_ref(ref_target)
-      preload_ref_yamls(File.expand_path(rel_path, File.dirname(abs_path)))
+    @map[abs_path] = Yaml.new(path: abs_path, key: @key)
+    @map[abs_path].refs.each do |ref|
+      preload(ref.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
@@ -62,14 +43,15 @@ class YamlRefResolver
   def resolve_hash(hash, referrer)
     resolved = hash.map do |key, val|
       if key == @key
-        path, pos = parse_ref(val)
-        ref_path = File.expand_path(path, File.dirname(referrer))
-        pos_keys = pos.split('/').reject {|s| s == "" }
+        ref = Ref.new(val, referrer)
+
+        ref_path = ref.abs_path
+        target_keys = ref.target_keys
 
-        if pos_keys.size == 0
-          resolve_refs(@yaml[ref_path], ref_path)
+        if target_keys.size == 0
+          resolve_refs(@map[ref_path].content, ref_path)
         else
-          resolve_refs(@yaml[ref_path].dig(*pos_keys), ref_path)
+          resolve_refs(@map[ref_path].content.dig(*target_keys), ref_path)
         end
       else
         Hash[key, resolve_refs(val, referrer)]
@@ -82,14 +64,4 @@ class YamlRefResolver
   def resolve_array(array, referrer)
     array.map {|e| resolve_refs(e, referrer) }
   end
-
-  def parse_ref(ref)
-    splitted = ref.split('#')
-
-    if splitted.size == 1
-      splitted << '/'
-    else
-      splitted
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_ref_resolver
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Joe-noh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher
@@ -99,7 +99,9 @@ files:
 - exe/yaml_ref_resolver
 - lib/yaml_ref_resolver.rb
 - lib/yaml_ref_resolver/cli.rb
+- lib/yaml_ref_resolver/ref.rb
 - lib/yaml_ref_resolver/version.rb
+- lib/yaml_ref_resolver/yaml.rb
 - yaml_ref_resolver.gemspec
 homepage: https://github.com/Joe-noh/yaml_ref_resolver
 licenses: