open_api_2_json_schema 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7f9dc1848c8bc1810adba623e3a909937e781a8d916530f008791d9fafbb03
-  data.tar.gz: 17847b2a3ae5114c7a331e811c59dc062d018aa8646b109c099fb35260d497db
+  metadata.gz: 8f25b393383b6694b23d0306c5a48f91762ba658afbd488c15fa16c40cbfa246
+  data.tar.gz: 5bc71e2ab8ff4019428686c39b17cc46f8ea5445d4d181af6fca65aa41b8cdd1
 SHA512:
-  metadata.gz: 81d9359bc0f47a7ce8f7660af70bb44190b0c241f33b1031b1eeb04d51358dae4962f7259f83dbed511caa8a62bdac137db5050932b0d3f891d245d963d0b9b7
-  data.tar.gz: 8019ae57689e5386956cd2222c1f4a457ba37e9dd03942095486fec12d60297bddcb8fb935db709ab32041e09530af2a3dbb790195565eed3e76db1720c62e66
+  metadata.gz: 3263c6c3f5372ff6e6cc93a812ce429ce1ab03d64b1d7eb5cfb23e9291f48b162accca973247dfca2fbc1da1b851089d5a4b21d663cfd0a300fe4fb368f69c1c
+  data.tar.gz: 828d603767e21eab7b4197d4e3c8217b0cd816464e1726916c9e42571b09c0bcfdff8e1e3622f0f07928f74b67f6d54c87c752ec890dc0902119343181518ce8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.2] - 2022-10-19
+
+- Support `discriminator`
+
 ## [0.1.1] - 2022-09-23
 
 - Support `$ref` and `allOf`

data/README.md

@@ -34,6 +34,46 @@ schema = {
 OpenApi2JsonSchema.convert(schema)
 ```
 
+### Discriminator
+
+```yaml
+# Sample YAML file
+schema:
+  discriminator:
+    propertyName: key
+    mapping:
+      value1: 'path-to-file-2.yml'
+      value2: 'path-to-file-2.yml'
+  properties:
+    key:
+      type: string
+      enum:
+        - value1
+        - value2
+```
+
+```json
+"schema": {
+  "properties": {
+    "key": {
+      "type": "string",
+      "enum": ["value1", "value2"]
+    }
+  },
+  "discriminator": {
+    "propertyName": "name",
+    "mapping": {
+      "value1": {
+        "type": "object"
+      },
+      "value2": {
+        "type": "array"
+      }
+    }
+  }
+}
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/attribute_handlers/discriminator.rb

@@ -0,0 +1,18 @@
+require_relative "../ref_schema_parser"
+
+module OpenApi2JsonSchema
+  module AttributeHandlers
+    class Discriminator
+      def call(discriminator_schema)
+        raise "discriminator schema must be a Hash" unless discriminator_schema.is_a?(Hash)
+
+        mapping = discriminator_schema.fetch("mapping")
+        mapping.each do |key, file_path|
+          mapping[key] = OpenApi2JsonSchema::RefSchemaParser.new.call(file_path)
+        end
+
+        discriminator_schema
+      end
+    end
+  end
+end

data/lib/open_api_2_json_schema/version.rb

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

data/lib/open_api_2_json_schema.rb

@@ -4,13 +4,14 @@ require 'json'
 require 'yaml'
 require_relative "open_api_2_json_schema/version"
 require_relative 'attribute_handlers/all_of'
+require_relative 'attribute_handlers/discriminator'
 
 module OpenApi2JsonSchema
   module_function
 
-  STRUCTS = ['allOf', 'anyOf', 'oneOf', 'not', 'items', 'additionalProperties', 'schema']
+  STRUCTS = ['allOf', 'anyOf', 'oneOf', 'not', 'items', 'additionalProperties', 'schema', 'discriminator']
   NOT_SUPPORTED = [
-    'nullable', 'discriminator', 'readOnly',
+    'nullable', 'readOnly',
     'writeOnly', 'xml', 'externalDocs',
     'example', 'deprecated'
   ]
@@ -59,7 +60,11 @@ module OpenApi2JsonSchema
           end
         end
       when Hash
-        json_schema[struct] = convert_schema(data)
+        if struct == 'discriminator'
+          json_schema[struct] = AttributeHandlers::Discriminator.new.call(data)
+        else
+          json_schema[struct] = convert_schema(data)
+        end
       else
         # ignore
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_api_2_json_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hieuk09
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies: []
 description: 'Due to the OpenAPI v3.0 and JSON Schema discrepancy, you can use this
   JS library to convert OpenAPI Schema objects to proper JSON Schema. '
@@ -28,6 +28,7 @@ files:
 - bin/console
 - bin/setup
 - lib/attribute_handlers/all_of.rb
+- lib/attribute_handlers/discriminator.rb
 - lib/open_api_2_json_schema.rb
 - lib/open_api_2_json_schema/version.rb
 - lib/ref_schema_parser.rb