format.rb in json-schema-1.0.0

- old
+ new
@@ -6,97 +6,105 @@
 
         # Timestamp in restricted ISO-8601 YYYY-MM-DDThh:mm:ssZ
         when 'date-time'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ"
-            raise ValidationError.new(error_message, fragments, current_schema) if !data.is_a?(String)
+            validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)Z$')
             if (m = r.match(data))
               parts = data.split("T")
               begin
                 Date.parse(parts[0])
               rescue Exception
-                raise ValidationError.new(error_message, fragments, current_schema)
+                validation_error(error_message, fragments, current_schema, options[:record_errors])
+                return
               end
               begin
-                raise ValidationError.new(error_message, fragments, current_schema) if m[1].to_i > 23
-                raise ValidationError.new(error_message, fragments, current_schema) if m[2].to_i > 59
-                raise ValidationError.new(error_message, fragments, current_schema) if m[3].to_i > 59
+                validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[1].to_i > 23
+                validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[2].to_i > 59
+                validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[3].to_i > 59
               rescue Exception
-                raise ValidationError.new(error_message, fragments, current_schema)
+                validation_error(error_message, fragments, current_schema, options[:record_errors])
+                return
               end
             else
-              raise ValidationError.new(error_message, fragments, current_schema)
+              validation_error(error_message, fragments, current_schema, options[:record_errors])
+              return
             end
           end
 
         # Date in the format of YYYY-MM-DD
         when 'date'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a date in the format of YYYY-MM-DD"
-            raise ValidationError.new(error_message, fragments, current_schema) if !data.is_a?(String)
+            validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^\d\d\d\d-\d\d-\d\d$')
             if (m = r.match(data))
               begin
                 Date.parse(data)
               rescue Exception
-                raise ValidationError.new(error_message, fragments, current_schema)
+                validation_error(error_message, fragments, current_schema, options[:record_errors])
+                return
               end
             else
-              raise ValidationError.new(error_message, fragments, current_schema)
+              validation_error(error_message, fragments, current_schema, options[:record_errors])
+              return
             end
           end
 
         # Time in the format of HH:MM:SS
         when 'time'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a time in the format of hh:mm:ss"
-            raise ValidationError.new(error_message, fragments, current_schema) if !data.is_a?(String)
+            validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^(\d\d):(\d\d):(\d\d)$')
             if (m = r.match(data))
-              raise ValidationError.new(error_message, fragments, current_schema) if m[1].to_i > 23
-              raise ValidationError.new(error_message, fragments, current_schema) if m[2].to_i > 59
-              raise ValidationError.new(error_message, fragments, current_schema) if m[3].to_i > 59
+              validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[1].to_i > 23
+              validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[2].to_i > 59
+              validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[3].to_i > 59
             else
-              raise ValidationError.new(error_message, fragments, current_schema)
+              validation_error(error_message, fragments, current_schema, options[:record_errors])
+              return
             end
           end
 
         # IPv4 in dotted-quad format
         when 'ip-address', 'ipv4'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv4 address"
-            raise ValidationError.new(error_message, fragments, current_schema) if !data.is_a?(String)
+            validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}\.(\d+){1,3}$')
             if (m = r.match(data))
               1.upto(4) do |x|
-                raise ValidationError.new(error_message, fragments, current_schema) if m[x].to_i > 255
+                validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if m[x].to_i > 255
               end
             else
-              raise ValidationError.new(error_message, fragments, current_schema)
+              validation_error(error_message, fragments, current_schema, options[:record_errors])
+              return
             end
           end
 
         # IPv6 in standard format (including abbreviations)
         when 'ipv6'
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a valid IPv6 address"
-            raise ValidationError.new(error_message, fragments, current_schema) if !data.is_a?(String)
+            validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if !data.is_a?(String)
             r = Regexp.new('^[a-f0-9:]+$')
             if (m = r.match(data))
               # All characters are valid, now validate structure
               parts = data.split(":")
-              raise ValidationError.new(error_message, fragments, current_schema) if parts.length > 8
+              validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if parts.length > 8
               condensed_zeros = false
               parts.each do |part|
                 if part.length == 0
-                  raise ValidationError.new(error_message, fragments, current_schema) if condensed_zeros
+                  validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if condensed_zeros
                   condensed_zeros = true
                 end
-                raise ValidationError.new(error_message, fragments, current_schema) if part.length > 4
+                validation_error(error_message, fragments, current_schema, options[:record_errors]) and return if part.length > 4
               end
             else
-              raise ValidationError.new(error_message, fragments, current_schema)
+              validation_error(error_message, fragments, current_schema, options[:record_errors])
+              return
             end
           end
         end
       end
     end
\ No newline at end of file