rack-param 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b2edee1664ad9b019933bc685bf5f46cbeac16e
-  data.tar.gz: fc27ecd3dee2e3d1a510f118ffff495ba7de9cbd
+  metadata.gz: 1e233f217adb28e44d48871d58c6e656aa8d8e1e
+  data.tar.gz: f769cccbc58260148238ed32d7c0b71e5fbadfe9
 SHA512:
-  metadata.gz: f40aab970852ee0aec2b0dce37ff7308ad04924801ddbc8a05ae945da5d59c646cc1d10a7df02d194b9fced920d442461ef4309a7413de2af3280a79015d9c11
-  data.tar.gz: 141fcefcaecb4637d94a073ebd7feb0081e37f511d5555269daa8340460e634651a5e35050b66277f3c342ef32fa227494b0277d5934d6c3cddfb0ac81af956f
+  metadata.gz: 39af897f8210bf83eaba39929f01f212078ca019ad861608cba6db1e4b726d4639cf644d6c1020c4127c25156c902a14a22a8a6ea7f1d79b5c6c407786c99c31
+  data.tar.gz: 74fbf160e046e0af706330d3a8912360b5a80c3ddf2dd5c671207e9c26ad4aec74f9c5b969ac94425eca1c9a84eb2e4b521b632eb5c508c9935e39c869ace4ff

data/CHANGELOG.md

@@ -9,4 +9,8 @@ v 0.1.0
 - Complete rewrite
    * Write tests
    * Make rules more readable in `param.rb`
-   * `Rack::Request#params` now points to coerced and validated parameters
+   * `Rack::Request#params` now points to coerced and validated parameters
+   
+v 0.1.1
+
+- Fix bug where invalid error message would be returned

data/lib/rack/param.rb

@@ -54,7 +54,7 @@ module Rack
       end
 
       def validate param, value
-        return @message.sub("$",param.to_s).sub("#",value.to_s) unless @block.call(param,value)
+        return @message.sub("$", "`#{param.to_s}`").sub("#","`#{value.to_s}`") unless @block.call(param,value)
       end
     end
     
@@ -107,7 +107,7 @@ module Rack
         end
       end
       
-      validate_error = opts.detect { |k,v| rules[k].validate @value, v }
+      validate_error = opts.detect { |k,v| break rules[k].validate(@value, v) }
       return validate_error unless validate_error.nil?
       
       @value = @transform.to_proc.call @value if @transform
@@ -127,7 +127,7 @@ module Rack
         @rules[:max_length] = Rule.rule("$ must be shorter than #.") { |p,v| p.length <= v }
         @rules[:in] = Rule.rule("$ must be included in #.") { |p,v| v.include? p }
         @rules[:contains] = Rule.rule("$ must include #") { |p,v| p.include? v }
-        @rules[:regex] = Rule.rule("$ failed validation.") { |p,v| v.match p }
+        @rules[:regex] = Rule.rule("$ failed validation.") { |p,v| v.match(p) rescue false }
         @rules[:validator] = Rule.rule("$ failed validation.") { |p,v| v.call p }
       end
       @rules

data/rack-param.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-param"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Nathaniel Symer"]
   spec.email         = ["nate@natesymer.com"]
   spec.summary       = "Sane parameter validation for Rack::Request."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-param
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler