json-schema_builder 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e1e931da1f8e1ef88c5f267408422b8195f7d85
-  data.tar.gz: 561d28974eb9bcaa95d84c3799db95ea466ee3b1
+  metadata.gz: e13b97322fe070943bcaa063cbb11661fd0b576d
+  data.tar.gz: eb0dfeccc78fc5af31b50889af7473a9eeedf566
 SHA512:
-  metadata.gz: de361202331e17c8b447fda6f5d76de261edef07f367af44493ef4bd1034c040e97a4efbd7c865ed18bd33ef10316bd42543d74d34be1ff6c6b907bf4aa018f7
-  data.tar.gz: 0d23b47272718d8ca60b575ed39b10c562af101d7537e2b27e064ef8ea4ef87cb6b5822a9eedc65cc1deb8a93f24b555373048a8c68bf4a05671d97f2fab0814
+  metadata.gz: 9db0f2942aa747cff7b9f94d41fb363ec03f9262d30ad29b313582787fb6aa7eed1168165bd25ebf07bfad0fff83cb73c22ca60ec7e52c9766c0388ddc57a8cb
+  data.tar.gz: 4bea5f690c51c8b3caad56dff0818d72cd20282baf192334e6562597424d220021511ed15794837fb6dabef5128b72822ed657efb6a235852ddd45b85510934a

data/lib/json/schema_builder/attribute.rb

@@ -25,11 +25,14 @@ module JSON
 
       protected
 
-      def _array_attr(attr, values)
+      def _array_attr(attr, values = [])
         if values.empty?
-          self.schema[attr]
+          self.schema[attr] || []
         else
-          self.schema[attr] = values
+          self.schema[attr] ||= []
+          self.schema[attr] += values
+          self.schema[attr].uniq!
+          self.schema[attr]
         end
       end
 

data/lib/json/schema_builder/entity.rb

@@ -36,6 +36,7 @@ module JSON
         initialize_parent_with opts
         initialize_with opts
         eval_block &block
+        extract_types
       end
 
       def add_fragment(child)
@@ -84,6 +85,16 @@ module JSON
 
       protected
 
+      def extract_types
+        any_of(null) if @nullable
+        if any_of.present?
+          everything_else = schema.data.reject { |k, v| k == "anyOf" }
+          return unless everything_else.present?
+          schema.data.select! { |k, v| k == "anyOf" }
+          schema.data["anyOf"].unshift everything_else
+        end
+      end
+
       def initialize_parent_with(opts)
         @parent = opts.delete :parent
         if parent
@@ -96,6 +107,7 @@ module JSON
       end
 
       def initialize_with(opts)
+        @nullable = opts.delete :null
         @options = opts.delete(:root).class.options.to_h if opts[:root]
         opts.each_pair do |key, value|
           next if value.nil?

data/lib/json/schema_builder/helpers.rb

@@ -33,6 +33,10 @@ module JSON
           any_of list
         end
       end
+
+      def empty_string(name = nil, opts = { }, &block)
+        string name, opts.merge(max_length: 0), &block
+      end
     end
   end
 end

data/lib/json/schema_builder/object.rb

@@ -11,14 +11,18 @@ module JSON
       attribute :additional_properties
       attribute :pattern_properties
 
-      def initialize(name, opts = { }, &block)
+      def initialize_children
         self.properties = { }
-        super
-        children.each do |child|
+        children.select(&:name).each do |child|
           self.properties[child.name] = child.as_json
         end
       end
 
+      def extract_types
+        initialize_children
+        super
+      end
+
       def required(*values)
         case values
         when []

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/spec/integration/mixed_any_ofs_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+RSpec.describe Examples::MixedAnyOfs, type: :integration do
+  it_behaves_like 'a builder' do
+    let(:expected_json) do
+      {
+        type: "object",
+        properties: {
+          blankable: {
+            anyOf: [
+              { type: "integer" },
+              { type: "string" },
+              { type: "null" }
+            ]
+          },
+          nullable: {
+            anyOf: [
+              {
+                type: "object",
+                properties: {
+                  test: {
+                    type: "string"
+                  }
+                }
+              },
+              { type: "null" }
+            ]
+          },
+          flexible: {
+            anyOf: [
+              { type: "string", minLength: 100 },
+              { type: "string", maxLength: 0 },
+              { type: "integer" },
+              {
+                type: "object",
+                properties: {
+                  one: {
+                    type: "string"
+                  }
+                }
+              },
+              {
+                type: "array",
+                items: {
+                  type: "object",
+                  properties: {
+                    one: {
+                      type: "string"
+                    }
+                  }
+                }
+              },
+              { type: "null" },
+            ]
+          },
+        }
+      }
+    end
+  end
+end

data/spec/support/examples/mixed_any_ofs.rb

@@ -0,0 +1,28 @@
+module Examples
+  class MixedAnyOfs
+    include JSON::SchemaBuilder
+
+    def example
+      object do
+        integer :blankable, any_of: [string], null: true
+
+        object :nullable, null: true do
+          string :test
+        end
+
+        entity :flexible, any_of: [string(min_length: 100), empty_string, integer], null: true do
+          any_of [
+            an_object(self),
+            array { items { an_object(self) } }
+          ]
+        end
+      end
+    end
+
+    def an_object(root)
+      root.object do
+        string :one
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,7 @@ files:
 - spec/integration/custom_errors_spec.rb
 - spec/integration/entity_literals_spec.rb
 - spec/integration/ids_spec.rb
+- spec/integration/mixed_any_ofs_spec.rb
 - spec/integration/mixed_arrays_spec.rb
 - spec/integration/mixed_objects_spec.rb
 - spec/integration/object_definitions_spec.rb
@@ -225,6 +226,7 @@ files:
 - spec/support/examples/custom_errors.rb
 - spec/support/examples/entity_literals.rb
 - spec/support/examples/ids.rb
+- spec/support/examples/mixed_any_ofs.rb
 - spec/support/examples/mixed_arrays.rb
 - spec/support/examples/mixed_objects.rb
 - spec/support/examples/object_definitions.rb
@@ -280,6 +282,7 @@ test_files:
 - spec/integration/custom_errors_spec.rb
 - spec/integration/entity_literals_spec.rb
 - spec/integration/ids_spec.rb
+- spec/integration/mixed_any_ofs_spec.rb
 - spec/integration/mixed_arrays_spec.rb
 - spec/integration/mixed_objects_spec.rb
 - spec/integration/object_definitions_spec.rb
@@ -299,6 +302,7 @@ test_files:
 - spec/support/examples/custom_errors.rb
 - spec/support/examples/entity_literals.rb
 - spec/support/examples/ids.rb
+- spec/support/examples/mixed_any_ofs.rb
 - spec/support/examples/mixed_arrays.rb
 - spec/support/examples/mixed_objects.rb
 - spec/support/examples/object_definitions.rb