Rename Validators::Url to Validators::Uri

This doesn't anything specific for a URL.

Author: kevindew

lib/openapi3_parser/node_factory/contact.rb

@@ -3,7 +3,7 @@
 require "openapi3_parser/node_factory/object"
 require "openapi3_parser/validation/input_validator"
 require "openapi3_parser/validators/email"
-require "openapi3_parser/validators/url"
+require "openapi3_parser/validators/uri"
 
 module Openapi3Parser
   module NodeFactory
@@ -13,7 +13,7 @@ class Contact < NodeFactory::Object
       field "name", input_type: String
       field "url",
             input_type: String,
-            validate: Validation::InputValidator.new(Validators::Url)
+            validate: Validation::InputValidator.new(Validators::Uri)
       field "email",
             input_type: String,
             validate: Validation::InputValidator.new(Validators::Email)

lib/openapi3_parser/node_factory/example.rb

@@ -2,7 +2,7 @@
 
 require "openapi3_parser/node_factory/object"
 require "openapi3_parser/validation/input_validator"
-require "openapi3_parser/validators/url"
+require "openapi3_parser/validators/uri"
 
 module Openapi3Parser
   module NodeFactory
@@ -14,7 +14,7 @@ class Example < NodeFactory::Object
       field "value"
       field "externalValue",
             input_type: String,
-            validate: Validation::InputValidator.new(Validators::Url)
+            validate: Validation::InputValidator.new(Validators::Uri)
 
       mutually_exclusive "value", "externalValue"
 

lib/openapi3_parser/node_factory/external_documentation.rb

@@ -2,7 +2,7 @@
 
 require "openapi3_parser/node_factory/object"
 require "openapi3_parser/validation/input_validator"
-require "openapi3_parser/validators/url"
+require "openapi3_parser/validators/uri"
 
 module Openapi3Parser
   module NodeFactory
@@ -13,7 +13,7 @@ class ExternalDocumentation < NodeFactory::Object
       field "url",
             required: true,
             input_type: String,
-            validate: Validation::InputValidator.new(Validators::Url)
+            validate: Validation::InputValidator.new(Validators::Uri)
 
       def build_node(data, node_context)
         Node::ExternalDocumentation.new(data, node_context)

lib/openapi3_parser/node_factory/info.rb

@@ -4,7 +4,7 @@
 require "openapi3_parser/node_factory/license"
 require "openapi3_parser/node_factory/object"
 require "openapi3_parser/validation/input_validator"
-require "openapi3_parser/validators/url"
+require "openapi3_parser/validators/uri"
 
 module Openapi3Parser
   module NodeFactory
@@ -17,7 +17,7 @@ class Info < NodeFactory::Object
       field "description", input_type: String
       field "termsOfService",
             input_type: String,
-            validate: Validation::InputValidator.new(Validators::Url)
+            validate: Validation::InputValidator.new(Validators::Uri)
       field "contact", factory: NodeFactory::Contact
       field "license", factory: NodeFactory::License
       field "version", input_type: String, required: true

lib/openapi3_parser/node_factory/license.rb

@@ -2,7 +2,7 @@
 
 require "openapi3_parser/node_factory/object"
 require "openapi3_parser/validation/input_validator"
-require "openapi3_parser/validators/url"
+require "openapi3_parser/validators/uri"
 
 module Openapi3Parser
   module NodeFactory
@@ -14,7 +14,7 @@ class License < NodeFactory::Object
             allowed: ->(context) { context.openapi_version >= "3.1" }
       field "url",
             input_type: String,
-            validate: Validation::InputValidator.new(Validators::Url)
+            validate: Validation::InputValidator.new(Validators::Uri)
       mutually_exclusive "identifier", "url"
 
       def build_node(data, node_context)

lib/openapi3_parser/node_factory/openapi.rb

@@ -13,6 +13,10 @@ class Openapi < NodeFactory::Object
 
       field "openapi", input_type: String, required: true
       field "info", factory: NodeFactory::Info, required: true
+      field "jsonSchemaDialect",
+            default: "https://spec.openapis.org/oas/3.1/dialect/base",
+            input_type: String,
+            allowed: ->(context) { context.openapi_version >= "3.1" }
       field "servers", factory: :servers_factory
       field "paths",
             factory: NodeFactory::Paths,

lib/openapi3_parser/validators/url.rb lib/openapi3_parser/validators/uri.rblib/openapi3_parser/validators/url.rb renamed to lib/openapi3_parser/validators/uri.rb

@@ -2,11 +2,11 @@
 
 module Openapi3Parser
   module Validators
-    class Url
+    class Uri
       def self.call(input)
         URI.parse(input) && nil
       rescue URI::InvalidURIError
-        %("#{input}" is not a valid URL)
+        %("#{input}" is not a valid URI)
       end
     end
   end

spec/lib/openapi3_parser/validators/uri_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RSpec.describe Openapi3Parser::Validators::Uri do
+  describe ".call" do
+    it "returns nil for a valid URI" do
+      expect(described_class.call("https://example.org/resource"))
+        .to be_nil
+    end
+
+    it "returns an error for an invalid URI" do
+      expect(described_class.call("not a URI"))
+        .to eq %("not a URI" is not a valid URI)
+    end
+  end
+end