json_refs 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d9b14ec87e1407d7d3b00072fb482411ca869be27fb0a0834b318f36fe67bf
-  data.tar.gz: a2da652fad017f11c8351cea424d5bf9771e1d316fb23c953f28d7f2d34601d9
+  metadata.gz: 1189625a84d998e3d9a6f249368c187bf0144393271aec06398830ba0ddc66a1
+  data.tar.gz: c079bf4dbf63782819d5d1081396c7f9e8ad9f155e5ef701ca337a6a21f3a176
 SHA512:
-  metadata.gz: 227cfbe8ae21a70547f77dd3985b6d7f2213d053e9691edf025cedb884f1a810a019399ab6ec0bba649370ce1da21490f102ceb4977643f968112f558ac671e8
-  data.tar.gz: 9022c0601623fe3c21cfafe5b480ae5c2feeefd2dff89cc6a436b54d0087ab275aaee11c683af8aa1239abdef21baec7476fe3d93743a322272ee24b9ab8c998
+  metadata.gz: b18e096f64d639506cc39728e426af5ff276bee765c69331ba9a32d401299439367a851142717ab51214755ef2934eb34793a582e3cda73782fd8f5394eef3ce
+  data.tar.gz: afab208bf473c6f575761b0e51a83a99e8abefe625e185f13ebb93caed688e9e882eba9bdec49925a53e646eb22d61f59b6d4d8aec3db219ef2f28e09964c1fa

data/.travis.yml

@@ -1,6 +1,13 @@
 sudo: false
+
 language: ruby
+
 rvm:
-  - 2.3.5
-  - 2.4.2
-  - 2.5.1
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+
+before_install:
+  - gem install -N bundler

data/json_refs.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hana"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/json_refs/loader.rb

@@ -27,8 +27,7 @@ module JsonRefs
     end
 
     def handle(filename)
-      f = open(filename)
-      @body = f.read
+      @body = read_reference_file(filename)
       ext = File.extname(filename)[1..-1]
       ext ||= 'json' if json?(@body)
       ext && EXTENSIONS.include?(ext) ? EXTENSIONS[ext].new.call(@body) : @body
@@ -40,5 +39,15 @@ module JsonRefs
     rescue JSON::ParserError => e
       false
     end
+
+    private
+
+    def read_reference_file(filename)
+      if RUBY_VERSION >= '2.7.0'
+        URI.open(filename, 'r', &:read)
+      else
+        open(filename, 'r', &:read)
+      end
+    end
   end
 end

data/lib/json_refs/version.rb

@@ -1,3 +1,3 @@
 module JsonRefs
-  VERSION = "0.1.3"
+  VERSION = "0.1.7"
 end

data/lib/json_refs.rb

@@ -2,8 +2,12 @@ require 'json_refs/version'
 require 'json_refs/dereference_handler'
 
 module JsonRefs
-  def self.call(doc, options = {})
-    Dereferencer.new(doc, options).call
+  class << self
+    def call(doc, options = {})
+      Dereferencer.new(doc, options).call
+    end
+
+    alias_method :dereference, :call
   end
 
   class Dereferencer
@@ -36,7 +40,14 @@ module JsonRefs
       target = paths.inject(@doc) do |obj, key|
         obj[key]
       end
-      target[key] = referenced_value(referenced_path)
+      value = follow_referenced_value(referenced_path)
+      target[key] = value
+    end
+
+    def follow_referenced_value(referenced_path)
+      value = referenced_value(referenced_path)
+      return referenced_value(value['$ref']) if value.is_a?(Hash) && value.has_key?('$ref')
+      value
     end
 
     def referenced_value(referenced_path)
@@ -44,16 +55,22 @@ module JsonRefs
         puts "De-referencing #{referenced_path}"
       end
 
-      if referenced_path =~ /^#/
-        dereference_local(referenced_path)
-      else
-        dereference_file(referenced_path)
-      end
+      filepath, pointer = referenced_path.split('#')
+      pointer.prepend('#') if pointer
+      return dereference_local(pointer) if filepath.empty?
+
+      dereferenced_file = dereference_file(filepath)
+      return dereferenced_file if pointer.nil?
+
+      JsonRefs::DereferenceHandler::Local.new(
+        doc: dereferenced_file,
+        path: pointer
+      ).call
     end
 
     def dereference_local(referenced_path)
       if @options[:resolve_local_ref] === false
-        return { '$ref': referenced_path }
+        return { '$ref' => referenced_path }
       end
 
       klass = JsonRefs::DereferenceHandler::Local
@@ -62,7 +79,7 @@ module JsonRefs
 
     def dereference_file(referenced_path)
       if @options[:resolve_file_ref] === false
-        return { '$ref': referenced_path }
+        return { '$ref' => referenced_path }
       end
 
       klass = JsonRefs::DereferenceHandler::File
@@ -80,7 +97,7 @@ module JsonRefs
     def recursive_dereference(referenced_path, klass)
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_refs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - Makoto Tajitsu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hana
@@ -42,14 +42,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -91,7 +91,7 @@ homepage: https://github.com/tzmfreedom/json_refs
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Dereference JSON Pointer
 test_files: []