ruby-livr 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6657ac44abc483ea73c0cdd20e26300ef34bdf9dde0e8e65ca6bd90428b2401
-  data.tar.gz: a0fb5076c7de93858bfcd224f25981d6e23d04b96f27c85df8b91b8c0e7f96b2
+  metadata.gz: 3c5ade5f85882fc10e6244fc81e0084772e6968af145a1a4ef3d6b88a98c40ab
+  data.tar.gz: 7e24a495ee0b7ce646c1572f90709691700bba758e86867ad148bcff4e6320b7
 SHA512:
-  metadata.gz: 6fea4e70535d7de501da828e551d4d247764cdaec995f4f7e23dfab4191ac026151eee4672ae570bab6a399278af4da8363f2099d5eede23cc4e40dfbd5c7cf1
-  data.tar.gz: 84b829178bc3f29fd8e7e2fd47e2ba85c173a34a33667d2782b86170ba6b128ed4ed377342752a0157dde3b925cc720e6a6bc51e2782bf47801fb3aac0d391df
+  metadata.gz: 0d35faa9d6fc2e75a23c5b65ea845f0a27d4a322e5c33f03152eb040f2e388ed5652fbc9aea2e22fced7bb5d3abc13dc9d96478350b771eb476cb4779f963b33
+  data.tar.gz: 927a24be0e409ed99ed851eeb154172d54177103b0e19a7077fda3cc8792a20cbb9b041c757fdb5b26e9b00ccb9b59f26f0f6753bd070e603910be1aae79473e

data/lib/livr/rules/string.rb

@@ -133,7 +133,7 @@ module LIVR
           return 'FORMAT_ERROR' unless is_primitive(value)
 
           value = value.to_s
-          regexp = Regexp.compile(@re_str, @flags)
+          regexp = Regexp.compile(whole_value_anchors(@re_str), @flags)
 
           unless regexp.match(value)
             return 'WRONG_FORMAT'
@@ -143,6 +143,56 @@ module LIVR
 
           return
         end
+
+        private
+
+        # LIVR patterns follow JavaScript, where ^ and $ anchor the whole value. In Ruby
+        # they anchor any line, so "12345\n<script>" would match "^[0-9]{5}$".
+        # Replaces ^ and $ outside character classes with \A and \z.
+        def whole_value_anchors(re_str)
+          result = +""
+          class_depth = 0
+          chars = re_str.to_s.chars
+          i = 0
+
+          while i < chars.size
+            char = chars[i]
+
+            if char == "\\"
+              result << char << chars[i + 1].to_s
+              i += 2
+              next
+            end
+
+            if class_depth > 0
+              class_depth += 1 if char == "["
+              class_depth -= 1 if char == "]"
+              result << char
+            elsif char == "["
+              class_depth = 1
+              result << char
+              # "]" right after "[" or "[^" is a literal, not the end of the class
+              if chars[i + 1] == "^"
+                result << chars[i + 1]
+                i += 1
+              end
+              if chars[i + 1] == "]"
+                result << chars[i + 1]
+                i += 1
+              end
+            elsif char == "^"
+              result << "\\A"
+            elsif char == "$"
+              result << "\\z"
+            else
+              result << char
+            end
+
+            i += 1
+          end
+
+          result
+        end
       end
 
     end

data/ruby-livr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "ruby-livr"
-  gem.version     = "2.1.0"
+  gem.version     = "2.1.1"
   gem.summary     = "Implementation of LIVR v2.0"
   gem.description = "Language Independent Validation Rules. Implements 2.0 specification"
   gem.authors     = ["Vitaliy Yanchuk"]

data/spec/07-like_anchors_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper.rb'
+
+RSpec.describe "like" do
+
+  it "^ and $ anchor the whole value, not a line" do
+    validator = LIVR::Validator.new(
+      "zip1" => { "like" => "^[0-9]{5}$" },
+      "zip2" => { "like" => "^[0-9]{5}$" },
+      "zip3" => { "like" => "^[0-9]{5}$" },
+      "zip4" => { "like" => ["^[0-9]{5}$", "i"] },
+      "zip5" => { "like" => "^[0-9]{5}$" }
+    )
+
+    output = validator.validate(
+      "zip1" => "12345\n<script>",
+      "zip2" => "<script>\n12345",
+      "zip3" => "12345\n",
+      "zip4" => "12345\n<script>",
+      "zip5" => "12345"
+    )
+
+    expect(output).to eq(false)
+    expect(validator.get_errors).to eq(
+      "zip1" => "WRONG_FORMAT",
+      "zip2" => "WRONG_FORMAT",
+      "zip3" => "WRONG_FORMAT",
+      "zip4" => "WRONG_FORMAT"
+    )
+  end
+
+  it "^ and $ in character classes and escaped ones stay literal" do
+    validator = LIVR::Validator.new(
+      "price"   => { "like" => "^\\$[0-9]+$" },
+      "caret"   => { "like" => "^[\\^$]+$" },
+      "negated" => { "like" => "^[^0-9]+$" },
+      "bracket" => { "like" => "^[]^$]+$" }
+    )
+
+    output = validator.validate("price" => "$10", "caret" => "^$^", "negated" => "abc", "bracket" => "]^$")
+
+    expect(validator.get_errors).to eq(nil)
+    expect(output).to eq("price" => "$10", "caret" => "^$^", "negated" => "abc", "bracket" => "]^$")
+  end
+
+  it "patterns without anchors still match part of the value" do
+    validator = LIVR::Validator.new("name" => { "like" => "[0-9]+" })
+
+    expect(validator.validate("name" => "abc\n123")).to eq("name" => "abc\n123")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-livr
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Vitaliy Yanchuk
@@ -71,6 +71,7 @@ files:
 - spec/04-custom_filters_spec.rb
 - spec/05-rules_replacement_spec.rb
 - spec/06-primitive_values_spec.rb
+- spec/07-like_anchors_spec.rb
 - spec/spec_helper.rb
 - spec/test_suite/aliases_negative/01-adult_age/aliases.json
 - spec/test_suite/aliases_negative/01-adult_age/errors.json
@@ -316,6 +317,7 @@ test_files:
 - spec/04-custom_filters_spec.rb
 - spec/05-rules_replacement_spec.rb
 - spec/06-primitive_values_spec.rb
+- spec/07-like_anchors_spec.rb
 - spec/spec_helper.rb
 - spec/test_suite/aliases_negative/01-adult_age/aliases.json
 - spec/test_suite/aliases_negative/01-adult_age/errors.json