json-schema_builder 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74990c32e6a0f3818690fb0ce66adcb7bb14bd4e
-  data.tar.gz: 359ba84e515b4c059320954bcfdaaf84de2dfc1b
+  metadata.gz: 2945d0d0e0746865b799fd0e2dcb0e1b066c52db
+  data.tar.gz: 40da6b42be71e5d59e72115956f9ad98c8950650
 SHA512:
-  metadata.gz: 0c146bbba22320150069cec3b4e903ca505748775a001ef412a49aa740c488de989ffc8ee465256f13bf734dd36c4585542774efbffc1824f3f3d795680a84ad
-  data.tar.gz: f5070d30ab1296356e8297de145c174e8b89e768854a1d1f4dbe73c2dc0ca86dac59141373ff4c84ce435a410c6ebeb47c7668274c9ee80c1ed0a8ba19b1ae7d
+  metadata.gz: 5854cbff037513e952a31785d38e5e2e3b029b389dfafeaff23f0bdc1f07a9969861fec5b3ec2b58db7c7737ede5d726045c39a02b157e8feb6ca42cf468a0ef
+  data.tar.gz: 01e0e5bb89620531afaf9392e7691ea282e36f31858b54df70cfb938ea64b8d18878262f7c5757b7c2ff001ae2e92f19299f660dba022f4e1c6dca088a2af35f

data/lib/json/schema_builder/array.rb

@@ -13,6 +13,7 @@ module JSON
         opts = args.extract_options!
         schema[:items] = args.first
         schema[:items] ||= items_entity(opts, &block).as_json
+        parent.reinitialize if parent
       end
 
       protected

data/lib/json/schema_builder/attribute.rb

@@ -7,11 +7,14 @@ module JSON
         def attribute(name, as: nil, array: false)
           attr = as || snakeize(name)
           define_method name do |*values|
-            if array
+            result = if array
               _array_attr attr, values.flatten
             else
               _attr attr, values.first
             end
+
+            parent.reinitialize if parent
+            result
           end
           alias_method "#{ name }=", name
         end

data/lib/json/schema_builder/dsl.rb

@@ -8,7 +8,9 @@ module JSON
         opts = args.extract_options!
         klass, name = klass_and_name_from args
         set_context_for opts
-        klass.new name, opts, &block
+        klass.new(name, opts, &block).tap do
+          reinitialize if is_a?(Entity)
+        end
       end
 
       protected

data/lib/json/schema_builder/entity.rb

@@ -44,6 +44,21 @@ module JSON
         initialize_with opts
         eval_block &block
         extract_types
+        @initialized = true
+      end
+
+      def initialized?
+        !!@initialized
+      end
+
+      def reinitialize
+      end
+
+      def extend(child_name, &block)
+        children.find { |c| c.name == child_name.to_sym }.tap do |child|
+          raise "Property #{child_name} does not exist" unless child
+          child.eval_block(&block) if block_given?
+        end
       end
 
       def add_fragment(child)

data/lib/json/schema_builder/object.rb

@@ -30,6 +30,11 @@ module JSON
         super
       end
 
+      def reinitialize
+        return unless initialized?
+        extract_types
+      end
+
       def required(*values)
         case values
         when []

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.7.1'
+    VERSION = '0.8.0'
   end
 end

