json-schema_builder 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b2db2f9c08d0d7f20bc942b2b8f80692dcb6606
-  data.tar.gz: 4aaa1d7fc0179c8c8f8d8dc5b3e20165f27b919b
+  metadata.gz: 7b51dc48c6af5bbc967ad1a806b0bcc62f2cc042
+  data.tar.gz: 541ffe361c94466b483d7836df3c3afd1546d813
 SHA512:
-  metadata.gz: 3989f1a40c2f42e11540011f74f6edbfa23595868dea68b985c90f349178607f6ebe1f1a1526e156cf5c8a3de3aa000a7858a67793b434cb1b4518e251bf484a
-  data.tar.gz: 4ab4fe02482693de7c9628e29f80258c315ddc37a886ac70489dc2e8dfe355c9bec275286b02c015a2fc8d6a49cd6e3aed20be903288f1ae5112168058cc3912
+  metadata.gz: 410edbc4fb0e6ca11923a2db72002c3c3147f6f5819abab96898344c92394639a68acb87796c1204ba5abf2d56cb1432b5e46fb8a1754f643c9550b704774744
+  data.tar.gz: bfb69c49836656cd6a671c5a5fa9021f5cfc9ca16e3601bf6a9dfce48645fbf2569b24749e2b7e83ed970f5fda15978d16e069e8ce629e33fb2ca7157cca349c

data/lib/json/schema_builder/attribute.rb

@@ -30,6 +30,7 @@ module JSON
           self.schema[attr] || []
         else
           self.schema[attr] ||= []
+          _rename_array_values!(values)
           self.schema[attr] += values
           self.schema[attr].uniq!
           self.schema[attr]
@@ -43,6 +44,15 @@ module JSON
           self.schema[attr] = value
         end
       end
+
+      def _rename_array_values!(values)
+        values.each do |value|
+          if value.class < Entity && value.name
+            value.name = nil
+            value.reset_fragment
+          end
+        end
+      end
     end
   end
 end

data/lib/json/schema_builder/entity.rb

@@ -27,6 +27,13 @@ module JSON
       attribute :ref, as: :$ref
       attribute :definitions
 
+      def self.disable_attributes!(*attributes)
+        attributes.each do |attr|
+          undef_method attr rescue NameError
+          undef_method "#{attr}=" rescue NameError
+        end
+      end
+
       def initialize(name, opts = { }, &block)
         @name = name
         @children = []
@@ -41,7 +48,13 @@ module JSON
 
       def add_fragment(child)
         @fragments[child.fragment] << child
-        @parent.add_fragment(child) if @parent
+        parent.add_fragment(child) if @parent
+      end
+
+      def reset_fragment
+        @fragment = [@parent.fragment, name].compact.join("/").gsub(%r(//), "/")
+        root._reset_fragments
+        root.fragments["#/"] << root
       end
 
       def schema
@@ -67,6 +80,10 @@ module JSON
         schema.as_json
       end
 
+      def inspect
+        "#<#{self.class.name}:#{object_id} @schema=#{schema.as_json}>"
+      end
+
       def respond_to?(method_name, include_all = false)
         if @parent_context
           @parent_context.respond_to? method_name, include_all
@@ -85,6 +102,25 @@ module JSON
 
       protected
 
+      def root
+        return @root if @root
+        node = self
+        node = node.parent while node.parent
+        @root = node
+      end
+
+      def _reset_fragments
+        @fragments = Hash.new { |hash, key| hash[key] = ::Array.new }
+        @fragment = if parent
+          [@parent.fragment, name].compact.join("/").gsub(%r(//), "/")
+        else
+          "#/"
+        end
+
+        children.each { |child| child._reset_fragments }
+        parent.add_fragment(self) if parent
+      end
+
       def extract_types
         any_of(null) if @nullable
         if any_of.present?

data/lib/json/schema_builder/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module SchemaBuilder
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

data/spec/support/examples/custom_errors.rb

@@ -38,7 +38,7 @@ module Examples
       object do
         entity :user do
           any_of [
-            object { object(:settings) { string :name, error: "Nested" } },
+            object(:ignored) { object(:settings) { string :name, error: "Nested" } },
             null
           ]
         end

data/spec/unit/entity_spec.rb

@@ -15,6 +15,24 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
   it{ is_expected.to define_attribute :ref }
   it{ is_expected.to define_attribute :definitions }
 
+  describe ".disable_attributes!" do
+    let(:disabled_attributes) { [:default, :ref, :definitions] }
+
+    around(:each) do |example|
+      described_class.disable_attributes! *disabled_attributes
+      example.call
+      disabled_attributes.each { |attr| described_class.attribute(attr) }
+    end
+
+    it "should remove the attribute methods" do
+      entity = described_class.new "test"
+      disabled_attributes.each do |attr|
+        expect(entity).to_not respond_to(attr)
+        expect(entity).to_not respond_to("#{attr}=")
+      end
+    end
+  end
+
   describe '.attribute' do
     include_context 'an entity'
 
@@ -140,4 +158,27 @@ RSpec.describe JSON::SchemaBuilder::Entity, type: :unit do
       subject.as_json
     end
   end
+
+  describe "array attributes" do
+    let(:klass) do
+      Class.new do
+        include JSON::SchemaBuilder
+
+        def example
+          object do
+            object :parent_name do
+              any_of [
+                string(:name)
+              ]
+            end
+          end
+        end
+      end
+    end
+    subject(:schema){ klass.new }
+
+    it "prevents elements from being named" do
+      expect(schema.example.fragments.keys).to match_array(%w(#/ #/parent_name))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema_builder
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler