Merge f269f61 into 9c060ce

Gemfile

@@ -6,5 +6,3 @@ gemspec
 gem 'byebug'
 gem 'coveralls_reborn', '~> 0.11'
 gem 'wwtd'
-gem 'ur', github: 'notEthan/ur', branch: 'jsi.multischema' # ur v0.2.0 awaiting release
-gem 'jsi', github: 'notEthan/jsi', branch: 'multischema' # jsi v0.4.0 awaiting release

lib/scorpio/openapi/operations_scope.rb

@@ -3,7 +3,7 @@ module OpenAPI
     # 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)

lib/scorpio/request.rb

@@ -208,11 +208,6 @@ def request_schema(media_type: self.media_type)
       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.
     #

lib/scorpio/resource_base.rb

@@ -529,6 +529,6 @@ def pretty_print(q)
     def jsi_fingerprint
       {class: self.class, attributes: JSI::Typelike.as_json(@attributes)}
     end
-    include JSI::FingerprintHash
+    include JSI::Util::FingerprintHash
   end
 end

scorpio.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jsi", "~> 0.3.0"
-  spec.add_dependency "ur", "~> 0.1.0"
+  spec.add_dependency "jsi", "~> 0.4.0"
+  spec.add_dependency "ur", "~> 0.2.0"
   spec.add_dependency "faraday"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"