json-schema-lite 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b0236550b791f3b4da1f151fe3f27636f2ba94
-  data.tar.gz: d76487b6fcdd15ef59ef76210d452dfb2452cb9f
+  metadata.gz: c226af7c67ffc462fa2eb5c615f8b41f27d1ddd7
+  data.tar.gz: 8a3092eadfee3c0a4af4ae24713e378c206118eb
 SHA512:
-  metadata.gz: 78b7b0f6e37862f9ff60109ed29f70d8cbfe915d882961a83da13d448988dd2887be7eb326c34395336d9b1932cc950b584d6ef6cbc550996114e4178de4ba79
-  data.tar.gz: d2d35063ac0d8cf5e0d3e83f6d768c5e34f6771b825c912db8a0c2c746e5413bc6c9c650786a7cf2d71322880e493da92ab02e0a52a1debb760bca233cfcdf2c
+  metadata.gz: ef5c395345396336fed65827849268ef1df2c41855e9527b7ea4d5a06238777d0f81668d365a719d5541b7f945627e3e04f5c0762c2c54b8dd67a0354ddf7fce
+  data.tar.gz: b60984c2ab691ca8ba5fb4efd66eca51e85b048e8199da63e9a9142a181731eb882906187d9b9bbbc37d3ae1166185ee8bb10cbffd39f69e92d0ece37e73919c

data/README.md

@@ -18,6 +18,23 @@ Or install it yourself as:
 
 ## Usage
 
+- generate by block
+```ruby
+JSON::Schema::Lite.generate do
+  string :title, required: true
+  string :body, required: true
+  number :vote
+  object :author do
+    string :name
+  end
+  array :tags, :string
+  array :related do
+    string :title
+  end
+end
+```
+
+- generate by object
 ```ruby
 JSON::Schema::Lite.generate type: :object,
   required: [:title, :body],
@@ -25,9 +42,13 @@ JSON::Schema::Lite.generate type: :object,
     title: :string,
     body: :string,
     vote: :number,
-    tags: [
-      type: :string
-    ],
+    author: {
+      type: :object,
+      properties: {
+        name: :string,
+      }
+    },
+    tags: [:string],
     related: [
       type: :object,
       properties: {
@@ -37,6 +58,7 @@ JSON::Schema::Lite.generate type: :object,
   }
 ```
 
+- generated json schema
 ```json
 {
   "type": "object",
@@ -45,10 +67,16 @@ JSON::Schema::Lite.generate type: :object,
     "title": { "type": "string" },
     "body": { "type": "string" },
     "vote": { "type": "number" },
+    "author": {
+      "type": "object",
+      "properties": {
+        "name": { "type": "string" }
+      }
+    },
     "tags": {
       "type": "array",
       "items": {
-        "type": "string" 
+        "type": "string"
       }
     },
     "related": {
@@ -78,4 +106,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/munky6
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

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

@@ -0,0 +1,52 @@
+module JSON
+  class Schema
+    module Lite
+      class Block < Hash
+
+        def initialize(&block)
+          self.instance_eval &block
+        end
+
+        %w(string number boolean null).each do |method|
+          define_method method do |key, option = {}|
+            set_properties key, __method__
+            add_required key if option[:required]
+          end
+        end
+
+        def array(key, *args, &block)
+          prop = {
+            type: :array
+          }
+          if block_given?
+            prop[:items] = self.class.new(&block)
+          else
+            prop[:items] = { type: args[0] }
+            if args.size >= 2 && args[1].is_a?(Hash)
+              option = args[1]
+              add_required key if option[:required]
+            end
+          end
+          set_properties key, prop
+        end
+
+        def object(key, &block)
+          set_properties key, self.class.new(&block)
+        end
+
+        private
+
+        def set_properties(key, prop)
+          self[:type] ||= :object
+          self[:properties] ||= {}
+          self[:properties][key] = prop.is_a?(Hash) ? prop : { type: prop }
+        end
+
+        def add_required(key)
+          self[:required] ||= []
+          self[:required] << key
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module JSON
+  class Schema
+    module Lite
+      module Object
+        def self.define(definition)
+          option = definition.is_a?(Hash) ? definition.delete(:option) || {} : {}
+
+          {}.tap do |json_schema|
+            if definition.is_a? Hash
+              definition.each_pair do |k, v|
+                if k.to_s == 'properties' || option[:properties]
+                  v[:option] = { properties: true } if v.is_a?(Hash) && v[:properties].nil?
+                  json_schema[k] = define v
+                else
+                  json_schema[k] = v
+                end
+              end
+            elsif definition.is_a? Array
+              json_schema[:type] = :array
+              json_schema[:items] = define definition[0]
+            else
+              json_schema[:type] = definition
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module JSON
   class Schema
     module Lite
-      VERSION = "0.1.1"
+      VERSION = '0.2.0'
     end
   end
 end

data/lib/json/schema/lite.rb

@@ -1,33 +1,25 @@
-require 'json/schema/lite/version'
 require 'json'
+require 'json/schema/lite/version'
+require 'json/schema/lite/block'
+require 'json/schema/lite/object'
 
 module JSON
   class Schema
     module Lite
-      def self.define(definition)
-        option = definition.is_a?(Hash) ? definition.delete(:option) || {} : {}
-
-        {}.tap do |json_schema|
-          if definition.is_a? Hash
-            definition.each_pair do |k, v|
-              if k.to_s == 'properties' || option[:properties]
-                v[:option] = { properties: true } if v.is_a?(Hash) && v[:properties].nil?
-                json_schema[k] = define v
-              else
-                json_schema[k] = v
-              end
-            end
-          elsif definition.is_a? Array
-            json_schema[:type] = :array
-            json_schema[:items] = define definition[0]
-          else
-            json_schema[:type] = definition
-          end
+      def self.define(definition = nil, &block)
+        if block_given?
+          Block.new &block
+        else
+          Object.define definition
         end
       end
 
-      def self.generate(definition)
-        define(definition).to_json
+      def self.generate(definition = nil, &block)
+        if block_given?
+          define(&block).to_json
+        else
+          define(definition).to_json
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-lite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Masayuki Uehara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -99,6 +99,8 @@ files:
 - bin/setup
 - json-schema-lite.gemspec
 - lib/json/schema/lite.rb
+- lib/json/schema/lite/block.rb
+- lib/json/schema/lite/object.rb
 - lib/json/schema/lite/version.rb
 homepage: https://github.com/munky69rock/json-schema-lite
 licenses: