word-count-validator 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/active_model/validations/word_count.rb

@@ -7,32 +7,40 @@ module ActiveModel
     
     class WordCountValidator < ActiveModel::EachValidator
 
-      def check_validity!
-        if options.has_key?(:in)
-          range = options.delete(:in)
-          unless range.present? && range.respond_to?(:min) && range.respond_to?(:max)
-            raise ArgumentError, "You must provide a valid range for the number of words e.g. 2..100"
-          end
-          options[:min], options[:max] = range.min, range.max
-        end
+      # Provide option defaults and normalize options. This is done
+      # prior to check_validity! as options becomes frozen and
+      # check_validity! can only report errors but not modify the
+      # options.
+      def initialize(options)
         options[:min] = options.delete(:minimum) if options.has_key?(:minimum)
         options[:max] = options.delete(:maximum) if options.has_key?(:maximum)
         options[:max] ||= 100
         options[:min] ||= 0
+        options[:strip_tags] = true unless options.has_key?(:strip_tags)
+        if options.has_key?(:in)
+          range = options[:in]
+          if range.present? && range.respond_to?(:min) && range.respond_to?(:max)
+            options[:min], options[:max] = range.min, range.max
+            options.delete :in
+          end
+        end
+        super
+      end
+
+      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)
-        # Finally, normalize the min values.
-        options[:min] = options[:min].to_i
-        options[:max] = options[:max].to_i
       end
 
       def validate_each(record, attribute, value)
-        min_words, max_words  = options[:min], options[:max]
+        min_words, max_words  = options[:min].to_i, options[:max].to_i
+        value = ActionController::Base.helpers.strip_tags value if options[:strip_tags]
         count = word_count_for(value)
         if !options[:skip_min] && count < min_words
-          record.errors.add attribute, :too_few_words,  options_for(min_words, count)
+          record.errors.add attribute, :too_few_words,  options_for(count, min_words)
         elsif !options[:skip_max] && count > max_words
-          record.errors.add attribute, :too_many_words, options_for(max_words, count)
+          record.errors.add attribute, :too_many_words, options_for(count, max_words)
         end 
       end
 
@@ -45,7 +53,7 @@ module ActiveModel
       end
       
       def options_for(current, expected)
-        base_options.merge :expected_count => expected_count, :actual_count => current
+        base_options.merge :expected_count => expected, :actual_count => current
       end
 
     end
@@ -59,4 +67,4 @@ module ActiveModel
 
     end
   end
-end
+end

data/word-count-validator.gemspec

@@ -0,0 +1,51 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{word-count-validator}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Darcy Laycock"]
+  s.date = %q{2010-11-30}
+  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 = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/active_model/locale/en.yml",
+    "lib/active_model/validations/word_count.rb",
+    "lib/word-count-validator.rb",
+    "test/helper.rb",
+    "test/test_word-count-validator.rb",
+    "word-count-validator.gemspec"
+  ]
+  s.homepage = %q{http://github.com/Sutto/word-count-validator}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Makes validating word counts in active_model easy}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_word-count-validator.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: word-count-validator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +08:00
+date: 2010-11-30 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -40,13 +39,14 @@ files:
 - lib/word-count-validator.rb
 - test/helper.rb
 - test/test_word-count-validator.rb
+- word-count-validator.gemspec
 has_rdoc: true
 homepage: http://github.com/Sutto/word-count-validator
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC