oapi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4421c069d115418bd789cf9da9d9e6d29286d7eaae99cf3bda9b5791bae4308
-  data.tar.gz: 137785b55b2c6b8a7c3c05246ed1843472f039b790905d380b7e0b49725593a6
+  metadata.gz: 37dbb0c32ad9fbb1b11e79026bfb3dc6264d33e2f7f37e86415b8db74b4d2139
+  data.tar.gz: 769f5aa94adce67c2dd25386fde708ededd589cbfb04505b6dfb87ca76c9210b
 SHA512:
-  metadata.gz: e573b3a84d1577baea6a85e4f3624f18af8fe24e3431317913c6e12afc51b7f8d2fb702bfce2454b7b2c505261ba4f6b142b92abe3eb3636696d601036d6270d
-  data.tar.gz: 20c09ec8fc131fd731fdbe6b03f9a11c81d2e96587152eb47f666ee21d40f704ddd6cdcb95c2c5b898d5854124bf55d025dd5edff8ce5ab9eb9ba2cbeb52e379
+  metadata.gz: cb093caf6f99bafff9e46bd00f08f8b761f3af8fafb7acf8996bb615ac69fcc377303431d82918925fbb30747ede4e2640996dc3aa1a76621a66dc85f2265a96
+  data.tar.gz: cabca79f246baaf09a41dee4991ee08ea8289f3b9c12d7838416e5d0e0c59800eb4190dd44afa92bdd4405f178d613136bd69b0a7cdf5e90c723fe502945ab74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oapi (0.1.1)
+    oapi (0.1.2)
       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,24 @@
+# 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
+
+    class << self
+      def parse(json)
+        ref = json[:$ref]
+        return OAPI::Ref.new(ref) if ref
+
+        super
+      end
+    end
+  end
+
+  item :link, Link
+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/types/map.rb

@@ -15,9 +15,13 @@ 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)
 
+        raise ArgumentError, "ref and block are mutual exclusive" if ref && block
+
+        return @store[key] = OAPI::Ref.new(ref) if ref
+
         @store[key] = type.new(&block)
       end
     end

data/lib/oapi/types/object.rb

@@ -8,11 +8,11 @@ class OAPI::Types::Object
   class << self
     def parse(json)
       new.tap do |obj|
-        (properties || []).each do |name, type|
+        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)
+          value = type.parse(value) if type
           obj.send(name, value)
         end
       end

data/lib/oapi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gleb Sinyavskiy
@@ -50,6 +50,7 @@ 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/paths.rb