1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
Description: remove use of ecma-re-validator (not yet packaged)
Remove this patch when ecma-re-validator gem is packaged
Forwarded: not-needed
Author: Cédric Boutillier <boutil@debian.org>
Last-Update: 2018-11-18
--- a/test/json_schema/parser_test.rb
+++ b/test/json_schema/parser_test.rb
@@ -295,16 +295,16 @@
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
+ #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
it "parses custom formats" do
JsonSchema.configure do |c|
--- a/json_schema.gemspec
+++ b/json_schema.gemspec
@@ -25,7 +25,7 @@
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
- s.add_development_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
+ #s.add_development_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
s.add_development_dependency(%q<minitest>.freeze, ["~> 5.3"])
s.add_development_dependency(%q<pry>.freeze, [">= 0"])
s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"])
@@ -33,7 +33,7 @@
s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
else
s.add_dependency(%q<byebug>.freeze, [">= 0"])
- s.add_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
+ #s.add_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
s.add_dependency(%q<minitest>.freeze, ["~> 5.3"])
s.add_dependency(%q<pry>.freeze, [">= 0"])
s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
@@ -42,7 +42,7 @@
end
else
s.add_dependency(%q<byebug>.freeze, [">= 0"])
- s.add_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
+ #s.add_dependency(%q<ecma-re-validator>.freeze, ["~> 0.1"])
s.add_dependency(%q<minitest>.freeze, ["~> 5.3"])
s.add_dependency(%q<pry>.freeze, [">= 0"])
s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
--- a/lib/json_schema/parser.rb
+++ b/lib/json_schema/parser.rb
@@ -244,10 +244,11 @@
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
+ message = "Ecma validation deactivated in Debian package"
+ #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
|
