oapi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37dbb0c32ad9fbb1b11e79026bfb3dc6264d33e2f7f37e86415b8db74b4d2139
-  data.tar.gz: 769f5aa94adce67c2dd25386fde708ededd589cbfb04505b6dfb87ca76c9210b
+  metadata.gz: 51585744c9a5a8787b4cbc8235ca2f613fdad0fc8d28aea14ad8242b2d39d107
+  data.tar.gz: b68db8b06768f24ead377f085cd5cb546aba3a9912ebe550229f3ca037621621
 SHA512:
-  metadata.gz: cb093caf6f99bafff9e46bd00f08f8b761f3af8fafb7acf8996bb615ac69fcc377303431d82918925fbb30747ede4e2640996dc3aa1a76621a66dc85f2265a96
-  data.tar.gz: cabca79f246baaf09a41dee4991ee08ea8289f3b9c12d7838416e5d0e0c59800eb4190dd44afa92bdd4405f178d613136bd69b0a7cdf5e90c723fe502945ab74
+  metadata.gz: 96f581933db469a307cfe53e22611a5821540d1b6fdadb77d9e81ab70deaf2097c748108c559105ca0bab6c6097f8d80baeb4d0f36f63ad50fb3709e7d06c0af
+  data.tar.gz: a2ea340668ebd92716f3434094ae809e5c8c25f1e07e0fe6fc329f225c88125c2d62cb35c378f388ae9e1ab755ed88adf86d5a084f080544eb2960298512f9e6

data/Gemfile.lock

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

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

@@ -9,15 +9,6 @@ class OAPI::OpenAPI::V30::Links < OAPI::Types::Map
 
     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

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/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

@@ -25,12 +25,5 @@ class OAPI::Types::Map < OAPI::Types::Object
         @store[key] = type.new(&block)
       end
     end
-
-    def parse(json)
-      store = json.transform_values do |value|
-        item_type ? item_type.parse(value) : value
-      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 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.2"
+  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.2
+  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
@@ -53,6 +53,7 @@ files:
 - 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