rack-param 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e233f217adb28e44d48871d58c6e656aa8d8e1e
-  data.tar.gz: f769cccbc58260148238ed32d7c0b71e5fbadfe9
+  metadata.gz: 1ec3ceacb0bc5616a90ea623585c15f6213901f6
+  data.tar.gz: 8112bc432b22048d15448cec448d28198ef8ed5b
 SHA512:
-  metadata.gz: 39af897f8210bf83eaba39929f01f212078ca019ad861608cba6db1e4b726d4639cf644d6c1020c4127c25156c902a14a22a8a6ea7f1d79b5c6c407786c99c31
-  data.tar.gz: 74fbf160e046e0af706330d3a8912360b5a80c3ddf2dd5c671207e9c26ad4aec74f9c5b969ac94425eca1c9a84eb2e4b521b632eb5c508c9935e39c869ace4ff
+  metadata.gz: 6c9629493aca786b02202ae61fb7435e0d61a2a8a886e4ff988175b9232b8f0ca10f31d7d548377c8b1ae74361c8a2c25a7634bdaf665885e2495fc1c2a5d935
+  data.tar.gz: f9aad33b2aed468c98435862c64c67c9e46428a5cd4eedb78ff0daf56720f8391e064b863ec526dc48ea999c736fcb8d8e986d086b5be84021f2e6551daef2f5

data/CHANGELOG.md

@@ -13,4 +13,8 @@ v 0.1.0
    
 v 0.1.1
 
-- Fix bug where invalid error message would be returned
+- Fix bug where invalid error message would be returned
+
+v 0.1.2
+
+- `:error_message` option

data/README.md

@@ -43,6 +43,7 @@ Here's a list of options:
 `:in` => Something that responds to `include?`<br />
 `:regex` => A `Regexp`<br />
 `:validator` => A block: `{ |param| true }`<br />
+`:error_message` => A `String`. `$` is the parameter and `#` is the validator object. (`"Invalid password: $"`)
 
 ## Contributing
 

data/lib/rack/param.rb

@@ -53,8 +53,8 @@ module Rack
         new message, &block
       end
 
-      def validate param, value
-        return @message.sub("$", "`#{param.to_s}`").sub("#","`#{value.to_s}`") unless @block.call(param,value)
+      def validate param, value, error_msg=nil
+        return (error_msg || @message).sub('$',"`#{param.to_s}`").sub('#',"`#{value.to_s}`") unless @block.call(param,value)
       end
     end
     
@@ -62,6 +62,7 @@ module Rack
       opts[:value].inspect
 			_opts = Hash[opts.dup.map { |k,v| [k.to_sym,v] }]
       _opts.merge! _opts.delete(:conditions)
+      @error_message = opts.delete :error_message
 			@default = _opts.delete :default
 			@required = _opts.delete :required
 			@transform = _opts.delete :transform
@@ -107,8 +108,8 @@ module Rack
         end
       end
       
-      validate_error = opts.detect { |k,v| break rules[k].validate(@value, v) }
-      return validate_error unless validate_error.nil?
+      validate_error = opts.detect { |k,v| break rules[k].validate @value, v, @error_message }
+      return validate_errorunless validate_error.nil?
       
       @value = @transform.to_proc.call @value if @transform
       nil

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.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Nathaniel Symer"]
   spec.email         = ["nate@natesymer.com"]
   spec.summary       = "Sane parameter validation for Rack::Request."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-param
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathaniel Symer