json_refs 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3192dc90d1f03c619968c9a04fb9dce1ed954c7edf9d25b5d2ec3ce2fb28e3ef
-  data.tar.gz: 854faad63c25ac8140bef79411850c4bc1d83078b613fac740a1d678e37f0d24
+  metadata.gz: ac8b41fb0b17e6fd994f10e4300d37be8e32c96a45f86a565d79a72315f858e3
+  data.tar.gz: cdc3180ec3c492f86ac4250e2a716953d0c70523ade7aa749411998761d16174
 SHA512:
-  metadata.gz: 56a13e01d8bda8d1f082cf0b60803fd9f84cfcb519818beaafe7e6b20f181e591f0b3a01842c6fd8a88a2711372c3980217072386ae7fe2c4fee786470752665
-  data.tar.gz: defa91538c2a50339efbb1155382bf04ac7eadeea27a0f8202e4c3847c5b87138fe06bdf6e0125eee74038a1979a58d162b1bb8d40a400edca6dbdf426d8e11d
+  metadata.gz: 4f01c5505778ec33889fb382607eedd229b35d6d5ee5f209c79bc64ce0d6dca516f8deba10ecda62021d4def351dcc6acdf9a8d7097c571899b8b894cb229af5
+  data.tar.gz: f6fc1d89b79506dba84759e5d88e09b0909d6e4f593614c74cabdeb2095a22e7ca97361774b73aeed83e2ce8c9c50117c79e1c54b72dbf2b38b57473a576e7af

data/README.md

@@ -25,6 +25,8 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
+JsonRefs.load('my/file.yaml') # or .yml, .json
+
 json = { 'a' => 'foo', 'b' => { '$ref' => '#/a' } }
 JsonRefs.(json) # {"a"=>"foo", "b"=>"foo"}
 ```

data/lib/json_refs/version.rb

@@ -1,3 +1,3 @@
 module JsonRefs
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/json_refs.rb

@@ -4,16 +4,23 @@ require 'json_refs/dereference_handler'
 module JsonRefs
   class << self
     def call(doc, options = {})
-      Dereferencer.new(doc, options).call
+      Dereferencer.new(Dir.pwd, doc, options).call
     end
 
     alias_method :dereference, :call
+
+    def load(filename, options = {})
+      doc_dir = File.dirname(filename)
+      doc = Loader.handle(filename)
+      Dereferencer.new(doc_dir, doc, options).call
+    end
   end
 
   class Dereferencer
-    def initialize(doc, options = {})
+    def initialize(doc_dir, doc, options = {})
       @doc = doc
       @options = options
+      @doc_dir = doc_dir
     end
 
     def call(doc = @doc, keys = [])
@@ -35,6 +42,8 @@ module JsonRefs
 
     private
 
+    attr_reader :doc_dir
+
     def dereference(paths, referenced_path)
       key = paths.pop
       target = paths.inject(@doc) do |obj, key|
@@ -95,15 +104,13 @@ module JsonRefs
     end
 
     def recursive_dereference(referenced_path, klass)
+      unless File.absolute_path?(referenced_path)
+        referenced_path = "#{doc_dir}/#{referenced_path}"
+      end
       directory = File.dirname(referenced_path)
-      filename = File.basename(referenced_path)
 
-      dereferenced_doc = {}
-      Dir.chdir(directory) do
-        referenced_doc = klass.new(path: filename, doc: @doc).call
-        dereferenced_doc = Dereferencer.new(referenced_doc, @options).call
-      end
-      dereferenced_doc
+      referenced_doc = klass.new(path: referenced_path, doc: @doc).call
+      Dereferencer.new(directory, referenced_doc, @options).call
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_refs
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Makoto Tajitsu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana