scorpio 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6bf8a01d7e8ff5fef4497289d88467ba1e6f7324d135b673c94eb3b225a9a1
-  data.tar.gz: e41e75c382b78db5a8fafeb5bcfba6f04036be3f553eda53f165963dbccb5091
+  metadata.gz: 2ef095c64774f95040582a9945d63cb2e58685403b66d49a9df1ec8976c5d12b
+  data.tar.gz: 777af82e020ab367e4280f10995b0aa84648782a157bc925529132c79e0b57d6
 SHA512:
-  metadata.gz: 4407bfac236b2f1428d1936dd82def48bceacaa8e547a33d1444b1c078eb8d66bb72fe61ff12aa4e36a26c9cb39320289410b7b4de67a2eb29a445a906088b02
-  data.tar.gz: 52118d637491780db6da22a5a774fff56df0dbf6863520a972ea72f636287b4461c679718da582f93d385f92cfe42686f191931f4c7d06208a51f26d7cf267c7
+  metadata.gz: 10fc95d393931ac8931c16bbe12dd62366e73480dc7ac5fa7c38efe8ab21cf49506eb659b0734bc3848df1a4994795adb6eb15302c3e3d942051ebe74f92dc09
+  data.tar.gz: e1ebe65228ca3412b24fedf99d0fbf84cd46acea560d09b32fc54a6142308fbfa088b471e65a0128b0ebffa1b1b4f5a3143be8c7f5b823a8c19c1d02eaaf5054

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.5.0
+- JSI schema classes change to schema modules, JSI instances may have multiple schemas (JSI v0.4, Ur v0.2)
+
 # v0.4.6
 - JSI v0.3.0
 - Scorpio::OpenAPI::SchemaReference represents a schema reference

data/README.md

