json-schema-subset-dsl 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b477b7c6a66763298840118e09dbeee4c9324bc832eff1e07a790b1307f9309e
-  data.tar.gz: 4719a5ab55b54b7eeaf73368c91687a0c6c13f3000c8cab7e08b5103bf4f7e2d
+  metadata.gz: 2fc0fdb0a235748e53ecfc032c9d1d97a7b541681e48899c05d045e6cf0a4565
+  data.tar.gz: f1fc46f4d894fa0d4019539ed51d9ec3abfa920178e15654be3b310f289633c8
 SHA512:
-  metadata.gz: c7b08bca28d96506afba2998ffc0ff009d6e14ba7d0c145b7df7795236c92f39baa976f89261f24998da9fad85e6b2815b58474d8c09031f9e33437accedeb2c
-  data.tar.gz: 524736dea681839b8ff6da0a38b0229b5b5cecf235d34e50912fa91cc4d050683bc869ab9fbce6ee0d70ebc44619b266fab70113bc9f5b706c1dee7ba84081d9
+  metadata.gz: b2a9f4ba528fb0be6c908e72f2479f2c0794fe5d046e04c7c5bf2eb546efe7b515079c0cbdc51e8f74fa98c4992052c3a8d116601bd0522d887e26e50662af57
+  data.tar.gz: 504fa8751266b830425ba9fc34858f240b8d7beef7e279930b888ed3a94254ddbef0a89ca3bd42b6b24540314549a4255db66ea4f5496ffe8300434f85e0761c

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 2.0.0
+
+- fix: cref!(id) == "#/components/schemas/#{id}"
+
+## 1.3.0
+
+- add: additionalPropeties support
+
+## 1.2.0
+
+- add: reference_name option
+
 ## 1.1.0
 
 - scalar value block allowed

data/README.md

@@ -26,7 +26,11 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-dsl = Json::Schema::Subset::DSL.new do
+options = {
+  reference_name: ->(name) { name.sub(/Serializer$/, ""),
+}
+
+dsl = Json::Schema::Subset::DSL.new(options) do
   title! "Example"
   id :integer
   name :string, minLength: 1, optional: true
@@ -39,10 +43,10 @@ dsl = Json::Schema::Subset::DSL.new do
   meta :object do
     description :string
     params :array do
-      ref! "#/components/Param"
+      ref! "#/components/schemas/Param"
     end
     opt_params :array do
-      cref! "OptParam"
+      cref! "OptParamSerializer"
     end
     uuid :ref, "#/UUID", optional: true
   end
@@ -59,8 +63,8 @@ dsl.compile! == {
       "type" => "object",
       "properties" => {
         "description" => { "type" => "string" },
-        "params" => { "items" => { "$ref" => "#/components/Param" }, "type" => "array" },
-        "opt_params" => { "items" => { "$ref" => "#/components/OptParam" }, "type" => "array" },
+        "params" => { "items" => { "$ref" => "#/components/schemas/Param" }, "type" => "array" },
+        "opt_params" => { "items" => { "$ref" => "#/components/schemas/OptParam" }, "type" => "array" },
         "uuid" => { "$ref" => "#/UUID" },
       },
       "required" => %w[description params opt_params],

data/json-schema-subset-dsl.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_development_dependency "bundler", "~> 2"
-  spec.add_development_dependency "rake", "~> 10.5"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rspec-power_assert", "~> 1.1"
   spec.add_development_dependency "rubocop", "~> 0.76"

data/lib/json/schema/subset/dsl/version.rb

@@ -2,7 +2,7 @@ module Json
   module Schema
     module Subset
       class DSL
-        VERSION = "1.1.0".freeze
+        VERSION = "2.0.0".freeze
       end
     end
   end

data/lib/json/schema/subset/dsl.rb

@@ -4,11 +4,12 @@ module Json
   module Schema
     module Subset
       class DSL
-        def initialize(type: "object", schema: {}, params: {}, ref: nil, &block)
+        def initialize(type: "object", schema: {}, params: {}, ref: nil, options: nil, &block)
           @type = type
           @schema = schema
           @params = params
           @ref = ref
+          @options = options || {}
           @optionals = []
           set!(&block) if block_given?
         end
@@ -58,16 +59,16 @@ module Json
         end
 
         def components!(name)
-          "#/components/#{name}"
+          "#/components/schemas/#{canon_name!(name)}"
         end
 
         def definitions!(name)
-          "#/definitions/#{name}"
+          "#/definitions/#{canon_name!(name)}"
         end
 
         def array!(&block)
           change_type!("array")
-          @schema["items"] = DSL.new(&block)
+          @schema["items"] = DSL.new(options: @options, &block)
         end
 
         def respond_to_missing?(name, include_private)
@@ -76,7 +77,11 @@ module Json
 
         def method_missing(name, *args, &block)
           if name.to_s.end_with?("!")
-            @params[name[0...-1]] = args[0]
+            if block_given?
+              @params[name[0...-1]] = DSL.new(options: @options, &block).compile!
+            else
+              @params[name[0...-1]] = args[0]
+            end
             return
           end
 
@@ -88,17 +93,20 @@ module Json
           type = type.is_a?(Array) ? type.map(&:to_s) : type.to_s
           case
           when type == "ref"
-            @schema[name.to_s] = DSL.new(ref: args[1], &block)
+            @schema[name.to_s] = DSL.new(ref: args[1], options: @options, &block)
           when type == "cref"
-            @schema[name.to_s] = DSL.new(ref: components!(args[1]), &block)
+            @schema[name.to_s] = DSL.new(ref: components!(args[1]), options: @options, &block)
           when type == "dref"
-            @schema[name.to_s] = DSL.new(ref: definitions!(args[1]), &block)
+            @schema[name.to_s] = DSL.new(ref: definitions!(args[1]), options: @options, &block)
           when Array(type).include?("array")
-            @schema[name.to_s] = DSL.new(type: type, params: opts, schema: { "items" => DSL.new(&block) })
+            @schema[name.to_s] =
+              DSL.new(
+                type: type, params: opts, schema: { "items" => DSL.new(options: @options, &block) }, options: @options,
+              )
           when Array(type).include?("object")
-            @schema[name.to_s] = DSL.new(type: type, params: opts, &block)
+            @schema[name.to_s] = DSL.new(type: type, params: opts, options: @options, &block)
           else
-            @schema[name.to_s] = DSL.new(type: type, schema: opts, &block)
+            @schema[name.to_s] = DSL.new(type: type, schema: opts, options: @options, &block)
           end
         end
 
@@ -114,6 +122,10 @@ module Json
             @type = Array(@type) + [type]
           end
         end
+
+        def canon_name!(name)
+          @options[:reference_name] ? @options[:reference_name].call(name.to_s) : name.to_s
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-subset-dsl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Narazaka
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -182,8 +182,8 @@ metadata:
   homepage_uri: https://github.com/Narazaka/json-schema-subset-dsl
   source_code_uri: https://github.com/Narazaka/json-schema-subset-dsl.git
   changelog_uri: https://github.com/Narazaka/json-schema-subset-dsl/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/json-schema-subset-dsl/1.1.0
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/json-schema-subset-dsl/2.0.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Yet another JSON Schema subset DSL
 test_files: []