data/spec/integration/builder_initialization_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+RSpec.describe Examples::BuilderInitialization, type: :integration do
+  it_behaves_like 'a builder' do
+    let(:expected_json) do
+      {
+        type: :object,
+        properties: {
+          name: {
+            type: :string
+          },
+          settings: {
+            type: :object,
+            properties: {
+              email: {
+                type: :string
+              }
+            }
+          },
+          preferences: {
+            anyOf: [
+              {
+                type: :object,
+                properties: {
+                  enabled: {
+                    type: :boolean,
+                    default: true
+                  }
+                }
+              },
+              {
+                type: :null
+              }
+            ]
+          },
+          ids: {
+            type: :array,
+            items: {
+              anyOf: [
+                {type: :number},
+                {type: :string}
+              ]
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/spec/integration/builder_reopening_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+RSpec.describe Examples::BuilderReopening, type: :integration do
+  it_behaves_like 'a builder' do
+    let(:expected_json) do
+      {
+        type: :object,
+        properties: {
+          name: {
+            type: :string
+          },
+          settings: {
+            type: :object,
+            properties: {
+              email: {
+                type: :string
+              },
+              phone_number: {
+                type: :string
+              }
+            }
+          },
+          preferences: {
+            anyOf: [
+              {
+                type: :object,
+                properties: {
+                  enabled: {
+                    type: :boolean,
+                    default: true
+                  }
+                }
+              },
+              {
+                type: :null
+              }
+            ]
+          },
+          ids: {
+            type: :array,
+            items: {
+              type: :string,
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/spec/support/examples/builder_initialization.rb

@@ -0,0 +1,41 @@
+module Examples
+  class BuilderInitialization
+    include JSON::SchemaBuilder
+
+    def example
+      obj = object
+      obj.string :name
+      settings_for(obj)
+      preferences_for(obj)
+      add_ids_to(obj)
+      obj
+    end
+
+    def settings_for(obj)
+      settings = obj.object :settings
+      settings.string :email
+      settings
+    end
+
+    def preferences_for(obj)
+      preferences = obj.entity :preferences
+      preferences.any_of preference
+      preferences.any_of null
+    end
+
+    def preference
+      obj = object
+      enabled = obj.boolean :enabled
+      enabled.default = true
+      obj
+    end
+
+    def add_ids_to(obj)
+      ids = obj.array :ids
+      ids.items do
+        any_of number
+        any_of string
+      end
+    end
+  end
+end

data/spec/support/examples/builder_reopening.rb

@@ -0,0 +1,13 @@
+module Examples
+  class BuilderReopening < BuilderInitialization
+    def example
+      obj = super
+      obj.extend(:settings) do
+        string :phone_number
+      end
+      ids = obj.array :ids
+      ids.items type: :string
+      obj
+    end
+  end
+end

data/spec/unit/entity_spec.rb

@@ -181,4 +181,52 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
       expect(schema.example.fragments.keys).to match_array(%w(#/ #/parent_name))
     end
   end
+
+  describe "#extend" do
+    let(:object) do
+      obj = JSON::SchemaBuilder::Object.new(nil) do
+        string :test
+        object :sub_object do
+          string :a_string
+        end
+      end
+
+      obj.extend(:sub_object) do
+        string :another_string
+        number :a_number, required: true
+      end
+
+      obj
+    end
+    let(:schema) { object.schema }
+    let(:properties) { schema[:properties] }
+    let(:sub_object) { properties[:sub_object] }
+    let(:sub_properties) { sub_object[:properties] }
+
+    it "does not remove properties" do
+      expect(properties[:test]).to eq "type" => "string"
+      expect(sub_object).to include "type" => "object"
+      expect(sub_properties).to include "a_string" => {"type" => "string"}
+    end
+
+    it "adds new properties" do
+      expect(sub_properties).to include "another_string" => {"type" => "string"}
+      expect(sub_properties).to include "a_number" => {"type" => "number"}
+      expect(sub_object[:required]).to match_array ["a_number"]
+    end
+
+    it "raises on unknown properties" do
+      expect do
+        object.extend(:foo) do
+          raise "doesn't work"
+        end
+      end.to raise_error "Property foo does not exist"
+    end
+
+    it "returns the child" do
+      child = object.extend(:sub_object)
+      expect(child).to be_a(JSON::SchemaBuilder::Object)
+      expect(child.name).to eq(:sub_object)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,6 +203,8 @@ files:
 - lib/json/schema_builder/version.rb
 - spec/integration/array_any_of_spec.rb
 - spec/integration/array_definitions_spec.rb
+- spec/integration/builder_initialization_spec.rb
+- spec/integration/builder_reopening_spec.rb
 - spec/integration/context_delegation_spec.rb
 - spec/integration/custom_errors_spec.rb
 - spec/integration/entity_literals_spec.rb
@@ -224,6 +226,8 @@ files:
 - spec/support/attribute_matcher.rb
 - spec/support/examples/array_any_of.rb
 - spec/support/examples/array_definitions.rb
+- spec/support/examples/builder_initialization.rb
+- spec/support/examples/builder_reopening.rb
 - spec/support/examples/context_delegation.rb
 - spec/support/examples/custom_errors.rb
 - spec/support/examples/entity_literals.rb
@@ -281,6 +285,8 @@ summary: Build JSON schemas with Ruby
 test_files:
 - spec/integration/array_any_of_spec.rb
 - spec/integration/array_definitions_spec.rb
+- spec/integration/builder_initialization_spec.rb
+- spec/integration/builder_reopening_spec.rb
 - spec/integration/context_delegation_spec.rb
 - spec/integration/custom_errors_spec.rb
 - spec/integration/entity_literals_spec.rb
@@ -302,6 +308,8 @@ test_files:
 - spec/support/attribute_matcher.rb
 - spec/support/examples/array_any_of.rb
 - spec/support/examples/array_definitions.rb
+- spec/support/examples/builder_initialization.rb
+- spec/support/examples/builder_reopening.rb
 - spec/support/examples/context_delegation.rb
 - spec/support/examples/custom_errors.rb
 - spec/support/examples/entity_literals.rb