json-schema-lite 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66110f7f12388fd87b757c2edffdf284ea20a52f
-  data.tar.gz: 39aed978cca843d4220a91f59c09f19aa8a62202
+  metadata.gz: cc7e4cce56cb5263ae0be3dea4b6bb016dd66361
+  data.tar.gz: 523d20ee78ca195a6d1fbc1caf1b8d48f20bfc7e
 SHA512:
-  metadata.gz: 19742fc7bb10f9ff4e47df138fe3c80ad2c4bc1582d43f01be424a5b0b09284b2436538afd4e2b64a5ed0e38129c8ceb952908b994b5e94237b07aa7d56d4e4e
-  data.tar.gz: f051db43ee99242b02a0d647b5de3878426fd1c546ca90210ecb35697b1be1bbdb0e62af4e70f626182112433b6b8f53164f5072ba568e83eec1fb83550063e7
+  metadata.gz: 7452134c76dcc3f98802a9d63e4c620bb80585574d1b415f57708a6494f990d19c7dc1b21b13f7d4faf30f7d48d60eba9aacfcc5f7dfd1157688591b7f799561
+  data.tar.gz: ea7c3264ef7c977c6325c9b4e41f48637eb8d951fe6f6202666adc29f0d6eac299c184a9bb16b5645d780b4e1a623919ced98fbab4c94b4822167e03cd5fcf7f

data/lib/json/schema/lite/block.rb

@@ -7,9 +7,9 @@ module JSON
           self.instance_eval &block
         end
 
-        %w(string number boolean null).each do |method|
+        %i(string number boolean null).each do |method|
           define_method method do |key, option = {}|
-            set_properties key, __method__
+            set_properties key, option[:allow_null] ? { anyOf: [{ type: method }, { type: :null }] } : method
             add_required key if option[:required]
           end
         end

data/lib/json/schema/lite/object.rb

@@ -16,8 +16,12 @@ module JSON
                 end
               end
             elsif definition.is_a? Array
-              json_schema[:type] = :array
-              json_schema[:items] = define definition[0]
+              if definition.size == 1
+                json_schema[:type] = :array
+                json_schema[:items] = define definition[0]
+              else
+                json_schema[:anyOf] = definition.map { |d| { type: d } }
+              end
             else
               json_schema[:type] = definition
             end

data/lib/json/schema/lite/version.rb

@@ -1,7 +1,7 @@
 module JSON
   class Schema
     module Lite
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-lite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Masayuki Uehara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json