word-count-validator 0.2.1 → 0.2.2

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Provides validates_word_count which lets users validate a string has a minimum / maximum number of words.}
     gem.email = "sutto@sutto.net"
     gem.homepage = "http://github.com/Sutto/word-count-validator"
-    gem.authors = ["Darcy Laycock"]
+    gem.authors = ["Darcy Laycock", "Eric Anderson"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/active_model/validations/word_count.rb

@@ -30,13 +30,14 @@ module ActiveModel
 
       def check_validity!
         raise ArgumentError, "You must provide a valid range for the number of words e.g. 2..100" if options.has_key?(:in)
-        raise ArgumentError, "The min value must respond to to_i" unless options[:min].respond_to?(:to_i)
-        raise ArgumentError, "The max value must respond to to_i" unless options[:max].respond_to?(:to_i)
+        raise ArgumentError, "The min value must respond to to_i or call" unless options[:min].respond_to?(:to_i) || options[:min].respond_to?(:call)
+        raise ArgumentError, "The max value must respond to to_i or call" unless options[:max].respond_to?(:to_i) || options[:max].respond_to?(:call)
       end
 
       def validate_each(record, attribute, value)
-        min_words, max_words  = options[:min].to_i, options[:max].to_i
-        value = ActionController::Base.helpers.strip_tags(value).gsub(/ | /i, ' ') if options[:strip_tags]
+        min_words = options[:min].respond_to?(:call) ? options[:min][record, attribute, value] : options[:min].to_i
+        max_words = options[:max].respond_to?(:call) ? options[:max][record, attribute, value] : options[:max].to_i
+        value = ActionController::Base.helpers.strip_tags(value || '').gsub(/ | /i, ' ') if options[:strip_tags]
         value.gsub! /[.(),;:!?%#\$'"_+=\/-]*/, '' if options[:strip_punctuation]
         count = word_count_for(value)
         if !options[:skip_min] && count < min_words

data/word-count-validator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{word-count-validator}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-12-01}
+  s.authors = ["Darcy Laycock", "Eric Anderson"]
+  s.date = %q{2010-12-11}
   s.description = %q{Provides validates_word_count which lets users validate a string has a minimum / maximum number of words.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: word-count-validator
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Darcy Laycock
+- Eric Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +08:00
+date: 2010-12-11 00:00:00 +08:00
 default_executable: 
 dependencies: []