scorpio 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e4b8a415bbb35c491e9a563c438916a33049e596e879d022f6435e5a7c7ec1
-  data.tar.gz: ca3d1b9b6539e9c0351c51bee08ed18667eabae3038514ecbe4a375ae246066f
+  metadata.gz: 2f15434d7f81c98255a7ebb87327025e54c068bea44d4d8ba4de1e5a22b5a2e6
+  data.tar.gz: fa85f43ceb33e794d8ac5335f7d681ffa8897bbb6aa2f69cf1e2e15757f8e97d
 SHA512:
-  metadata.gz: 89b3da10d085ab62755defca0457f9dc1d8e9c1db8699e2727efecdd9d12f5d09c3dbeca309afe283ac7ed5f25e3f92368969434a789c334a4897627bf7cd64d
-  data.tar.gz: 3dc9d5722372386ec1040c3ad6707d8aed251882ab31d8f26ad559edf517f3fbd001178b94de78987d849ba285808dc5f27b7414b78ad34a437a7b08fe73e899
+  metadata.gz: 2760d54f7f2c1b977192dc7244fff2f457ae293032f770482146143b14454e9896f7ff3717d9686bb02e981b854aab389a8baec76b40e6d17126b2c3446b3a45
+  data.tar.gz: a46a241d6bec8a531e3f76786aaa99ad335604927a3d5d4c079c7a65ebe619d1acef1a4b93c2aeb970f157a46ea8d63869d74966d5ace4e301399e2ec77a2cb9

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# v0.4.3
+# v0.4.5
+- Ur v0.1.0
+- misc
+
+# v0.4.4
 - JSI v0.2.0
 - misc
 

data/lib/scorpio/google_api_document.rb

@@ -98,7 +98,7 @@ module Scorpio
                     unused_path_params.delete(name) if op_param['in'] == 'path'
                     op_param['required'] = parameter.key?('required') ? parameter['required'] : op_param['in'] == 'path' ? true : false
                     op_param['type'] = parameter.type || 'string'
-                    op_param['format'] = parameter.format if parameter.format
+                    op_param['format'] = parameter['format'] if parameter['format']
                   end
                 end
               end

data/lib/scorpio/openapi/operation.rb

@@ -60,13 +60,9 @@ module Scorpio
 
       def path_template_str
         return @path_template_str if instance_variable_defined?(:@path_template_str)
-        @path_template_str = begin
-          parent_is_pathitem = parent_jsi.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent_jsi.is_a?(Scorpio::OpenAPI::V3::PathItem)
-          parent_parent_is_paths = parent_jsi.parent_jsi.is_a?(Scorpio::OpenAPI::V2::Paths) || parent_jsi.parent_jsi.is_a?(Scorpio::OpenAPI::V3::Paths)
-          if parent_is_pathitem && parent_parent_is_paths
-            parent_jsi.jsi_ptr.reference_tokens.last
-          end
-        end
+        raise(Bug) unless parent_jsi.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent_jsi.is_a?(Scorpio::OpenAPI::V3::PathItem)
+        raise(Bug) unless parent_jsi.parent_jsi.is_a?(Scorpio::OpenAPI::V2::Paths) || parent_jsi.parent_jsi.is_a?(Scorpio::OpenAPI::V3::Paths)
+        @path_template_str = parent_jsi.jsi_ptr.reference_tokens.last
       end
 
       # @return [Addressable::Template] the path as an Addressable::Template
@@ -91,12 +87,8 @@ module Scorpio
       #   for this operation from the parent PathItem
       def http_method
         return @http_method if instance_variable_defined?(:@http_method)
-        @http_method = begin
-          parent_is_pathitem = parent_jsi.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent_jsi.is_a?(Scorpio::OpenAPI::V3::PathItem)
-          if parent_is_pathitem
-            jsi_ptr.reference_tokens.last
-          end
-        end
+        raise(Bug) unless parent_jsi.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent_jsi.is_a?(Scorpio::OpenAPI::V3::PathItem)
+        @http_method = jsi_ptr.reference_tokens.last
       end
 
       # @return [String] a short identifier for this operation appropriate for an error message

data/lib/scorpio/openapi/operations_scope.rb

@@ -25,9 +25,14 @@ module Scorpio
 
       # @param operationId
       # @return [Scorpio::OpenAPI::Operation] the operation with the given operationId
