json_schema 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a7249029791e99fb8fc7ad76a76edeab610705
-  data.tar.gz: 71e49d15e5ad71b23f353bc713634763f21c2f0c
+  metadata.gz: 9bfb85015a2b3334dfbcdcd269fd7031f74f3b42
+  data.tar.gz: 1d2050d6970717a4a083470ed3250a87321bdf3b
 SHA512:
-  metadata.gz: 4dd1b0c124657f130648484c90b5cce1f7f86deb01eaa6b8f1d9aec40060b4b6d52a546e33a987186b732c12b66f666f5c71391b33df98f1b7ac766becfd69c9
-  data.tar.gz: d0745914ef1acfaa8a039577a8712beb3020827237979deb836dfb59464ce6cdc3424ec9970aa9c9fa8f3c2aae595acff44d819f797e1cc18ad2a808f6315917
+  metadata.gz: 95c592714aaab7510d4faa0fa94ee82253ade1cae378e5712b872a013ab66e9e525c42208376c13d9cef35a686859db5a748337b5d30841ec3c6a9dab8ddd88e
+  data.tar.gz: 203d25e5c27568618d4c51494ed915cbc87dc8da2362caacb3d7a0a59e938e74510bc94df81587269e4043138eb2f4ed601371f5cb33012c3e52bdf474fcf44e

data/lib/json_schema.rb

@@ -1,3 +1,4 @@
+require_relative "json_schema/configuration"
 require_relative "json_schema/document_store"
 require_relative "json_schema/parser"
 require_relative "json_schema/reference_expander"
@@ -6,6 +7,14 @@ require_relative "json_schema/schema_error"
 require_relative "json_schema/validator"
 
 module JsonSchema
+  def self.configure
+    yield configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
   def self.parse(data)
     parser = Parser.new
     if schema = parser.parse(data)

data/lib/json_schema/configuration.rb

@@ -0,0 +1,16 @@
+module JsonSchema
+  class Configuration
+    attr_reader :validate_regex_with
+
+    def validate_regex_with=(validator)
+      @validate_regex_with = validator
+    end
+
+    private
+
+    def initialize
+      @validate_regex_with = nil
+    end
+
+  end
+end

data/lib/json_schema/parser.rb

@@ -211,12 +211,23 @@ module JsonSchema
         # leave the original data reference intact
         properties = schema.pattern_properties.dup
         properties = properties.map do |k, s|
-          [Regexp.new(k), parse_data(s, schema, "patternProperties/#{k}")]
+          [parse_regex(schema, k), parse_data(s, schema, "patternProperties/#{k}")]
         end
         schema.pattern_properties = Hash[*properties.flatten]
       end
     end
 
+    def parse_regex(schema, regex)
+      case JsonSchema.configuration.validate_regex_with
+      when :'ecma-re-validator'
+        unless EcmaReValidator.valid?(regex)
+          message = %{#{regex.inspect} is not an ECMA-262 regular expression.}
+          @errors << SchemaError.new(schema, message, :regex_failed)
+        end
+      end
+      Regexp.new(regex)
+    end
+
     def parse_properties(schema)
       # leave the original data reference intact
       schema.properties = schema.properties.dup
@@ -287,7 +298,7 @@ module JsonSchema
       schema.max_length = validate_type(schema, [Integer], "maxLength")
       schema.min_length = validate_type(schema, [Integer], "minLength")
       schema.pattern    = validate_type(schema, [String], "pattern")
-      schema.pattern    = Regexp.new(schema.pattern) if schema.pattern
+      schema.pattern    = parse_regex(schema, schema.pattern) if schema.pattern
       validate_format(schema, schema.format) if schema.format
 
       # hyperschema

data/lib/json_schema/validator.rb

@@ -444,6 +444,7 @@ module JsonSchema
 
     def validate_pattern(schema, data, errors, path)
       return true unless schema.pattern
+
       if data =~ schema.pattern
         true
       else

data/test/json_schema/parser_test.rb

@@ -3,6 +3,12 @@ require "test_helper"
 require "json_schema"
 
 describe JsonSchema::Parser do
+  after do
+    JsonSchema.configure do |c|
+      c.validate_regex_with = nil
+    end
+  end
+
   it "parses the basic attributes of a schema" do
     schema = parse
     assert_nil schema.id
@@ -266,6 +272,22 @@ describe JsonSchema::Parser do
     assert_includes error_types, :unknown_format
   end
 
+  it "passes for an invalid regex when not asked to check" do
+    schema_sample["pattern"] = "\\Ameow"
+    assert parse
+  end
+
+  it "errors for an invalid regex when asked to check" do
+    require 'ecma-re-validator'
+    JsonSchema.configure do |c|
+      c.validate_regex_with = :'ecma-re-validator'
+    end
+    schema_sample["pattern"] = "\\Ameow"
+    refute parse
+    assert_includes error_messages, '"\\\\Ameow" is not an ECMA-262 regular expression.'
+    assert_includes error_types, :regex_failed
+  end
+
   def error_messages
     @parser.errors.map { |e| e.message }
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ecma-re-validator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +67,7 @@ files:
 - lib/json_pointer/evaluator.rb
 - lib/json_reference.rb
 - lib/json_schema.rb
+- lib/json_schema/configuration.rb
 - lib/json_schema/document_store.rb
 - lib/json_schema/parser.rb
 - lib/json_schema/reference_expander.rb