json-schema-subset-dsl 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5013ebaff6df3b177c3aa955acadd4d3ebb6f163effa1945482f43c6ef659c
-  data.tar.gz: 300c9272d2771a22df0bc753b902597d2a45376bc9ba6d487dbed936c3d06ec1
+  metadata.gz: b477b7c6a66763298840118e09dbeee4c9324bc832eff1e07a790b1307f9309e
+  data.tar.gz: 4719a5ab55b54b7eeaf73368c91687a0c6c13f3000c8cab7e08b5103bf4f7e2d
 SHA512:
-  metadata.gz: 31e72cb5f90d0db5460b396b0efca43164f2ce097e2cf9a5930fd20e8334e1595df3e6d1cf97a9636623d9653615d953d5cea8b8202f957ce0187ca760782687
-  data.tar.gz: b7193dc88e2e8d5f8efdb2fff2a1e545556ad6c55a63b980345005a1a097d107fdb550c41ec6dcd69f777056a312910a9336b326d58b64334e114b62747ffdb5
+  metadata.gz: c7b08bca28d96506afba2998ffc0ff009d6e14ba7d0c145b7df7795236c92f39baa976f89261f24998da9fad85e6b2815b58474d8c09031f9e33437accedeb2c
+  data.tar.gz: 524736dea681839b8ff6da0a38b0229b5b5cecf235d34e50912fa91cc4d050683bc869ab9fbce6ee0d70ebc44619b266fab70113bc9f5b706c1dee7ba84081d9

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# CHANGELOG
+
+## 1.1.0
+
+- scalar value block allowed
+
+## 1.0.0
+
+- released

data/README.md

@@ -1,5 +1,8 @@
 # Json::Schema::Subset::DSL
 
+[![Actions Status](https://github.com/Narazaka/json-schema-subset-dsl/workflows/Ruby/badge.svg)](https://github.com/Narazaka/json-schema-subset-dsl/actions)
+[![Gem Version](https://badge.fury.io/rb/json-schema-subset-dsl.svg)](https://badge.fury.io/rb/json-schema-subset-dsl)
+
 Yet another JSON Schema subset DSL.
 
 Useful when writing a simple JSON schema.

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

@@ -25,14 +25,14 @@ module Json
             ret = @schema.dup
             ret["type"] = @type
             ret["items"] = ret["items"].compile!
-            ret.merge(@params)
+            ret.merge(@params.map { |k, v| [k.to_s, v] }.to_h)
           when Array(@type).include?("object")
             required = @schema.keys - @optionals
             ret = { "type" => @type, "properties" => @schema.map { |k, v| [k, v.compile!] }.to_h }
             ret["required"] = required unless required.empty?
-            ret.merge(@params)
+            ret.merge(@params.map { |k, v| [k.to_s, v] }.to_h)
           else
-            @schema.merge("type" => @type).map { |k, v| [k.to_s, v] }.to_h.merge(@params)
+            @schema.merge("type" => @type).merge(@params).map { |k, v| [k.to_s, v] }.to_h
           end
         end
 
@@ -88,17 +88,17 @@ 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])
+            @schema[name.to_s] = DSL.new(ref: args[1], &block)
           when type == "cref"
-            @schema[name.to_s] = DSL.new(ref: components!(args[1]))
+            @schema[name.to_s] = DSL.new(ref: components!(args[1]), &block)
           when type == "dref"
-            @schema[name.to_s] = DSL.new(ref: definitions!(args[1]))
+            @schema[name.to_s] = DSL.new(ref: definitions!(args[1]), &block)
           when Array(type).include?("array")
             @schema[name.to_s] = DSL.new(type: type, params: opts, schema: { "items" => DSL.new(&block) })
           when Array(type).include?("object")
             @schema[name.to_s] = DSL.new(type: type, params: opts, &block)
           else
-            @schema[name.to_s] = DSL.new(type: type, schema: opts)
+            @schema[name.to_s] = DSL.new(type: type, schema: opts, &block)
           end
         end
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-subset-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Narazaka
@@ -164,6 +164,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_airbnb.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -181,7 +182,7 @@ 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.0.0
+  documentation_uri: https://www.rubydoc.info/gems/json-schema-subset-dsl/1.1.0
 post_install_message: 
 rdoc_options: []
 require_paths: