ActiveValidators 1.1.0

franckverrot · franckverrot · commit 548e403c717a · 2010-12-01T08:16:30.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.swp
+*.gem
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activevalidators (1.0.2)
+    activevalidators (1.1.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       mail
diff --git a/README.md b/README.md
@@ -6,23 +6,32 @@ Collection of ActiveModel/ActiveRecord validations
 Installation (Rails 3)
 ----------------------
 
-In your Gemfile:
+In your Gemfile ( >>= 1.1.0 ):
 
-    gem 'activevalidators', :require => 'active_validators'
+    gem 'activevalidators'
+
+**N.B: if you use version <= 1.0.2, use this instead:**
 
+    gem 'activevalidators', :require => 'active_validators'
 
 In your models, the gem provides new validators like `email`, or `url`:
 
     class User
       validates :email_address, :email => true
       validates :link_url,      :url   => true
+      validates :user_phone,    :phone => true
+    end
+
+    class Article
+      validates :slug,         :slug => true
     end
 
-Exhaustive list of supported validators:
+Exhaustive list of supported validators and their implementation:
 
-* `email` : checks the email based on the `mail` gem
-* `url`   : checks the url based on a regular expression
-* `phone` : checks the phone number based on a regular expression
+* `email` : based on the `mail` gem
+* `url`   : based on a regular expression
+* `phone` : based on a regular expression
+* `slug`  : based on `ActiveSupport::String#parameterize`
 
 Todo
 ----
diff --git a/Rakefile b/Rakefile
@@ -3,7 +3,7 @@ $:.unshift File.expand_path("../lib", __FILE__)
 
 require 'rubygems'
 require 'rubygems/specification'
-require 'active_validators'
+require 'activevalidators'
 
 def gemspec
   @gemspec ||= begin
diff --git a/activevalidators.gemspec b/activevalidators.gemspec
@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.0.2'
+  s.version     = '1.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot"]
   s.email       = ["franck@verrot.fr"]
diff --git a/lib/active_model/validations/slug_validator.rb b/lib/active_model/validations/slug_validator.rb
@@ -0,0 +1,11 @@
+module ActiveModel
+  module Validations
+    class SlugValidator < EachValidator
+      def validate_each(record, attribute, value)
+        unless value == value.parameterize
+          record.errors.add(attribute)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/activevalidators.rb b/lib/activevalidators.rb
@@ -11,5 +11,6 @@ module Validations
     autoload :UrlValidator
     autoload :RespondToValidator
     autoload :PhoneValidator
+    autoload :SlugValidator
   end
 end
diff --git a/spec/models/slug_validator_model.rb b/spec/models/slug_validator_model.rb
@@ -0,0 +1,7 @@
+module Models
+  class SlugValidatorModel
+    include ActiveModel::Validations
+    attr_accessor :slug
+    validates :slug, :slug => true
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'active_validators'
+require 'activevalidators'
 
 %w(models).each do |directory|
   Dir["#{File.dirname(__FILE__)}/#{directory}/*.rb"].each {|f| require f}
diff --git a/spec/specs/slug_spec.rb b/spec/specs/slug_spec.rb
@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Slug Validation" do
+  it "accepts valid slugs" do
+    model = Models::SlugValidatorModel.new
+    model.slug = '1234567890-foo-bar-bar'
+    model.valid?.should be(true)
+    model.should have(0).errors
+  end
+
+  describe "for invalid slugs" do
+    let(:model) do
+      Models::SlugValidatorModel.new.tap do |m|
+        m.slug = '@#$%^'
+      end
+    end
+
+    it "rejects invalid slugs" do
+      model.valid?.should be(false)
+      model.should have(1).errors
+    end
+
+    it "generates an error message of type invalid" do
+      model.valid?.should be(false)
+      model.errors[:slug].should == [model.errors.generate_message(:slug, :invalid)]
+    end
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'active_validators'`
	`1`	`+require 'activevalidators'`
`2`	`2`
`3`	`3`	`%w(models).each do \|directory\|`
`4`	`4`	`Dir["#{File.dirname(__FILE__)}/#{directory}/*.rb"].each {\|f\| require f}`