yaml_ref_resolver 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15959cdb30b6bd1175233f3c88618cd02654ace
-  data.tar.gz: 11dab92dca480e42528fdcaa75018099dd70fa32
+  metadata.gz: 11b5ee504e3aa03e93bc04e602b2ef9f8dfafb25
+  data.tar.gz: 504177fda0c4e4b5d0c224780112bf5720a85c22
 SHA512:
-  metadata.gz: 7dbe62b28a440a9be12fe06546a4f34f7d7df1b091d22297ea4c9427febbba7dbc7d1b4e721bb5d4ef330e1cfba430a9b5638198cd948bcf36fa62081b3f4ae5
-  data.tar.gz: 4e196c70f1a6711faad5bcc72b4539fb18c3c67797a8084a8ad1307e51c15b89adbf65a0eb6766fc0443a2387f5d2f5be7c248ee2d958884bfa3ebd687ebbdd3
+  metadata.gz: 78c18f5058db6dfdd47ff70ed19c994d9a280188cb012f9a26bf18b15faeb00c000419d2ce5f57486e07db5939653cc39f6259abf5b7d9493de4ef711c8b7d18
+  data.tar.gz: ec9c2cb5b4c1a1d560ddaf6464168928fa5524095bb6f53582cb0e331e3b9456c3280bf402296750b975e6fe8bc9a5124b51546db53b871fb5e412c2e1a094c0

data/README.md

@@ -35,7 +35,7 @@ This gem resolves `$ref` references.
 ```ruby
 resolver = YamlRefResolver.new
 
-hash = resolver.resolve('index.yaml')
+hash = resolver.resolve!('index.yaml')
 #=> {'author' => {'name' => "john", 'age' => 28}}
 ```
 

data/lib/yaml_ref_resolver/cli.rb

@@ -23,30 +23,33 @@ class YamlRefResolver
 
       if @watch
         FileWatcher.new(resolver.files).watch do |filename|
-          resolver.reload(File.expand_path(filename))
-          resolve_and_dump
+          resolve_and_dump(File.expand_path filename)
         end
       end
     end
 
     private
 
-    def resolve_and_dump
+    def resolve_and_dump(changed_file = nil)
+      resolver.reload!(changed_file)
 
       if @output
         File.open(@output, "w") do |f|
-          f.puts yaml_or_json
+          f.puts resolved_yaml_or_json!
         end
+        log "bundled successfully."
       else
-        $stdout.write yaml_or_json
+        $stdout.write resolved_yaml_or_json!
       end
+    rescue => e
+      log e.message
     end
 
-    def yaml_or_json
+    def resolved_yaml_or_json!
       if @json
-        JSON.pretty_generate resolver.resolve(@input)
+        JSON.pretty_generate resolver.resolve!(@input)
       else
-        resolver.resolve(@input).to_yaml
+        resolver.resolve!(@input).to_yaml
       end
     end
 
@@ -92,5 +95,9 @@ class YamlRefResolver
         exit 1
       end
     end
+
+    def log(message)
+      puts "[#{Time.now}] #{message}"
+    end
   end
 end

data/lib/yaml_ref_resolver/exceptions.rb

@@ -0,0 +1,21 @@
+class YamlRefResolver
+  class YamlNotFoundException < StandardError
+    attr_reader :path
+
+    def initialize(path:)
+      @path = path
+
+      super("yaml file not found: #{path}")
+    end
+  end
+
+  class YamlSyntaxErrorException < StandardError
+    attr_reader :original_exception
+
+    def initialize(exception:)
+      @original_exception = exception
+
+      super("syntax error #{@original_exception.message}")
+    end
+  end
+end

data/lib/yaml_ref_resolver/version.rb

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

data/lib/yaml_ref_resolver/yaml.rb

@@ -1,13 +1,24 @@
-require "yaml_ref_resolver/ref"
 require "yaml"
 
 class YamlRefResolver::Yaml
   attr_reader :content
 
-  def initialize(path:, key: '$ref')
+  def self.load!(path:, key: '$ref')
+    if File.exists?(path)
+      begin
+        self.new(path, YAML.load_file(path), key)
+      rescue Psych::SyntaxError => e
+        raise YamlRefResolver::YamlSyntaxErrorException.new(exception: e)
+      end
+    else
+      raise YamlRefResolver::YamlNotFoundException.new(path: path)
+    end
+  end
+
+  def initialize(path, content, key)
     @filepath = path
+    @content = content
     @key = key
-    @content = YAML.load_file(path)
   end
 
   def refs

data/lib/yaml_ref_resolver.rb

@@ -1,5 +1,8 @@
 require "yaml_ref_resolver/version"
+require "yaml_ref_resolver/exceptions"
+require "yaml_ref_resolver/ref"
 require "yaml_ref_resolver/yaml"
+require "yaml"
 
 class YamlRefResolver
   def initialize(opts = {})
@@ -7,16 +10,24 @@ class YamlRefResolver
     @map = {}
   end
 
-  def resolve(path)
+  def resolve!(path)
     entry_point = File.expand_path(path)
-    preload(entry_point)
+    preload!(entry_point)
 
     resolve_refs(@map[entry_point].content, entry_point)
   end
 
-  def reload(path)
-    @map.delete(path)
-    preload(path)
+  def reload!(path)
+    return unless path
+
+    backup = @map.delete(path)
+
+    begin
+      preload!(path)
+    rescue => e
+      @map[path] = backup
+      raise e
+    end
   end
 
   def files
@@ -25,12 +36,12 @@ class YamlRefResolver
 
   private
 
-  def preload(abs_path)
+  def preload!(abs_path)
     return if @map.has_key?(abs_path)
 
-    @map[abs_path] = Yaml.new(path: abs_path, key: @key)
+    @map[abs_path] = Yaml.load!(path: abs_path, key: @key)
     @map[abs_path].refs.each do |ref|
-      preload(ref.abs_path)
+      preload!(ref.abs_path)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_ref_resolver
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Joe-noh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatcher
@@ -99,6 +99,7 @@ files:
 - exe/yaml_ref_resolver
 - lib/yaml_ref_resolver.rb
 - lib/yaml_ref_resolver/cli.rb
+- lib/yaml_ref_resolver/exceptions.rb
 - lib/yaml_ref_resolver/ref.rb
 - lib/yaml_ref_resolver/version.rb
 - lib/yaml_ref_resolver/yaml.rb
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Resolves referencing to other YAML files.