@@ -262,6 +262,6 @@ The detailed, machine-interpretable description of an API provided by a properly
 
 [<img align="right" src="https://github.com/notEthan/scorpio/raw/master/resources/icons/AGPL-3.0.png">](https://www.gnu.org/licenses/agpl-3.0.html)
 
-Scorpio is Open Source Software licensed under the terms of the [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.html).
+Scorpio is licensed under the terms of the [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.html).
 
 Unlike the MIT or BSD licenses more commonly used with Ruby gems, this license requires that if you modify Scorpio and propagate your changes, e.g. by including it in a web application, your modified version must be publicly available. The common path of forking on Github should satisfy this requirement.

data/lib/scorpio/google_api_document.rb

@@ -4,13 +4,20 @@ module Scorpio
     discovery_rest_description = JSI::MetaschemaNode.new(discovery_rest_description_doc, metaschema_root_ptr: JSI::JSON::Pointer['schemas']['JsonSchema'], root_schema_ptr: JSI::JSON::Pointer['schemas']['RestDescription'])
 
     # naming these is not strictly necessary, but is nice to have.
-    DirectoryList      = JSI.class_for_schema(discovery_rest_description['schemas']['DirectoryList'])
-    JsonSchema         = JSI.class_for_schema(discovery_rest_description['schemas']['JsonSchema'])
-    RestDescription    = JSI.class_for_schema(discovery_rest_description['schemas']['RestDescription'])
-    RestMethod         = JSI.class_for_schema(discovery_rest_description['schemas']['RestMethod'])
-    RestResource       = JSI.class_for_schema(discovery_rest_description['schemas']['RestResource'])
-    RestMethodRequest  = JSI.class_for_schema(discovery_rest_description['schemas']['RestMethod']['properties']['request'])
-    RestMethodResponse = JSI.class_for_schema(discovery_rest_description['schemas']['RestMethod']['properties']['response'])
+    DirectoryList = discovery_rest_description.schemas['DirectoryList'].jsi_schema_module
+    JsonSchema     = discovery_rest_description.schemas['JsonSchema'].jsi_schema_module
+    RestDescription = discovery_rest_description.schemas['RestDescription'].jsi_schema_module
+    RestMethod     = discovery_rest_description.schemas['RestMethod'].jsi_schema_module
+    RestResource  = discovery_rest_description.schemas['RestResource'].jsi_schema_module
+
+    module RestDescription
+      Resources = properties['resources']
+    end
+
+    module RestMethod
+      Request = properties['request']
+      Response = properties['response']
+    end
 
     # google does a weird thing where it defines a schema with a $ref property where a json-schema is to be used in the document (method request and response fields), instead of just setting the schema to be the json-schema schema. we'll share a module across those schema classes that really represent schemas. is this confusingly meta enough?
     module SchemaLike
@@ -33,9 +40,9 @@ module Scorpio
         dup_doc
       end
     end
-    [JsonSchema, RestMethodRequest, RestMethodResponse].each { |klass| klass.send(:include, SchemaLike) }
+    [JsonSchema, RestMethod::Request, RestMethod::Response].each { |m| m.send(:include, SchemaLike) }
 
-    class RestDescription
+    module RestDescription
       def to_openapi_document(options = {})
         Scorpio::OpenAPI::Document.from_instance(to_openapi_hash(options))
       end

data/lib/scorpio/openapi.rb

@@ -19,75 +19,72 @@ module Scorpio
 
     module V3
       openapi_schema = JSI::Schema.new(::YAML.load_file(Scorpio.root.join('documents/github.com/OAI/OpenAPI-Specification/blob/oas3-schema/schemas/v3.0/schema.yaml')))
-      openapi_class = proc do |*key|
-        JSI.class_for_schema(key.inject(openapi_schema, &:[]))
-      end
 
-      Document = openapi_class.call()
+      Document = openapi_schema.jsi_schema_module
 
       # naming these is not strictly necessary, but is nice to have.
-      # generated: `puts JSI::Schema.new(::YAML.load_file(Scorpio.root.join('documents/github.com/OAI/OpenAPI-Specification/blob/oas3-schema/schemas/v3.0/schema.yaml')))['definitions'].select { |k,v| ['object', nil].include?(v['type']) }.keys.map { |k| "#{k[0].upcase}#{k[1..-1]} = openapi_class.call('definitions', '#{k}')" }`
-      Reference      = openapi_class.call('definitions', 'Reference')
-      SchemaReference = openapi_class.call('definitions', 'SchemaReference')
-      Info           = openapi_class.call('definitions', 'Info')
-      Contact       = openapi_class.call('definitions', 'Contact')
-      License       = openapi_class.call('definitions', 'License')
-      Server         = openapi_class.call('definitions', 'Server')
-      ServerVariable  = openapi_class.call('definitions', 'ServerVariable')
-      Components       = openapi_class.call('definitions', 'Components')
-      Schema            = openapi_class.call('definitions', 'Schema')
-      Discriminator      = openapi_class.call('definitions', 'Discriminator')
-      XML                 = openapi_class.call('definitions', 'XML')
-      Response             = openapi_class.call('definitions', 'Response')
-      MediaType             = openapi_class.call('definitions', 'MediaType')
-      MediaTypeWithExample   = openapi_class.call('definitions', 'MediaTypeWithExample')
-      MediaTypeWithExamples   = openapi_class.call('definitions', 'MediaTypeWithExamples')
-      Example                  = openapi_class.call('definitions', 'Example')
-      Header                    = openapi_class.call('definitions', 'Header')
-      HeaderWithSchema           = openapi_class.call('definitions', 'HeaderWithSchema')
-      HeaderWithSchemaWithExample = openapi_class.call('definitions', 'HeaderWithSchemaWithExample')
-      HeaderWithSchemaWithExamples = openapi_class.call('definitions', 'HeaderWithSchemaWithExamples')
-      HeaderWithContent           = openapi_class.call('definitions', 'HeaderWithContent')
-      Paths                      = openapi_class.call('definitions', 'Paths')
-      PathItem                    = openapi_class.call('definitions', 'PathItem')
-      Operation                    = openapi_class.call('definitions', 'Operation')
-      Responses                     = openapi_class.call('definitions', 'Responses')
-      SecurityRequirement            = openapi_class.call('definitions', 'SecurityRequirement')
-      Tag                             = openapi_class.call('definitions', 'Tag')
-      ExternalDocumentation            = openapi_class.call('definitions', 'ExternalDocumentation')
-      Parameter                         = openapi_class.call('definitions', 'Parameter')
-      ParameterWithSchema                = openapi_class.call('definitions', 'ParameterWithSchema')
-      ParameterWithSchemaWithExample      = openapi_class.call('definitions', 'ParameterWithSchemaWithExample')
-      ParameterWithSchemaWithExampleInPath = openapi_class.call('definitions', 'ParameterWithSchemaWithExampleInPath')
-      ParameterWithSchemaWithExampleInQuery = openapi_class.call('definitions', 'ParameterWithSchemaWithExampleInQuery')
-      ParameterWithSchemaWithExampleInHeader = openapi_class.call('definitions', 'ParameterWithSchemaWithExampleInHeader')
-      ParameterWithSchemaWithExampleInCookie = openapi_class.call('definitions', 'ParameterWithSchemaWithExampleInCookie')
-      ParameterWithSchemaWithExamples       = openapi_class.call('definitions', 'ParameterWithSchemaWithExamples')
-      ParameterWithSchemaWithExamplesInPath = openapi_class.call('definitions', 'ParameterWithSchemaWithExamplesInPath')
-      ParameterWithSchemaWithExamplesInQuery = openapi_class.call('definitions', 'ParameterWithSchemaWithExamplesInQuery')
-      ParameterWithSchemaWithExamplesInHeader = openapi_class.call('definitions', 'ParameterWithSchemaWithExamplesInHeader')
-      ParameterWithSchemaWithExamplesInCookie = openapi_class.call('definitions', 'ParameterWithSchemaWithExamplesInCookie')
-      ParameterWithContent                   = openapi_class.call('definitions', 'ParameterWithContent')
-      ParameterWithContentInPath            = openapi_class.call('definitions', 'ParameterWithContentInPath')
-      ParameterWithContentNotInPath        = openapi_class.call('definitions', 'ParameterWithContentNotInPath')
-      RequestBody                         = openapi_class.call('definitions', 'RequestBody')
-      SecurityScheme                     = openapi_class.call('definitions', 'SecurityScheme')
-      APIKeySecurityScheme              = openapi_class.call('definitions', 'APIKeySecurityScheme')
-      HTTPSecurityScheme               = openapi_class.call('definitions', 'HTTPSecurityScheme')
-      NonBearerHTTPSecurityScheme     = openapi_class.call('definitions', 'NonBearerHTTPSecurityScheme')
-      BearerHTTPSecurityScheme       = openapi_class.call('definitions', 'BearerHTTPSecurityScheme')
-      OAuth2SecurityScheme          = openapi_class.call('definitions', 'OAuth2SecurityScheme')
-      OpenIdConnectSecurityScheme  = openapi_class.call('definitions', 'OpenIdConnectSecurityScheme')
-      OAuthFlows                  = openapi_class.call('definitions', 'OAuthFlows')
-      ImplicitOAuthFlow          = openapi_class.call('definitions', 'ImplicitOAuthFlow')
-      PasswordOAuthFlow         = openapi_class.call('definitions', 'PasswordOAuthFlow')
-      ClientCredentialsFlow     = openapi_class.call('definitions', 'ClientCredentialsFlow')
-      AuthorizationCodeOAuthFlow = openapi_class.call('definitions', 'AuthorizationCodeOAuthFlow')
-      Link                      = openapi_class.call('definitions', 'Link')
-      LinkWithOperationRef     = openapi_class.call('definitions', 'LinkWithOperationRef')
-      LinkWithOperationId     = openapi_class.call('definitions', 'LinkWithOperationId')
-      Callback               = openapi_class.call('definitions', 'Callback')
-      Encoding              = openapi_class.call('definitions', 'Encoding')
+      # generated: `puts JSI::Schema.new(::YAML.load_file(Scorpio.root.join('documents/github.com/OAI/OpenAPI-Specification/blob/oas3-schema/schemas/v3.0/schema.yaml')))['definitions'].select { |k,v| ['object', nil].include?(v['type']) }.keys.map { |k| "#{k[0].upcase}#{k[1..-1]} = Document.definitions['#{k}']" }`
+      Reference      = Document.definitions['Reference']
+      SchemaReference = Document.definitions['SchemaReference']
+      Info           = Document.definitions['Info']
+      Contact       = Document.definitions['Contact']
+      License       = Document.definitions['License']
+      Server         = Document.definitions['Server']
+      ServerVariable  = Document.definitions['ServerVariable']
+      Components       = Document.definitions['Components']
+      Schema            = Document.definitions['Schema']
+      Discriminator      = Document.definitions['Discriminator']
+      XML                 = Document.definitions['XML']
+      Response             = Document.definitions['Response']
+      MediaType             = Document.definitions['MediaType']
+      MediaTypeWithExample   = Document.definitions['MediaTypeWithExample']
+      MediaTypeWithExamples   = Document.definitions['MediaTypeWithExamples']
+      Example                  = Document.definitions['Example']
+      Header                    = Document.definitions['Header']
+      HeaderWithSchema           = Document.definitions['HeaderWithSchema']
+      HeaderWithSchemaWithExample = Document.definitions['HeaderWithSchemaWithExample']
+      HeaderWithSchemaWithExamples = Document.definitions['HeaderWithSchemaWithExamples']
+      HeaderWithContent           = Document.definitions['HeaderWithContent']
+      Paths                      = Document.definitions['Paths']
+      PathItem                    = Document.definitions['PathItem']
+      Operation                    = Document.definitions['Operation']
+      Responses                     = Document.definitions['Responses']
+      SecurityRequirement            = Document.definitions['SecurityRequirement']
+      Tag                             = Document.definitions['Tag']
+      ExternalDocumentation            = Document.definitions['ExternalDocumentation']
+      Parameter                         = Document.definitions['Parameter']
+      ParameterWithSchema                = Document.definitions['ParameterWithSchema']
+      ParameterWithSchemaWithExample      = Document.definitions['ParameterWithSchemaWithExample']
+      ParameterWithSchemaWithExampleInPath = Document.definitions['ParameterWithSchemaWithExampleInPath']
+      ParameterWithSchemaWithExampleInQuery = Document.definitions['ParameterWithSchemaWithExampleInQuery']
+      ParameterWithSchemaWithExampleInHeader = Document.definitions['ParameterWithSchemaWithExampleInHeader']
+      ParameterWithSchemaWithExampleInCookie = Document.definitions['ParameterWithSchemaWithExampleInCookie']
+      ParameterWithSchemaWithExamples       = Document.definitions['ParameterWithSchemaWithExamples']
+      ParameterWithSchemaWithExamplesInPath = Document.definitions['ParameterWithSchemaWithExamplesInPath']
+      ParameterWithSchemaWithExamplesInQuery = Document.definitions['ParameterWithSchemaWithExamplesInQuery']
+      ParameterWithSchemaWithExamplesInHeader = Document.definitions['ParameterWithSchemaWithExamplesInHeader']
+      ParameterWithSchemaWithExamplesInCookie = Document.definitions['ParameterWithSchemaWithExamplesInCookie']
+      ParameterWithContent                   = Document.definitions['ParameterWithContent']
+      ParameterWithContentInPath            = Document.definitions['ParameterWithContentInPath']
+      ParameterWithContentNotInPath        = Document.definitions['ParameterWithContentNotInPath']
+      RequestBody                         = Document.definitions['RequestBody']
+      SecurityScheme                     = Document.definitions['SecurityScheme']
+      APIKeySecurityScheme              = Document.definitions['APIKeySecurityScheme']
+      HTTPSecurityScheme               = Document.definitions['HTTPSecurityScheme']
+      NonBearerHTTPSecurityScheme     = Document.definitions['NonBearerHTTPSecurityScheme']
+      BearerHTTPSecurityScheme       = Document.definitions['BearerHTTPSecurityScheme']
+      OAuth2SecurityScheme          = Document.definitions['OAuth2SecurityScheme']
+      OpenIdConnectSecurityScheme  = Document.definitions['OpenIdConnectSecurityScheme']
+      OAuthFlows                  = Document.definitions['OAuthFlows']
+      ImplicitOAuthFlow          = Document.definitions['ImplicitOAuthFlow']
+      PasswordOAuthFlow         = Document.definitions['PasswordOAuthFlow']
+      ClientCredentialsFlow     = Document.definitions['ClientCredentialsFlow']
+      AuthorizationCodeOAuthFlow = Document.definitions['AuthorizationCodeOAuthFlow']
+      Link                      = Document.definitions['Link']
+      LinkWithOperationRef     = Document.definitions['LinkWithOperationRef']
+      LinkWithOperationId     = Document.definitions['LinkWithOperationId']
+      Callback               = Document.definitions['Callback']
+      Encoding              = Document.definitions['Encoding']
 
       # the schema of Scorpio::OpenAPI::V3::Schema describes a schema itself, so we extend it
       # with the module indicating that.
@@ -96,68 +93,65 @@ module Scorpio
     end
     module V2
       openapi_schema = JSI::Schema.new(::JSON.parse(Scorpio.root.join('documents/swagger.io/v2/schema.json').read))
-      openapi_class = proc do |*key|
-        JSI.class_for_schema(key.inject(openapi_schema, &:[]))
-      end
 
-      Document = openapi_class.call()
+      Document = openapi_schema.jsi_schema_module
 
       # naming these is not strictly necessary, but is nice to have.
-      # generated: `puts Scorpio::OpenAPI::V2::Document.schema['definitions'].select { |k,v| ['object', nil].include?(v['type']) }.keys.map { |k| "#{k[0].upcase}#{k[1..-1]} = openapi_class.call('definitions', '#{k}')" }`
-      Info            = openapi_class.call('definitions', 'info')
-      Contact          = openapi_class.call('definitions', 'contact')
-      License           = openapi_class.call('definitions', 'license')
-      Paths              = openapi_class.call('definitions', 'paths')
-      Definitions         = openapi_class.call('definitions', 'definitions')
-      ParameterDefinitions = openapi_class.call('definitions', 'parameterDefinitions')
-      ResponseDefinitions = openapi_class.call('definitions', 'responseDefinitions')
-      ExternalDocs       = openapi_class.call('definitions', 'externalDocs')
-      Examples          = openapi_class.call('definitions', 'examples')
-      Operation        = openapi_class.call('definitions', 'operation')
-      PathItem         = openapi_class.call('definitions', 'pathItem')
-      Responses         = openapi_class.call('definitions', 'responses')
-      ResponseValue      = openapi_class.call('definitions', 'responseValue')
-      Response            = openapi_class.call('definitions', 'response')
-      Headers              = openapi_class.call('definitions', 'headers')
-      Header                = openapi_class.call('definitions', 'header')
-      VendorExtension        = openapi_class.call('definitions', 'vendorExtension')
-      BodyParameter           = openapi_class.call('definitions', 'bodyParameter')
-      HeaderParameterSubSchema = openapi_class.call('definitions', 'headerParameterSubSchema')
-      QueryParameterSubSchema   = openapi_class.call('definitions', 'queryParameterSubSchema')
-      FormDataParameterSubSchema = openapi_class.call('definitions', 'formDataParameterSubSchema')
-      PathParameterSubSchema    = openapi_class.call('definitions', 'pathParameterSubSchema')
-      NonBodyParameter         = openapi_class.call('definitions', 'nonBodyParameter')
-      Parameter               = openapi_class.call('definitions', 'parameter')
-      Schema                 = openapi_class.call('definitions', 'schema')
-      FileSchema            = openapi_class.call('definitions', 'fileSchema')
-      PrimitivesItems        = openapi_class.call('definitions', 'primitivesItems')
-      SecurityRequirement     = openapi_class.call('definitions', 'securityRequirement')
-      Xml                      = openapi_class.call('definitions', 'xml')
-      Tag                       = openapi_class.call('definitions', 'tag')
-      SecurityDefinitions        = openapi_class.call('definitions', 'securityDefinitions')
-      BasicAuthenticationSecurity = openapi_class.call('definitions', 'basicAuthenticationSecurity')
-      ApiKeySecurity             = openapi_class.call('definitions', 'apiKeySecurity')
-      Oauth2ImplicitSecurity    = openapi_class.call('definitions', 'oauth2ImplicitSecurity')
-      Oauth2PasswordSecurity   = openapi_class.call('definitions', 'oauth2PasswordSecurity')
-      Oauth2ApplicationSecurity = openapi_class.call('definitions', 'oauth2ApplicationSecurity')
-      Oauth2AccessCodeSecurity = openapi_class.call('definitions', 'oauth2AccessCodeSecurity')
-      Oauth2Scopes            = openapi_class.call('definitions', 'oauth2Scopes')
-      Title                  = openapi_class.call('definitions', 'title')
-      Description           = openapi_class.call('definitions', 'description')
-      Default              = openapi_class.call('definitions', 'default')
-      MultipleOf          = openapi_class.call('definitions', 'multipleOf')
-      Maximum            = openapi_class.call('definitions', 'maximum')
-      ExclusiveMaximum  = openapi_class.call('definitions', 'exclusiveMaximum')
-      Minimum          = openapi_class.call('definitions', 'minimum')
-      ExclusiveMinimum = openapi_class.call('definitions', 'exclusiveMinimum')
-      MaxLength       = openapi_class.call('definitions', 'maxLength')
-      MinLength      = openapi_class.call('definitions', 'minLength')
-      Pattern       = openapi_class.call('definitions', 'pattern')
-      MaxItems     = openapi_class.call('definitions', 'maxItems')
-      MinItems    = openapi_class.call('definitions', 'minItems')
-      UniqueItems = openapi_class.call('definitions', 'uniqueItems')
-      Enum         = openapi_class.call('definitions', 'enum')
-      JsonReference = openapi_class.call('definitions', 'jsonReference')
+      # generated: `puts JSI::Schema.new(::JSON.parse(Scorpio.root.join('documents/swagger.io/v2/schema.json').read))['definitions'].select { |k,v| ['object', nil].include?(v['type']) }.keys.map { |k| "#{k[0].upcase}#{k[1..-1]} = Document.definitions['#{k}']" }`
+      Info            = Document.definitions['info']
+      Contact          = Document.definitions['contact']
+      License           = Document.definitions['license']
+      Paths              = Document.definitions['paths']
+      Definitions         = Document.definitions['definitions']
+      ParameterDefinitions = Document.definitions['parameterDefinitions']
+      ResponseDefinitions = Document.definitions['responseDefinitions']
+      ExternalDocs       = Document.definitions['externalDocs']
+      Examples          = Document.definitions['examples']
+      Operation        = Document.definitions['operation']
+      PathItem         = Document.definitions['pathItem']
+      Responses         = Document.definitions['responses']
+      ResponseValue      = Document.definitions['responseValue']
+      Response            = Document.definitions['response']
+      Headers              = Document.definitions['headers']
+      Header                = Document.definitions['header']
+      VendorExtension        = Document.definitions['vendorExtension']
+      BodyParameter           = Document.definitions['bodyParameter']
+      HeaderParameterSubSchema = Document.definitions['headerParameterSubSchema']
+      QueryParameterSubSchema   = Document.definitions['queryParameterSubSchema']
+      FormDataParameterSubSchema = Document.definitions['formDataParameterSubSchema']
+      PathParameterSubSchema    = Document.definitions['pathParameterSubSchema']
+      NonBodyParameter         = Document.definitions['nonBodyParameter']
+      Parameter               = Document.definitions['parameter']
+      Schema                 = Document.definitions['schema']
+      FileSchema            = Document.definitions['fileSchema']
+      PrimitivesItems        = Document.definitions['primitivesItems']
+      SecurityRequirement     = Document.definitions['securityRequirement']
+      Xml                      = Document.definitions['xml']
+      Tag                       = Document.definitions['tag']
+      SecurityDefinitions        = Document.definitions['securityDefinitions']
+      BasicAuthenticationSecurity = Document.definitions['basicAuthenticationSecurity']
+      ApiKeySecurity             = Document.definitions['apiKeySecurity']
+      Oauth2ImplicitSecurity    = Document.definitions['oauth2ImplicitSecurity']
+      Oauth2PasswordSecurity   = Document.definitions['oauth2PasswordSecurity']
+      Oauth2ApplicationSecurity = Document.definitions['oauth2ApplicationSecurity']
+      Oauth2AccessCodeSecurity = Document.definitions['oauth2AccessCodeSecurity']
+      Oauth2Scopes            = Document.definitions['oauth2Scopes']
+      Title                  = Document.definitions['title']
+      Description           = Document.definitions['description']
+      Default              = Document.definitions['default']
+      MultipleOf          = Document.definitions['multipleOf']
+      Maximum            = Document.definitions['maximum']
+      ExclusiveMaximum  = Document.definitions['exclusiveMaximum']
+      Minimum          = Document.definitions['minimum']
+      ExclusiveMinimum = Document.definitions['exclusiveMinimum']
+      MaxLength       = Document.definitions['maxLength']
+      MinLength      = Document.definitions['minLength']
+      Pattern       = Document.definitions['pattern']
+      MaxItems     = Document.definitions['maxItems']
+      MinItems    = Document.definitions['minItems']
+      UniqueItems = Document.definitions['uniqueItems']
+      Enum         = Document.definitions['enum']
+      JsonReference = Document.definitions['jsonReference']
 
       # the schema of Scorpio::OpenAPI::V2::Schema describes a schema itself, so we extend it
       # with the module indicating that.
@@ -170,26 +164,26 @@ module Scorpio
     end # (this block is here just so the above informative comment is not interpreted as module doc)
 
     module V3
-      class Operation
+      module Operation
         include OpenAPI::Operation
       end
-      class Document
+      module Document
         include OpenAPI::Document
       end
-      class Reference
+      module Reference
         include OpenAPI::Reference
       end
       require 'scorpio/openapi/v3/server'
     end
 
     module V2
-      class Operation
+      module Operation
         include OpenAPI::Operation
       end
-      class Document
+      module Document
         include OpenAPI::Document
       end
-      class JsonReference
+      module JsonReference
         include OpenAPI::Reference
       end
     end

data/lib/scorpio/openapi/document.rb

@@ -18,9 +18,9 @@ module Scorpio
             raise(TypeError, "instance is unexpected JSI type: #{instance.class.inspect}")
           elsif instance.respond_to?(:to_hash)
             if instance['swagger'] =~ /\A2(\.|\z)/
-              instance = Scorpio::OpenAPI::V2::Document.new(instance)
+              instance = Scorpio::OpenAPI::V2::Document.new_jsi(instance)
             elsif instance['openapi'] =~ /\A3(\.|\z)/
-              instance = Scorpio::OpenAPI::V3::Document.new(instance)
+              instance = Scorpio::OpenAPI::V3::Document.new_jsi(instance)
             else
               raise(ArgumentError, "instance does not look like a recognized openapi document")
             end
@@ -83,7 +83,7 @@ module Scorpio
       # A document that defines or describes an API conforming to the OpenAPI Specification v3.
       #
       # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#oasObject
-      class Document
+      module Document
         module Configurables
           def scheme
             nil
@@ -126,7 +126,7 @@ module Scorpio
       # A document that defines or describes an API conforming to the OpenAPI Specification v2 (aka Swagger).
       #
       # The root document is known as the Swagger Object.
-      class Document
+      module Document
         module Configurables
           attr_writer :scheme
           def scheme

data/lib/scorpio/openapi/operation.rb

@@ -174,7 +174,7 @@ module Scorpio
       # Describes a single API operation on a path.
       #
       # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operationObject
-      class Operation
+      module Operation
         module Configurables
           def scheme
             # not applicable; for OpenAPI v3, scheme is specified by servers.
@@ -238,7 +238,7 @@ module Scorpio
     end
     module V2
       raise(Bug, 'const_defined? Scorpio::OpenAPI::V2::Operation') unless const_defined?(:Operation)
-      class Operation
+      module Operation
         module Configurables
           attr_writer :scheme
           def scheme

data/lib/scorpio/openapi/operations_scope.rb

@@ -3,7 +3,7 @@ module Scorpio
     # OperationsScope acts as an Enumerable of the Operations for an openapi_document,
     # and offers subscripting by operationId.
     class OperationsScope
-      include JSI::Memoize
+      include JSI::Util::Memoize
 
       # @param openapi_document [Scorpio::OpenAPI::Document]
       def initialize(openapi_document)

data/lib/scorpio/openapi/v3/server.rb

@@ -6,7 +6,7 @@ module Scorpio
       # An object representing a Server.
       #
       # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#serverObject
-      class Server
+      module Server
         # expands this server's #url using the given_server_variables. any variables
         # that are in the url but not in the given server variables are filled in
         # using the default value for the variable.

data/lib/scorpio/request.rb

@@ -1,6 +1,8 @@
 module Scorpio
   class Request
     SUPPORTED_REQUEST_MEDIA_TYPES = ['application/json', 'application/x-www-form-urlencoded']
+    FALLBACK_CONTENT_TYPE = 'application/x-www-form-urlencoded'
+
     def self.best_media_type(media_types)
       if media_types.size == 1
         media_types.first
@@ -208,11 +210,6 @@ module Scorpio
       operation.request_schema(media_type: media_type)
     end
 
-    # @return [Class subclassing JSI::Base]
-    def request_schema_class(media_type: self.media_type)
-      JSI.class_for_schema(request_schema(media_type: media_type))
-    end
-
     # builds a Faraday connection with this Request's faraday_builder and faraday_adapter.
     # passes a given proc yield_ur to middleware to yield an Ur for requests made with the connection.
     #
@@ -222,8 +219,9 @@ module Scorpio
       Faraday.new do |faraday_connection|
         faraday_builder.call(faraday_connection)
         if yield_ur
-          ::Ur::Faraday # autoload trigger
-          faraday_connection.response(:yield_ur, ur_class: Scorpio::Ur, logger: self.logger, &yield_ur)
+          -> { ::Ur::Faraday }.() # autoload trigger
+
+          faraday_connection.response(:yield_ur, schemas: Set[Scorpio::Ur.schema], logger: self.logger, &yield_ur)
         end
         faraday_connection.adapter(*faraday_adapter)
       end
@@ -322,8 +320,14 @@ module Scorpio
       if user_agent
         headers['User-Agent'] = user_agent
       end
-      if media_type && !content_type_header
-        headers['Content-Type'] = media_type
+      if !content_type_header
+        if media_type
+          headers['Content-Type'] = media_type
+        else
+          # I'd rather not have a default content-type, but if none is set then the HTTP adapter sets this to 
+          # application/x-www-form-urlencoded and issues a warning about it.
+          headers['Content-Type'] = FALLBACK_CONTENT_TYPE
+        end
       end
       if self.headers
         headers.update(self.headers)