scorpio 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebea8c54d7cec0fb3572cffc6f2992882d6fd7a82739abf6656a96d095d523a7
-  data.tar.gz: a76428a2b3c8cfd00f0a3f9f639795bdcb3ac770bd97813bf4a44336158ec753
+  metadata.gz: d8e4b8a415bbb35c491e9a563c438916a33049e596e879d022f6435e5a7c7ec1
+  data.tar.gz: ca3d1b9b6539e9c0351c51bee08ed18667eabae3038514ecbe4a375ae246066f
 SHA512:
-  metadata.gz: f10e3c1ff2bdcfb1d3f5c8459f411508dadcd9a8f0531b1e770a5370011b4946790b6d248baace076fc99f52c0dcafcda0d7e16113ee185ae09baf9515e24f18
-  data.tar.gz: ed13200947e100a9ecb6d9ea38ed57abd1649b16144652ee9ef772a74d253416514fdee186666469009a7abb41f247af809bdc4c29ba66e374d225c9a8bd58da
+  metadata.gz: 89b3da10d085ab62755defca0457f9dc1d8e9c1db8699e2727efecdd9d12f5d09c3dbeca309afe283ac7ed5f25e3f92368969434a789c334a4897627bf7cd64d
+  data.tar.gz: 3dc9d5722372386ec1040c3ad6707d8aed251882ab31d8f26ad559edf517f3fbd001178b94de78987d849ba285808dc5f27b7414b78ad34a437a7b08fe73e899

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.4.3
+- JSI v0.2.0
+- misc
+
 # v0.4.3
 - misc
 

data/lib/scorpio/openapi/document.rb

@@ -12,10 +12,11 @@ module Scorpio
         # @param instance [#to_hash] the document to represent as a Scorpio OpenAPI Document
         # @return [Scorpio::OpenAPI::V2::Document, Scorpio::OpenAPI::V3::Document]
         def from_instance(instance)
-          if instance.is_a?(Hash)
-            instance = JSI::JSON::Node.new_doc(instance)
-          end
-          if instance.is_a?(JSI::JSON::Node)
+          if instance.is_a?(Scorpio::OpenAPI::Document)
+            instance
+          elsif instance.is_a?(JSI::Base)
+            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)
             elsif instance['openapi'] =~ /\A3(\.|\z)/
@@ -23,13 +24,6 @@ module Scorpio
             else
               raise(ArgumentError, "instance does not look like a recognized openapi document")
             end
-          end
-          if instance.is_a?(Scorpio::OpenAPI::Document)
-            instance
-          elsif instance.is_a?(JSI::Base)
-            raise(TypeError, "instance is unexpected JSI type: #{instance.class.inspect}")
-          elsif instance.respond_to?(:to_hash)
-            from_instance(instance.to_hash)
           else
             raise(TypeError, "instance does not look like a hash (json object)")
           end

data/lib/scorpio/openapi/operation.rb

@@ -55,16 +55,16 @@ module Scorpio
 
       # @return [Scorpio::OpenAPI::Document] the document whence this operation came
       def openapi_document
-        parents.detect { |p| p.is_a?(Scorpio::OpenAPI::Document) }
+        parent_jsis.detect { |p| p.is_a?(Scorpio::OpenAPI::Document) }
       end
 
       def path_template_str
         return @path_template_str if instance_variable_defined?(:@path_template_str)
         @path_template_str = begin
-          parent_is_pathitem = parent.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent.is_a?(Scorpio::OpenAPI::V3::PathItem)
-          parent_parent_is_paths = parent.parent.is_a?(Scorpio::OpenAPI::V2::Paths) || parent.parent.is_a?(Scorpio::OpenAPI::V3::Paths)
+          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.instance.path.last
+            parent_jsi.jsi_ptr.reference_tokens.last
           end
         end
       end
@@ -92,9 +92,9 @@ module Scorpio
       def http_method
         return @http_method if instance_variable_defined?(:@http_method)
         @http_method = begin
-          parent_is_pathitem = parent.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent.is_a?(Scorpio::OpenAPI::V3::PathItem)
+          parent_is_pathitem = parent_jsi.is_a?(Scorpio::OpenAPI::V2::PathItem) || parent_jsi.is_a?(Scorpio::OpenAPI::V3::PathItem)
           if parent_is_pathitem
