Put file loading code inside FileLoader module

lib/openapi_first.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 require 'multi_json'
-require_relative 'openapi_first/refs'
+require_relative 'openapi_first/file_loader'
 require_relative 'openapi_first/errors'
 require_relative 'openapi_first/configuration'
 require_relative 'openapi_first/definition'
@@ -53,7 +53,7 @@ def self.find_error_response(name)
   def self.load(filepath, only: nil, &)
     raise FileNotFoundError, "File not found: #{filepath}" unless File.exist?(filepath)
 
-    contents = Refs.load_file(filepath)
+    contents = FileLoader.load(filepath)
     parse(contents, only:, filepath:, &)
   end
 

lib/openapi_first/builder.rb

@@ -18,7 +18,7 @@ def self.build_router(contents, filepath:, config:)
 
     def initialize(contents, filepath:, config:)
       ref_resolver = JSONSchemer::CachedResolver.new do |uri|
-        Refs.load_file(File.join(File.dirname(filepath), uri.path))
+        FileLoader.load(File.join(File.dirname(filepath), uri.path))
       end
       configuration = JSONSchemer::Configuration.new(
         ref_resolver:,

lib/openapi_first/file_loader.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OpenapiFirst
+  # Functions to handle $refs
+  # @!visibility private
+  module FileLoader
+    module_function
+
+    def load(file_path)
+      raise FileNotFoundError, "File not found #{file_path}" unless File.exist?(file_path)
+
+      body = File.read(file_path)
+      extname = File.extname(file_path)
+      return JSON.parse(body) if extname == '.json'
+      return YAML.unsafe_load(body) if ['.yaml', '.yml'].include?(extname)
+
+      body
+    end
+  end
+end

lib/openapi_first/resolved.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OpenapiFirst
   # This is here to give easy access to resolved $refs
   # @visibility private
@@ -15,10 +17,8 @@ def [](key)
       self.class.new(value, context:)
     end
 
-    def each
-      resolved.each do |key, value|
-        yield key, value
-      end
+    def each(&)
+      resolved.each(&)
     end
 
     def resolved
@@ -27,9 +27,11 @@ def resolved
       elsif value.is_a?(Array)
         return value.map do |item|
           break item.resolved if item.is_a?(Resolved)
+
           item
         end
       end
+
       value
     end
 
@@ -38,10 +40,10 @@ def resolved
     private attr_accessor :value
     private attr_accessor :context
 
-
     def resolve_ref(pointer)
       value = Hana::Pointer.new(pointer[1..]).eval(context)
       raise "Unknown reference #{pointer} in #{context}" unless value
+
       value
     end
   end

spec/data/petstore.yml

@@ -0,0 +1,94 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: A paged array of pets
+          headers:
+            x-next:
+              description: A link to the next page of responses
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+    post:
+      summary: Create a pet
+      operationId: createPets
+      tags:
+        - pets
+      responses:
+        '201':
+          description: Null response
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /pets/{petId}:
+    get:
+      summary: Info for a specific pet
+      operationId: showPetById
+      tags:
+        - pets
+      parameters:
+        - name: petId
+          in: path
+          required: true
+          description: The id of the pet to retrieve
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Expected response to a valid request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+components:
+  schemas:
+    Pets:
+      type: array
+      title: Pets
+      items:
+        $ref: "#/components/schemas/Pet"
+    Pet:
+      $ref: "./components/schemas/pet.yaml#/Pet"
+    Error:
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string

spec/file_loader_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe OpenapiFirst::FileLoader do
+  describe '.load' do
+    it 'loads .json' do
+      contents = described_class.load('./spec/data/petstore.json')
+      expect(contents['openapi']).to eq('3.0.0')
+    end
+
+    it 'loads .yaml' do
+      contents = described_class.load('./spec/data/petstore.yaml')
+      expect(contents['openapi']).to eq('3.0.0')
+    end
+
+    it 'loads .yml' do
+      contents = described_class.load('./spec/data/petstore.yml')
+      expect(contents['openapi']).to eq('3.0.0')
+    end
+
+    it 'raises FileNotFoundError if file was not found' do
+      expect { described_class.load('./spec/data/unknown.yaml') }.to raise_error(OpenapiFirst::FileNotFoundError, 'File not found ./spec/data/unknown.yaml')
+    end
+  end
+end

spec/resolved_spec.rb

@@ -1,5 +1,6 @@
-require_relative '../lib/openapi_first/resolved'
+# frozen_string_literal: true
 
+require_relative '../lib/openapi_first/resolved'
 
 RSpec.describe OpenapiFirst::Resolved do
   let(:original_hash) do