json-schema_builder 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2945d0d0e0746865b799fd0e2dcb0e1b066c52db
-  data.tar.gz: 40da6b42be71e5d59e72115956f9ad98c8950650
+  metadata.gz: b4fe5462595486f84e355404b11e92a99f03a564
+  data.tar.gz: 3f0940bd48c40ddf384e7456f6c47dab2a8b77ee
 SHA512:
-  metadata.gz: 5854cbff037513e952a31785d38e5e2e3b029b389dfafeaff23f0bdc1f07a9969861fec5b3ec2b58db7c7737ede5d726045c39a02b157e8feb6ca42cf468a0ef
-  data.tar.gz: 01e0e5bb89620531afaf9392e7691ea282e36f31858b54df70cfb938ea64b8d18878262f7c5757b7c2ff001ae2e92f19299f660dba022f4e1c6dca088a2af35f
+  metadata.gz: b73789a2efa50e9780bcd9b2f88d84456ff74e02a380d25c69c01506e81d41195025583314407208fce6cfb6ea38542e0834cd7d2379f7b2482563f585a7ed5c
+  data.tar.gz: 3b6a8c0bc16cd8561398682e6485802c3b839e7a3c7a6771b7bf29ca3a25a09ba19bc3eb50bc75a71178565ecacf5d755fb9b9e9c893c450ac581cf9338ef5e8

data/lib/json/schema_builder/validation.rb

@@ -27,7 +27,7 @@ module JSON
 
       def _customize_errors(error_objects)
         _flatten_errors(error_objects).each do |error|
-          entities = Array(fragments[error[:fragment]]).select(&:error)
+          entities = _entities_handling(error)
           entities.each do |entity|
             handler = entity.error
             case handler
@@ -47,6 +47,16 @@ module JSON
           [error_object, _flatten_errors(sub_errors)]
         end.flatten
       end
+
+      def _entities_handling(error)
+        entities = Array(fragments[error[:fragment]]).select(&:error)
+        if error[:failed_attribute] == "Required"
+          property = error[:message].match(/required property of '([^']+?)'/)[1]
+          property_fragment = "#{error[:fragment]}/#{property}".gsub(%r(//), "/")
+          entities |= Array(fragments[property_fragment]).select(&:error)
+        end
+        entities
+      end
     end
   end
 end

data/lib/json/schema_builder/version.rb

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

data/spec/integration/custom_errors_spec.rb

@@ -19,6 +19,29 @@ RSpec.describe Examples::CustomErrors, type: :integration do
     expect(errors).to include hash_including(message: %q(#/settings requires properties ["name"]))
   end
 
+  context "with property-specific required errors" do
+    let(:schema) { klass.example3 }
+
+    it "customizes required object errors" do
+      errors = schema.fully_validate({ }, customize_errors: true)
+      expect(errors.length).to eq(1)
+      expect(errors).to include hash_including(message: "Settings is required")
+    end
+
+    it "customizes required object errors" do
+      errors = schema.fully_validate({ settings: {} }, customize_errors: true)
+      expect(errors.length).to eq(2)
+      expect(errors).to include hash_including(message: "Name is required")
+      expect(errors).to include hash_including(message: "Other is required")
+    end
+
+    it "customizes required object errors" do
+      errors = schema.fully_validate({ settings: { name: "name" } }, customize_errors: true)
+      expect(errors.length).to eq(1)
+      expect(errors).to include hash_including(message: "Other is required")
+    end
+  end
+
   it "merges error handlers" do
     schema = klass.example.schema.merge(klass.example2.schema)
     errors = schema.fully_validate({ settings: { other: 123 } }, customize_errors: true)

data/spec/support/examples/custom_errors.rb

@@ -5,23 +5,25 @@ module Examples
     def required_error
       lambda do |entities, error|
         if error[:failed_attribute] == "Required"
-          required = entities.map(&:required).inject(:+).uniq
+          required = entities.map(&:required).compact.inject(:+).uniq
           error[:message] = "#{error[:fragment]} requires properties #{required.map(&:to_s).inspect}"
         end
       end
     end
 
-    def object_error
+    def type_error(message)
       lambda do |entities, error|
-        error[:message] = "Custom object error"
+        if error[:failed_attribute].start_with?("Type")
+          error[:message] = message
+        end
       end
     end
 
     def example
       object error: required_error do
-        object :user, required: true, error: object_error
+        object :user, required: true, error: type_error("Custom object error")
         object :settings, error: required_error do
-          string :name, required: true, error: "Custom name error"
+          string :name, required: true, error: type_error("Custom name error")
         end
       end
     end
@@ -29,7 +31,16 @@ module Examples
     def example2
       object do
         object :settings, error: required_error do
-          string :other, required: true, error: "Other error"
+          string :other, required: true, error: type_error("Other error")
+        end
+      end
+    end
+
+    def example3
+      object do
+        object :settings, required: true, error: "Settings is required" do
+          string :name, required: true, error: "Name is required"
+          string :other, required: true, error: "Other is required"
         end
       end
     end

metadata

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