+      # @raise [::KeyError] if the given operationId does not exist
       def [](operationId)
         memoize(:[], operationId) do |operationId_|
-          detect { |operation| operation.operationId == operationId_ }
+          detect { |operation| operation.operationId == operationId_ }.tap do |op|
+            unless op
+              raise(::KeyError, "operationId not found: #{operationId_.inspect}")
+            end
+          end
         end
       end
     end

data/lib/scorpio/request.rb

@@ -50,10 +50,9 @@ module Scorpio
       def body
         return @body if instance_variable_defined?(:@body)
         if instance_variable_defined?(:@body_object)
-          # TODO handle media types like `application/schema-instance+json`
-          if media_type == 'application/json'
+          if content_type && content_type.json?
             JSON.pretty_generate(JSI::Typelike.as_json(body_object))
-          elsif media_type == "application/x-www-form-urlencoded"
+          elsif content_type && content_type.form_urlencoded?
             URI.encode_www_form(body_object)
 
           # NOTE: the supported media types above should correspond to Request::SUPPORTED_REQUEST_MEDIA_TYPES
@@ -62,7 +61,7 @@ module Scorpio
             if body_object.respond_to?(:to_str)
               body_object
             else
-              raise(NotImplementedError, "Scorpio does not know how to generate the request body with media_type = #{media_type.respond_to?(:to_str) ? media_type : media_type.inspect} for operation: #{operation.human_id}. Scorpio supports media types: #{SUPPORTED_REQUEST_MEDIA_TYPES.join(', ')}. body_object was: #{body_object.pretty_inspect.chomp}")
+              raise(NotImplementedError, "Scorpio does not know how to generate the request body with content_type = #{content_type.respond_to?(:to_str) ? content_type : content_type.inspect} for operation: #{operation.human_id}. Scorpio supports media types: #{SUPPORTED_REQUEST_MEDIA_TYPES.join(', ')}. body_object was: #{body_object.pretty_inspect.chomp}")
             end
           end
         else
@@ -81,7 +80,7 @@ module Scorpio
       attr_writer :media_type
       def media_type
         return @media_type if instance_variable_defined?(:@media_type)
-        content_type_header ? content_type_attrs.media_type : operation.request_media_type
+        content_type_header ? content_type_header.media_type : operation.request_media_type
       end
 
       attr_writer :user_agent
@@ -190,23 +189,18 @@ module Scorpio
       Addressable::URI.parse(File.join(base_url, path))
     end
 
-    # @return [::Ur::ContentTypeAttrs] content type attributes for this request's Content-Type
-    def content_type_attrs
-      Ur::ContentTypeAttrs.new(content_type)
-    end
-
-    # @return [String] the value of the request Content-Type header
+    # @return [::Ur::ContentType] the value of the request Content-Type header
     def content_type_header
       headers.each do |k, v|
-        return v if k =~ /\Acontent[-_]type\z/i
+        return ::Ur::ContentType.new(v) if k =~ /\Acontent[-_]type\z/i
       end
       nil
     end
 
-    # @return [String] Content-Type for this request, taken from request headers if
+    # @return [::Ur::ContentType] Content-Type for this request, taken from request headers if
     #   present, or the request media_type.
     def content_type
-      content_type_header || media_type
+      content_type_header || ::Ur::ContentType.new(media_type)
     end
 
     # @return [::JSI::Schema]

data/lib/scorpio/response.rb

@@ -9,8 +9,7 @@ module Scorpio
     #   if supported (only application/json is currently supported) instantiated according to
     #   #response_schema
     def body_object
-      # TODO handle media types like `application/schema-instance+json` or vendor things like github's
-      if media_type == 'application/json'
+      if json?
         if body.empty?
           # an empty body isn't valid json, of course, but we'll just return nil for it.
           body_object = nil
@@ -27,7 +26,7 @@ module Scorpio
         end
 
         body_object
-      elsif media_type == 'text/plain'
+      elsif content_type && content_type.type_text? && content_type.subtype?('plain')
         body
       else
         # we will return the body if we do not have a supported parsing. for now.

data/lib/scorpio/version.rb

@@ -1,3 +1,3 @@
 module Scorpio
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/scorpio.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "jsi", "~> 0.2.0"
-  spec.add_dependency "ur", "~> 0.0.4"
+  spec.add_dependency "ur", "~> 0.1.0"
   spec.add_dependency "faraday"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -300,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Scorpio REST client