scorpio 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f20e932b016747b1bfa5a3d45711d3b06c1362894bad9496fc002420f6b4678
-  data.tar.gz: 96aa91530d7fb3e8b58b8c8002ea83faf9d7c10c3f660279e235a8cfccdf15b2
+  metadata.gz: c63ccc2d793787385be12175b68b1aca1b68372ee72bae4cb78e434d931aa941
+  data.tar.gz: 3e9bec23f6ca7ad6905ca1fcd33ce185f1dd5741ad3a1097d0cbc82fea09fef1
 SHA512:
-  metadata.gz: 13858da58324b2648053d7c16c78ed1d5f4f5754a348d0ad442c2dd517fd13c9a6cdbb3f1295658795d9dae1ddd7eac7399028d9a1f087909c6b95de2d6a4ded
-  data.tar.gz: 2ed8c1fd1a150fd00fdee372bf0ff98624458826986f67f28daa76a5db428efa346615afd1e5aa9aa2d085f3841dbb1e5ad26fe843368c89e1380d9e8371a5b4
+  metadata.gz: c7f265f3e6f68c340a2720a1f09238cd0f95d4a1dcfa8fb225ad4afa6e211fbe715c337d37faf7d8037ab0267b142af523182cf1d7eecca4e4cd80af16956a54
+  data.tar.gz: 0a3601a2380269a73fde895e1a2d9c80617a2643ead58420866baa04f5d4a2bad5ce06c54b43f155283f53286b2c1bca09b527b2f7d494d9b766e9a188ae31b6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.6.2
+- replace deprecated calls to JSI
+
 # v0.6.1
 - compatibility
   - JSI 0.7

data/lib/scorpio/google_api_document.rb

@@ -29,7 +29,7 @@ module Scorpio
     # 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
       def to_openapi
-        dup_doc = JSI::Typelike.as_json(self)
+        dup_doc = JSI::Util.as_json(self)
         # openapi does not want an id field on schemas
         dup_doc.delete('id')
         if dup_doc['properties'].is_a?(Hash)
@@ -56,7 +56,7 @@ module Scorpio
 
       def to_openapi_hash(options = {})
         # we will be modifying the api document (RestDescription). clone self and modify that one.
-        ad = self.class.new(JSI::Typelike.as_json(self))
+        ad = self.class.new(JSI::Util.as_json(self))
         ad_methods = []
         if ad['methods']
           ad_methods += ad['methods'].map do |mn, m|
@@ -212,7 +212,7 @@ module Scorpio
             end.call(openapi)
           end
         end
-        JSI::Typelike.as_json(openapi)
+        JSI::Util.as_json(openapi)
       end
     end
   end

data/lib/scorpio/openapi.rb

@@ -25,8 +25,8 @@ module Scorpio
         'documents/github.com/OAI/OpenAPI-Specification/blob/oas3-schema/schemas/v3.0/schema.yaml'
       )))
 
-      # the schema represented by Scorpio::OpenAPI::V3::Schema will describe schemas itself, so we set it
-      # include on its schema module the jsi_schema_instance_modules that implement schema functionality.
+      # the schema represented by Scorpio::OpenAPI::V3::Schema will describe schemas itself.
+      # JSI::Schema#describes_schema! enables this to implement the functionality of schemas.
       describe_schema = [
         openapi_document_schema.definitions['Schema'],
         openapi_document_schema.definitions['SchemaReference'],
@@ -40,7 +40,7 @@ module Scorpio
         # a problem, and this way also applies when none of the anyOf match due to schema errors.)
         openapi_document_schema.definitions['Schema'].properties['additionalProperties'],
       ]
-      describe_schema.each { |s| s.jsi_schema_instance_modules = [JSI::Schema::Draft04] }
+      describe_schema.each { |s| s.describes_schema!([JSI::Schema::Draft04]) }
 
       Document = openapi_document_schema.jsi_schema_module
 
@@ -118,14 +118,14 @@ module Scorpio
         'documents/swagger.io/v2/schema.json'
       ).read))
 
-      # the schema represented by Scorpio::OpenAPI::V2::Schema will describe schemas itself, so we set it to
-      # include on its schema module the jsi_schema_instance_modules that implement schema functionality.
+      # the schema represented by Scorpio::OpenAPI::V2::Schema will describe schemas itself.
+      # JSI::Schema#describes_schema! enables this to implement the functionality of schemas.
       describe_schema = [
         openapi_document_schema.definitions['schema'],
         # comments above on v3's definitions['Schema'].properties['additionalProperties'] apply here too
         openapi_document_schema.definitions['schema'].properties['additionalProperties'],
       ]
-      describe_schema.each { |s| s.jsi_schema_instance_modules = [JSI::Schema::Draft04] }
+      describe_schema.each { |s| s.describes_schema!([JSI::Schema::Draft04]) }
 
       Document = openapi_document_schema.jsi_schema_module
 

data/lib/scorpio/request.rb

@@ -71,7 +71,7 @@ module Scorpio
         return @body if instance_variable_defined?(:@body)
         if instance_variable_defined?(:@body_object)
           if content_type && content_type.json?
-            JSON.pretty_generate(JSI::Typelike.as_json(body_object))
+            JSON.pretty_generate(JSI::Util.as_json(body_object))
           elsif content_type && content_type.form_urlencoded?
             URI.encode_www_form(body_object)
 

data/lib/scorpio/resource_base.rb

@@ -324,7 +324,7 @@ module Scorpio
             else
               jsi = operation.request_schema.new_jsi(o)
             end
-            jsi.jsi_select_children_leaf_first do |node|
+            jsi.jsi_select_descendents_leaf_first do |node|
               # we want to specifically reject only nodes described (only) by a false schema.
               # note that for OpenAPI schemas, false is only a valid schema as a value
               # of `additionalProperties`
@@ -418,7 +418,7 @@ module Scorpio
       end
 
       def as_json(*opt)
-        JSI::Typelike.as_json(contained_object, *opt)
+        JSI::Util.as_json(contained_object, *opt)
       end
 
       def inspect

data/lib/scorpio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scorpio
-  VERSION = "0.6.1".freeze
+  VERSION = "0.6.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ethan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi