scorpio 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fef9d45f74d30432978fa58501add04b3fc60226
-  data.tar.gz: 2e8c5c985076afe3da550d1a8e1fe4c19a6f3b5d
+SHA256:
+  metadata.gz: 4c02ae6ac0aa557b45883e8b1261ed89cf7f98d65a4c3a1224144aefba1abe0e
+  data.tar.gz: 4961d26ac46421417cb40ca6929c7fca53007d773457860cb18006a1c38dbf49
 SHA512:
-  metadata.gz: 8f1b1ff00e8c06761980421abb2c15b7bfc6584ab8db1e4fe4dc8159817d3a2ac827eca12e374c6851817b72d4b40e02b5577f164dc6e36a8514f4e5d69a86c3
-  data.tar.gz: c23470636bd6456a1d8bd23c469e4b6595c070b317fda0579a439b591077319471aa57daf12390bf81336a1a4068bb90c8f5ba09cc2f3ac3830c7f97ca6a1de2
+  metadata.gz: e7c669c5820372b7abc5d8a881b37c73d681f051a70309b68f61574be58f5b1eac4d3928a4419aecb59a2c415c29eeb329cdd4327b60cb31604a9a5ad63ef855
+  data.tar.gz: a435561553f6ab3c9fff2e122fbfed6d56126688f23ea7a7579a0999a281e66b046c224ff2ae398ffeb827e68f2a080867d364b0b8a3b6c586a4a8f01f41b854

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.1
+- SchemaInstanceBase#parent, #parents
+- compatibility fix #as_json
+
 # v0.2.0
 
 # v0.1.0

data/lib/scorpio/json/node.rb

@@ -114,8 +114,8 @@ module Scorpio
         pointer.fragment
       end
 
-      def as_json
-        Typelike.as_json(content)
+      def as_json(*opt)
+        Typelike.as_json(content, *opt)
       end
 
       # takes a block. the block is yielded the content of this node. the block MUST return a modified
@@ -205,8 +205,8 @@ module Scorpio
 
       include Arraylike
 
-      def as_json # needs redefined after including Enumerable
-        Typelike.as_json(content)
+      def as_json(*opt) # needs redefined after including Enumerable
+        Typelike.as_json(content, *opt)
       end
 
       # methods that don't look at the value; can skip the overhead of #[] (invoked by #to_a).
@@ -233,8 +233,8 @@ module Scorpio
 
       include Hashlike
 
-      def as_json # needs redefined after including Enumerable
-        Typelike.as_json(content)
+      def as_json(*opt) # needs redefined after including Enumerable
+        Typelike.as_json(content, *opt)
       end
 
       # methods that don't look at the value; can skip the overhead of #[] (invoked by #to_hash)

data/lib/scorpio/openapi.rb

@@ -138,8 +138,18 @@ module Scorpio
       JsonReference               = openapi_class.call('definitions', 'jsonReference')
 
       class Operation
-        attr_accessor :path
-        attr_accessor :http_method
+        attr_writer :path
+        attr_writer :http_method
+        def path
+          @path ||= if parent.is_a?(Scorpio::OpenAPI::V2::PathItem) && parent.parent.is_a?(Scorpio::OpenAPI::V2::Paths)
+            parent.instance.path.last
+          end
+        end
+        def http_method
+          @http_method ||= if parent.is_a?(Scorpio::OpenAPI::V2::PathItem)
+            instance.path.last
+          end
+        end
 
         # there should only be one body parameter; this returns it
         def body_parameter

data/lib/scorpio/resource_base.rb

@@ -128,8 +128,6 @@ module Scorpio
             unless operation.is_a?(Scorpio::OpenAPI::V2::Operation)
               raise("bad operation at #{operation.fragment}: #{operation.pretty_inspect}")
             end
-            operation.path = path
-            operation.http_method = http_method
           end
         end
 
@@ -217,8 +215,6 @@ module Scorpio
         openapi_document.paths.each do |path, path_item|
           path_item.each do |http_method, operation|
             next if http_method == 'parameters' # parameters is not an operation. TOOD maybe just select the keys that are http methods?
-            operation.path = path
-            operation.http_method = http_method
             method_name = method_names_by_operation[operation]
             # class method
             if operation_for_resource_class?(operation) && !respond_to?(method_name)
@@ -534,8 +530,8 @@ module Scorpio
       response
     end
 
-    def as_json
-      Typelike.as_json(@attributes)
+    def as_json(*opt)
+      Typelike.as_json(@attributes, *opt)
     end
 
     def inspect

data/lib/scorpio/schema_instance_base.rb

@@ -45,11 +45,12 @@ module Scorpio
       end
     end
 
-    def initialize(instance)
+    def initialize(instance, origin: nil)
       unless respond_to?(:schema)
         raise(TypeError, "cannot instantiate #{self.class.inspect} which has no method #schema. please use Scorpio.class_for_schema")
       end
 
+      @origin = origin || self
       self.instance = instance
 
       if @instance.is_a?(Scorpio::JSON::HashNode)
@@ -62,25 +63,37 @@ module Scorpio
     end
 
     module OverrideFromExtensions
-      def as_json
-        Typelike.as_json(instance)
+      def as_json(*opt)
+        Typelike.as_json(instance, *opt)
       end
     end
 
     attr_reader :instance
 
+    def parents
+      parent = @origin
+      (@origin.instance.path.size...self.instance.path.size).map do |i|
+        parent.tap do
+          parent = parent[self.instance.path[i]]
+        end
+      end.reverse
+    end
+    def parent
+      parents.first
+    end
+
     def deref
       derefed = instance.deref
       if derefed.object_id == instance.object_id
         self
       else
-        self.class.new(derefed)
+        self.class.new(derefed, origin: @origin)
       end
     end
 
     def modified_copy(&block)
       modified_instance = instance.modified_copy(&block)
-      self.class.new(modified_instance)
+      self.class.new(modified_instance, origin: @origin)
     end
 
     def fragment
@@ -250,7 +263,7 @@ module Scorpio
           property_schema = property_schema && property_schema.match_to_instance(instance[property_name])
 
           if property_schema && instance[property_name].is_a?(JSON::Node)
-            Scorpio.class_for_schema(property_schema).new(instance[property_name])
+            Scorpio.class_for_schema(property_schema).new(instance[property_name], origin: @origin)
           else
             instance[property_name]
           end
@@ -291,7 +304,7 @@ module Scorpio
           index_schema = index_schema && index_schema.match_to_instance(instance[i])
 
           if index_schema && instance[i].is_a?(JSON::Node)
-            Scorpio.class_for_schema(index_schema).new(instance[i])
+            Scorpio.class_for_schema(index_schema).new(instance[i], origin: @origin)
           else
             instance[i]
           end

data/lib/scorpio/typelike_modules.rb

@@ -9,24 +9,24 @@ module Scorpio
     end
 
     # I could require 'json/add/core' and use #as_json but I like this better.
-    def self.as_json(object)
+    def self.as_json(object, *opt)
       if object.respond_to?(:to_hash)
         object.map do |k, v|
           unless k.is_a?(Symbol) || k.respond_to?(:to_str)
             raise(TypeError, "json object (hash) cannot be keyed with: #{k.pretty_inspect.chomp}")
           end
-          {k.to_s => as_json(v)}
+          {k.to_s => as_json(v, *opt)}
         end.inject({}, &:update)
       elsif object.respond_to?(:to_ary)
-        object.map { |e| as_json(e) }
+        object.map { |e| as_json(e, *opt) }
       elsif [String, TrueClass, FalseClass, NilClass, Numeric].any? { |c| object.is_a?(c) }
         object
       elsif object.is_a?(Symbol)
         object.to_s
       elsif object.is_a?(Set)
-        as_json(object.to_a)
+        as_json(object.to_a, *opt)
       elsif object.respond_to?(:as_json)
-        as_json(object.as_json)
+        as_json(object.as_json(*opt), *opt)
       else
         raise(TypeError, "cannot express object as json: #{object.pretty_inspect.chomp}")
       end

data/lib/scorpio/version.rb

@@ -1,3 +1,3 @@
 module Scorpio
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Scorpio REST client