json-schema-generator 0.0.2 → 0.0.3

data/lib/json/schema_generator.rb

@@ -1,5 +1,10 @@
+require 'json/schema_generator/statement_group'
+
 module JSON
   class SchemaGenerator
+    DRAFT3 = 'draft-03'
+    DRAFT4 = 'draft-04'
+
     class << self
       def generate name, data, version
         generator = JSON::SchemaGenerator.new name, version
@@ -10,92 +15,115 @@ module JSON
     def initialize name, version = 'draft3'
       @buffer = StringIO.new
       @name = name
-      @version = 'draft-03' if version == 'draft3'
-      @version = 'draft-04' if version == 'draft4'
+      @version = DRAFT3 if version == 'draft3'
+      @version = DRAFT4 if version == 'draft4'
     end
 
     def generate raw_data
-      # Write header
-      @buffer.puts "{"
-      @buffer.puts "\"$schema\": \"http://json-schema.org/#{@version}/schema#\","
-      @buffer.print '"description": "Generated from '
-      @buffer.print @name
-      @buffer.print " with shasum "
-      @buffer.print Digest::SHA1.hexdigest raw_data
-      @buffer.puts '",'
-
-      # 
       data = JSON.load(raw_data)
-
-      @buffer.puts create_hash(data)
-      close
+      statement_group = StatementGroup.new
+      statement_group.add "\"$schema\": \"http://json-schema.org/#{@version}/schema#\""
+      statement_group.add "\"description\": \"Generated from #{@name} with shasum #{Digest::SHA1.hexdigest raw_data}\""
+      create_hash(statement_group, data, detect_required(data))
+      @buffer.puts statement_group
       result
     end
 
     protected
 
-    def close
-      @buffer.puts "}"
-    end
+    def create_primitive(statement_group, key, value, required_keys)
+      if required_keys.nil?
+        required = true
+      else
+        required = required_keys.include? key
+      end
 
-    def create_values(key, value)
-      buffer = StringIO.new
-      buffer.puts "\"#{key}\": {"
-      case value
-      when NilClass
+      type = case value
       when TrueClass, FalseClass
-        buffer.puts '"type": "boolean",'
-        buffer.puts '"required": true'
-
+        "boolean"
       when String
-        buffer.puts '"type": "string",'
-        buffer.puts '"required": true'
-
+        "string"
       when Integer
-        buffer.puts '"type": "integer",'
-        buffer.puts '"required": true'
-
+        "integer"
       when Float
-        buffer.puts '"type": "number",'
-        buffer.puts '"required": true'
+        "number"
+      else
+        raise "Unknown Primitive Type for #{key}! #{value.class}"
+      end
+
+      statement_group.add "\"type\": \"#{type}\""
+      statement_group.add "\"required\": #{required}" if @version == DRAFT3
+      # statement_group.add "\"default\": #{value.inspect}"
+    end
+
+    def create_values(key, value, required_keys = nil, in_array = false)
+      statement_group = StatementGroup.new key
+      # buffer.puts "\"#{key}\": {"
+      case value
+      when NilClass
+      when TrueClass, FalseClass, String, Integer, Float
+        create_primitive(statement_group, key, value, required_keys)
       when Array
-        buffer << create_array(value)
+        create_array(statement_group, value, detect_required(value))
       when Hash
-        buffer << create_hash(value)
+        if in_array
+          create_hash(statement_group, value, required_keys)
+        else
+          create_hash(statement_group, value, detect_required(value))
+        end
       else
         raise "Unknown Type for #{key}! #{value.class}"
       end
-      buffer.print "}"
-      buffer.string
+      statement_group
     end
 
-    def create_hash(data)
-      buffer = StringIO.new
-      buffer.puts '"type": "object",'
-      buffer.puts '"required": true,'
-      buffer.puts '"properties": {'
-      items = data.collect do |k,v|
-        create_values k,v
+    def create_hash(statement_group, data, required_keys)
+      # statement_group = StatementGroup.new
+      statement_group.add '"type": "object"'
+      statement_group.add '"required": true' if @version == DRAFT3
+      if @version == DRAFT4
+        required_keys ||= []
+        required_string = required_keys.map(&:inspect).join ', '
+        statement_group.add "\"required\": [#{required_string}]"
       end
-      buffer << items.join(",\n")
-      buffer.puts '}'
+      statement_group.add create_hash_properties data, required_keys
+      statement_group
+    end
 
-      buffer.string
+    def create_hash_properties(data, required_keys)
+      statement_group = StatementGroup.new "properties"
+      data.collect do |k,v|
+        statement_group.add create_values k, v, required_keys
+      end
+      statement_group
     end
 
-    def create_array(data)
-      buffer = StringIO.new
-      buffer.puts '"type": "array",'
-      buffer.puts '"required": true,'
+    def create_array(statement_group, data, required_keys)
+      # statement_group = StatementGroup.new
+      statement_group.add '"type": "array"'
+      statement_group.add '"required": true' if @version == DRAFT3
       if data.size == 0
-        buffer.puts '"minItems": 0,'
+        statement_group.add '"minItems": 0'
       else
-        buffer.puts '"minItems": 1,'
+        statement_group.add '"minItems": 1'
       end
-      buffer.puts '"uniqueItems": true,'
-      buffer.puts create_values("items", data.first)
+      statement_group.add '"uniqueItems": true'
+      statement_group.add create_values("items", data.first, required_keys, true)
 
-      buffer.string
+      statement_group
+    end
+
+    def detect_required(collection)
+      begin
+        required_keys = collection.map(&:keys).inject{|required,keys| required & keys }
+      rescue
+        if collection.respond_to? :keys
+          required_keys = collection.keys
+        else
+          required_keys = nil
+        end
+      end
+      required_keys
     end
 
     def result

data/lib/json/schema_generator/statement_group.rb

@@ -0,0 +1,26 @@
+module JSON
+  class SchemaGenerator
+    class StatementGroup
+      def initialize key = nil
+        @key = key
+        @statements = []
+      end
+
+      def add statement
+        @statements << statement
+      end
+
+      def to_s
+        buffer = StringIO.new
+        if @key.nil?
+          buffer.puts "{"
+        else 
+          buffer.puts "\"#{@key}\": {"
+        end
+        buffer.puts @statements.join ', '
+        buffer.puts "}"
+        buffer.string
+      end
+    end
+  end
+end

data/lib/json/schema_generator/version.rb

@@ -1,5 +1,5 @@
 module JSON
   class SchemaGenerator
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/json/schema_generator_cli.rb

@@ -4,8 +4,9 @@ class JSON::SchemaGeneratorCLI
   end
 
   def execute!
-    file = ARGV[0]
-    schema = JSON.parse(JSON::SchemaGenerator.generate file, File.read(file), ARGV[1])
+    file = ARGV.shift
+    version = ARGV.shift || 'draft3'
+    schema = JSON.parse(JSON::SchemaGenerator.generate file, File.read(file), version)
     @stdout.puts JSON.pretty_generate schema
     @kernel.exit(0)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,7 @@ files:
 - json-schema-generator.gemspec
 - lib/json-schema-generator.rb
 - lib/json/schema_generator.rb
+- lib/json/schema_generator/statement_group.rb
 - lib/json/schema_generator/version.rb
 - lib/json/schema_generator_cli.rb
 homepage: ''