oapi 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4421c069d115418bd789cf9da9d9e6d29286d7eaae99cf3bda9b5791bae4308
-  data.tar.gz: 137785b55b2c6b8a7c3c05246ed1843472f039b790905d380b7e0b49725593a6
+  metadata.gz: 51585744c9a5a8787b4cbc8235ca2f613fdad0fc8d28aea14ad8242b2d39d107
+  data.tar.gz: b68db8b06768f24ead377f085cd5cb546aba3a9912ebe550229f3ca037621621
 SHA512:
-  metadata.gz: e573b3a84d1577baea6a85e4f3624f18af8fe24e3431317913c6e12afc51b7f8d2fb702bfce2454b7b2c505261ba4f6b142b92abe3eb3636696d601036d6270d
-  data.tar.gz: 20c09ec8fc131fd731fdbe6b03f9a11c81d2e96587152eb47f666ee21d40f704ddd6cdcb95c2c5b898d5854124bf55d025dd5edff8ce5ab9eb9ba2cbeb52e379
+  metadata.gz: 96f581933db469a307cfe53e22611a5821540d1b6fdadb77d9e81ab70deaf2097c748108c559105ca0bab6c6097f8d80baeb4d0f36f63ad50fb3709e7d06c0af
+  data.tar.gz: a2ea340668ebd92716f3434094ae809e5c8c25f1e07e0fe6fc329f225c88125c2d62cb35c378f388ae9e1ab755ed88adf86d5a084f080544eb2960298512f9e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oapi (0.1.1)
+    oapi (0.1.3)
       zeitwerk (~> 2.6)
 
 GEM

data/lib/oapi/open_api/v30/components.rb

@@ -43,20 +43,6 @@ class OAPI::OpenAPI::V30::Components < OAPI::Types::Object
     item :scheme, Scheme
   end
 
-  class Links < OAPI::Types::Map
-    class Link < OAPI::Types::Object
-      property :operation_ref
-      property :operation_id
-      property :request_body
-      property :description
-
-      property :parameters # TODO: a custom type? https://spec.openapis.org/oas/v3.0.3#fixed-fields-16
-      property :server, OAPI::OpenAPI::V30::Servers::Server
-    end
-
-    item :link, Link
-  end
-
   property :schemas, Schemas
   property :responses, OAPI::OpenAPI::V30::Responses
   property :parameters, Parameters
@@ -64,6 +50,6 @@ class OAPI::OpenAPI::V30::Components < OAPI::Types::Object
   property :request_bodies, RequestBodies
   property :headers, OAPI::OpenAPI::V30::Headers
   property :security_schemes, SecuritySchemes
-  property :links, Links
+  property :links, OAPI::OpenAPI::V30::Links
   property :callbacks, OAPI::OpenAPI::V30::Callbacks
 end

data/lib/oapi/open_api/v30/links.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class OAPI::OpenAPI::V30::Links < OAPI::Types::Map
+  class Link < OAPI::Types::Object
+    property :operation_ref
+    property :operation_id
+    property :request_body
+    property :description
+
+    property :parameters # TODO: a custom type? https://spec.openapis.org/oas/v3.0.3#fixed-fields-16
+    property :server, OAPI::OpenAPI::V30::Servers::Server
+  end
+
+  item :link, Link
+end

data/lib/oapi/open_api/v30/parsers/json.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class OAPI::OpenAPI::V30::Parsers::JSON
+  using OAPI::Monkey
+
+  class << self
+    def parse(input) = parse_object(input, OAPI::OpenAPI::V30::Definition)
+
+    def parse_type(input, type)
+      return input if type.nil?
+
+      return parse_array(input, type) if type <= OAPI::Types::Array
+
+      return parse_map(input, type) if type <= OAPI::Types::Map
+
+      return OAPI::Ref.new(input[:$ref]) if input[:$ref]
+
+      return type.new { input } if type <= OAPI::Schema
+
+      return parse_object(input, type) if type <= OAPI::Types::Object
+
+      raise ArgumentError, "unknown type #{type}"
+    end
+
+    def parse_object(input, klass)
+      klass.new.tap do |obj|
+        klass.properties.each do |name, type|
+          value = input[name.camelize]
+
+          obj.send(name, parse_type(value, type)) unless value.nil?
+        end
+      end
+    end
+
+    def parse_array(input, klass) = klass.new(input.map { parse_type(_1, klass.item_type) })
+    def parse_map(input, klass) = klass.new(input.transform_values { parse_type(_1, klass.item_type) })
+  end
+end

data/lib/oapi/open_api/v30/responses.rb

@@ -6,6 +6,8 @@ class OAPI::OpenAPI::V30::Responses < OAPI::Types::Map
 
     property :content, OAPI::OpenAPI::V30::Content
     property :headers, OAPI::OpenAPI::V30::Headers
+
+    property :links, OAPI::OpenAPI::V30::Links
   end
 
   item :response, Response

data/lib/oapi/open_api/v30/serializers/ruby.rb

@@ -5,9 +5,13 @@ class OAPI::OpenAPI::V30::Serializers::Ruby < OAPI::OpenAPI::V30::Serializers::S
 
   MAP_TEMPLATE = %(
 <% object.store.each do |key, value| -%>
-  <%= object.class.item_name %>("<%= key %>") do
-    <%= serialize_if_supported(value) %>
-  end
+<% if value.is_a?(OAPI::Ref) -%>
+<%= object.class.item_name %>("<%= key %>", ref: <%= serialize(value) %>)
+<% else -%>
+<%= object.class.item_name %>("<%= key %>") do
+  <%= serialize_if_supported(value) %>
+end
+<% end -%>
 <% end -%>
 )
 
@@ -22,13 +26,13 @@ end
   OBJECT_TEMPLATE = %(
 <% object.properties.each do |prop, value| -%>
 <% if value.is_a?(OAPI::Ref) -%>
-<%= prop%>(ref: <%= serialize(value) %>)
+<%= prop %>(ref: <%= serialize(value) %>)
 <% elsif supported?(value) -%>
 <%= prop %> do
   <%= serialize(value) %>
 end
 <% elsif !value.nil? -%>
-<%= prop %> <%= value.inspect %>
+<%= prop %> <%= value_to_ruby(value) %>
 <% end -%>
 <% end -%>
 )
@@ -43,6 +47,13 @@ end
     def serialize(node) = OAPI::OpenAPI::V30::Serializers::Ruby.serialize(node)
     def supported?(node) = OAPI::OpenAPI::V30::Serializers::Ruby.supported?(node)
     def serialize_if_supported(node) = OAPI::OpenAPI::V30::Serializers::Ruby.serialize_if_supported(node)
+
+    def value_to_ruby(value)
+      return value.inspect if [Numeric, String, Array, TrueClass, FalseClass].any? { value.is_a?(_1) }
+      return "(#{value.inspect})" if value.is_a?(Hash)
+
+      raise ArgumentError, "value: #{value}"
+    end
   end
 
   def serialize_ref(ref) = ref.ref.inspect

data/lib/oapi/schema.rb

@@ -6,13 +6,4 @@ class OAPI::Schema
   def initialize
     @schema = yield if block_given?
   end
-
-  class << self
-    def parse(json)
-      ref = json[:$ref]
-      return OAPI::Ref.new(ref) if ref
-
-      new { json }
-    end
-  end
 end

data/lib/oapi/types/array.rb

@@ -19,7 +19,5 @@ class OAPI::Types::Array < OAPI::Types::Object
         @store << type.new(&block)
       end
     end
-
-    def parse(json) = new(json.map { item_type.parse(_1) })
   end
 end

data/lib/oapi/types/map.rb

@@ -15,18 +15,15 @@ class OAPI::Types::Map < OAPI::Types::Object
       @item_name = name
       @item_type = type
 
-      define_method(name) do |key, &block|
+      define_method(name) do |key, ref: nil, &block|
         raise ArgumentError, "'#{key}' already exists" if @store.include?(key.to_s)
 
-        @store[key] = type.new(&block)
-      end
-    end
+        raise ArgumentError, "ref and block are mutual exclusive" if ref && block
 
-    def parse(json)
-      store = json.transform_values do |value|
-        item_type ? item_type.parse(value) : value
+        return @store[key] = OAPI::Ref.new(ref) if ref
+
+        @store[key] = type.new(&block)
       end
-      new(store)
     end
   end
 end

data/lib/oapi/types/object.rb

@@ -1,21 +1,5 @@
 # frozen_string_literal: true
 
 class OAPI::Types::Object
-  using OAPI::Monkey
-
   include OAPI::Properties
-
-  class << self
-    def parse(json)
-      new.tap do |obj|
-        (properties || []).each do |name, type|
-          value = json[name.camelize]
-          next if value.nil?
-
-          value = type.parse(value) if value.is_a?(Hash) || (value.is_a?(Array) && type)
-          obj.send(name, value)
-        end
-      end
-    end
-  end
 end

data/lib/oapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OAPI
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/oapi.rb

@@ -34,7 +34,7 @@ module OAPI
       version = json[:openapi]
       raise UnsupportedSpecVersion, "unsupported version #{version}" unless version.start_with?("3.0")
 
-      OAPI::OpenAPI::V30::Definition.parse(json)
+      OAPI::OpenAPI::V30::Parsers::JSON.parse(json)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -50,8 +50,10 @@ files:
 - lib/oapi/open_api/v30/external_docs.rb
 - lib/oapi/open_api/v30/headers.rb
 - lib/oapi/open_api/v30/info.rb
+- lib/oapi/open_api/v30/links.rb
 - lib/oapi/open_api/v30/media_type.rb
 - lib/oapi/open_api/v30/parameters.rb
+- lib/oapi/open_api/v30/parsers/json.rb
 - lib/oapi/open_api/v30/paths.rb
 - lib/oapi/open_api/v30/request_body.rb
 - lib/oapi/open_api/v30/responses.rb