-            instance.path.last
+            jsi_ptr.reference_tokens.last
           end
         end
       end
@@ -272,7 +272,8 @@ module Scorpio
         end
         include Configurables
 
-        # there should only be one body parameter; this returns it
+        # @return [#to_hash] the body parameter
+        # @raise [Scorpio::OpenAPI::SemanticError] if there's more than one body param
         def body_parameter
           body_parameters = (parameters || []).select { |parameter| parameter['in'] == 'body' }
           if body_parameters.size == 0

data/lib/scorpio/resource_base.rb

@@ -6,18 +6,20 @@ module Scorpio
 
   class ResourceBase
     class << self
-      # a hash of accessor names (Symbol) to default getter methods (UnboundMethod), used to determine
-      # what accessors have been overridden from their defaults.
+      # ResourceBase.inheritable_accessor_defaults is a hash of accessor names (Symbol) mapped 
+      # to default getter methods (UnboundMethod), used to determine what accessors have been
+      # overridden from their defaults.
       (-> (x) { define_method(:inheritable_accessor_defaults) { x } }).({})
-      def define_inheritable_accessor(accessor, options = {})
-        if options[:default_getter]
-          # the value before the field is set (overwritten) is the result of the default_getter proc
-          define_singleton_method(accessor, &options[:default_getter])
-        else
-          # the value before the field is set (overwritten) is the default_value (which is nil if not specified)
-          default_value = options[:default_value]
-          define_singleton_method(accessor) { default_value }
-        end
+
+      # @param accessor [String, Symbol] the name of the accessor
+      # @param default_getter [#to_proc] a proc to provide a default value when no value
+      #   has been explicitly set
+      # @param default_value [Object] a default value to return when no value has been
+      #   explicitly set. do not pass both :default_getter and :default_value.
+      # @param on_set [#to_proc] callback proc, invoked when a value is assigned
+      def define_inheritable_accessor(accessor, default_value: nil, default_getter: -> { default_value }, on_set: nil)
+        # the value before the field is set (overwritten) is the result of the default_getter proc
+        define_singleton_method(accessor, &default_getter)
         inheritable_accessor_defaults[accessor] = self.singleton_class.instance_method(accessor)
         # field setter method. redefines the getter, replacing the method with one that returns the
         # setter's argument (that being inherited to the scope of the define_method(accessor) block
@@ -33,8 +35,8 @@ module Scorpio
             # getter method
             define_method(accessor) { value_ }
             # invoke on_set callback defined on the class
-            if options[:on_set]
-              klass.instance_exec(&options[:on_set])
+            if on_set
+              klass.instance_exec(&on_set)
             end
           end
         end
@@ -349,10 +351,8 @@ module Scorpio
         if object.is_a?(Scorpio::ResourceBase)
           # TODO request_schema_fail unless schema is for given model type 
           request_body_for_schema(object.attributes, schema)
-        elsif object.is_a?(JSI::Base)
-          request_body_for_schema(object.instance, schema)
-        elsif object.is_a?(JSI::JSON::Node)
-          request_body_for_schema(object.content, schema)
+        elsif object.is_a?(JSI::PathedNode)
+          request_body_for_schema(object.node_content, schema)
         else
           if object.respond_to?(:to_hash)
             object.map do |key, value|
@@ -431,8 +431,7 @@ module Scorpio
             mod = object.map do |key, value|
               {key => response_object_to_instances(value, initialize_options)}
             end.inject({}, &:update)
-            mod = mod.instance if mod.is_a?(JSI::Base)
-            mod = mod.content if mod.is_a?(JSI::JSON::Node)
+            mod = mod.node_content if mod.is_a?(JSI::PathedNode)
             mod
           end
           if model

data/lib/scorpio/response.rb

@@ -23,7 +23,7 @@ module Scorpio
         end
 
         if response_schema && (body_object.respond_to?(:to_hash) || body_object.respond_to?(:to_ary))
-          body_object = JSI.class_for_schema(response_schema).new(JSI::JSON::Node.new_doc(body_object))
+          body_object = JSI.class_for_schema(response_schema).new(body_object)
         end
 
         body_object

data/lib/scorpio/version.rb

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

data/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.1.0"
-  spec.add_dependency "ur", "~> 0.0.3"
+  spec.add_dependency "jsi", "~> 0.2.0"
+  spec.add_dependency "ur", "~> 0.0.4"
   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.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ur
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement