activevalidators 1.2.3 → 1.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activevalidators (1.2.3)
+    activevalidators (1.2.4)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       date_validator (= 0.5.9)

data/README.md

@@ -10,10 +10,6 @@ In your Gemfile ( >>= 1.1.0 ):
 
     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
@@ -21,6 +17,9 @@ In your models, the gem provides new validators like `email`, or `url`:
       validates :link_url,      :url   => true
       validates :user_phone,    :phone => true
       validates :password,      :password => { :strength => :medium }
+      validates :twitter_at,    :twitter => { :format => :username_with_at }
+      validates :twitter_url,   :twitter => { :format => :url }
+      validates :twitter,       :twitter => true
     end
 
     class Article
@@ -48,6 +47,7 @@ Exhaustive list of supported validators and their implementation:
 * `email` : based on the `mail` gem
 * `url`   : based on a regular expression
 * `phone` : based on a regular expression
+* `twitter` : based on a regular expression
 * `slug`  : based on `ActiveSupport::String#parameterize`
 * `ip`    : based on `Resolv::IPv[4|6]::Regex`
 * `credit_card` : based on the `Luhn` algorithm
@@ -80,6 +80,7 @@ Contributors
 * Franck Verrot
 * Oriol Gual
 * Paco Guzmán
+* Garrett Bjerkhoel
 
 Copyright
 ---------

data/activevalidators.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "activevalidators"
-  s.version     = '1.2.3'
+  s.version     = '1.2.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Franck Verrot", "Paco Guzmán", "Oriol Gual", "Garrett Bjerkhoel"]
   s.email       = ["franck@verrot.fr"]

data/lib/active_model/validations/twitter_validator.rb

@@ -0,0 +1,22 @@
+module ActiveModel
+  module Validations
+
+    class TwitterValidator < EachValidator
+      def validate_each(record, attribute, value)
+        format = options[:format].to_sym if options[:format]
+        
+        if value.nil?
+          record.errors.add_on_blank(attribute)
+        elsif format == :url
+          match = value.match(/^https?:\/\/(www\.)?twitter.com\/([A-Za-z0-9_]{1,15})$/i)
+          record.errors.add(attribute) unless match && !match[2].nil? # www. is first capture
+        elsif format == :username_with_at
+          record.errors.add(attribute) unless value.match(/^@([A-Za-z0-9_]{1,15})$/i)
+        else
+          record.errors.add(attribute) unless value.match(/^([A-Za-z0-9_]{1,15})$/i)
+        end
+      end
+    end
+
+  end
+end

data/lib/activevalidators.rb

@@ -16,5 +16,6 @@ module ActiveModel
     autoload :CreditCardValidator
     autoload :DateValidator, 'date_validator'
     autoload :PasswordValidator
+    autoload :TwitterValidator
   end
 end

data/spec/spec_helper.rb

@@ -10,5 +10,5 @@ end
 class TestRecord
   include ActiveModel::Validations
   attr_accessor :ip, :url, :slug, :responder, :global_condition,
-    :local_condition, :phone, :email, :card, :password
+    :local_condition, :phone, :email, :card, :password, :twitter_username
 end

data/spec/validations/twitter_spec.rb

@@ -0,0 +1,154 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "Twitter Validation" do
+  before(:each) do
+    TestRecord.reset_callbacks(:validate)
+    TestRecord.validates :twitter_username, :twitter => true
+  end
+    
+  subject { TestRecord.new }
+
+  it "rejects invalid urls" do
+    subject.should_not be_valid
+    subject.should have(1).error
+  end
+
+  it "generates an error message of type blank" do
+    subject.should_not be_valid
+    subject.errors[:twitter_username].should include subject.errors.generate_message(:twitter_username, :blank)
+  end
+  
+  describe "for twitter url validator" do
+    before do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :twitter_username, :twitter => { :format => :url }
+    end
+
+    it "validates with http" do
+      subject.twitter_username = 'http://twitter.com/garrettb'
+      subject.should be_valid
+    end
+
+    it "validates with https protocol" do
+      subject.twitter_username = 'https://twitter.com/garrettb'
+      subject.should be_valid
+    end
+
+    it "generate error with ftp protocol" do
+      subject.twitter_username = 'ftp://twitter.com/garrettb'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "validates with www and http" do
+      subject.twitter_username = 'http://www.twitter.com/garrettb'
+      subject.should be_valid
+    end
+
+    it "generate error without www dot" do
+      subject.twitter_username = 'http://wwwtwitter.com/garrettb'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error without no username" do
+      subject.twitter_username = 'http://twitter.com'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error without no username and trailing slash" do
+      subject.twitter_username = 'http://twitter.com/'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with too long of username" do
+      subject.twitter_username = 'http://twitter.com/garrettbjerkhoelwashere'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with invalid character" do
+      subject.twitter_username = 'http://twitter.com/garrettbjerkhoé'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+  end
+  
+  describe "for twitter at sign validator" do
+    before do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :twitter_username, :twitter => { :format => :username_with_at }
+    end
+
+    it "validate with valid username" do
+      subject.twitter_username = '@garrettb'
+      subject.should be_valid
+    end
+
+    it "validate with one character" do
+      subject.twitter_username = '@a'
+      subject.should be_valid
+    end
+
+    it "generate error with too long of username" do
+      subject.twitter_username = '@garrettbjerkhoelwashere'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with no username" do
+      subject.twitter_username = '@'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with invalid character" do
+      subject.twitter_username = '@érik'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+  end
+  
+  describe "for twitter without at sign validator" do
+    before do
+      TestRecord.reset_callbacks(:validate)
+      TestRecord.validates :twitter_username, :twitter => true
+    end
+
+    it "validate with valid username" do
+      subject.twitter_username = 'garrettb'
+      subject.should be_valid
+    end
+
+    it "validate with one character" do
+      subject.twitter_username = 'a'
+      subject.should be_valid
+    end
+
+    it "generate error with too long of username" do
+      subject.twitter_username = 'garrettbjerkhoelwashere'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with no username" do
+      subject.twitter_username = ''
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with invalid character" do
+      subject.twitter_username = 'érik'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+
+    it "generate error with at sign character" do
+      subject.twitter_username = '@garrettb'
+      subject.should_not be_valid
+      subject.should have(1).error
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activevalidators
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Franck Verrot
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,6 +29,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,6 +57,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,6 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -80,6 +85,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -95,6 +101,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -110,6 +117,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -123,6 +131,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 5
@@ -156,6 +165,7 @@ files:
 - lib/active_model/validations/phone_validator.rb
 - lib/active_model/validations/respond_to_validator.rb
 - lib/active_model/validations/slug_validator.rb
+- lib/active_model/validations/twitter_validator.rb
 - lib/active_model/validations/url_validator.rb
 - lib/activevalidators.rb
 - spec/spec_helper.rb
@@ -166,6 +176,7 @@ files:
 - spec/validations/phone_spec.rb
 - spec/validations/respond_to_spec.rb
 - spec/validations/slug_spec.rb
+- spec/validations/twitter_spec.rb
 - spec/validations/url_spec.rb
 has_rdoc: true
 homepage: http://github.com/cesario/activevalidators
@@ -181,6 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -189,6 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -208,4 +221,5 @@ test_files:
 - spec/validations/phone_spec.rb
 - spec/validations/respond_to_spec.rb
 - spec/validations/slug_spec.rb
+- spec/validations/twitter_spec.rb
 - spec/validations/url_spec.rb