validates_phone_number 0.9.3 → 1.0.0

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx

data/README.markdown

@@ -1,15 +1,47 @@
+[![Build Status](https://secure.travis-ci.org/travisjeffery/validates_phone_number.png)](http://travis-ci.org/travisjeffery/validates_phone_number)
+
 # Validates Phone Number
 
-validates_phone_number adds validation methods to ActiveModel for validating
+`validates_phone_number` adds validation methods to ActiveModel for validating
 phone numbers.
 
-For example, given a User model with a phone number attribute of `phone number`
+### Basic Usage
+
+Given a User model with a phone number attribute of `phone number`
 that's a string, see if a given record has a valid phone number like so:
 
 ```
   class Person < ActiveRecord::Base
-    validates :phone_number, :phone_number => true
+    validates :mobile, :phone_number => true
   end
 ```
 
-You can also specify the usual options like `allow_nil`, and `format`.
+### Message
+
+Specify the message that's added to the errors collection by using the
+`message` option:
+
+```
+  class Person < ActiveRecord::Base
+    validates :mobile, :phone_number => {:message => "invalid and can only be attributable to human error"}
+  end
+```
+
+### Format/Match by Regular Expression
+
+You can specify that a number matches a regular expression by using the
+`format` option:
+
+```
+  class Person < ActiveRecord::Base
+    validates :mobile, :phone_number => {:format => /\d{3}-\d{3}-\d{4}/}
+  end
+```
+
+### Allow Nil
+
+```
+  class Person < ActiveRecord::Base
+    validates :mobile, :phone_number => {:allow_nil => true}
+  end
+```

data/Rakefile

@@ -1 +1,12 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+desc 'Run tests'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+task :default => :test

data/lib/validates_phone_number.rb

@@ -1,10 +1,5 @@
 require 'phone'
 Phoner::Phone.default_country_code = '1'
 require_relative "validates_phone_number/version"
+require_relative "validates_phone_number/message"
 require_relative "validates_phone_number/validator"
-require 'phone'
-
-
-module ValidatesPhoneNumber
-  # Your code goes here...
-end

data/lib/validates_phone_number/message.rb

@@ -0,0 +1,12 @@
+module ValidatesPhoneNumber
+  module Message
+    DEFAULT_ERROR_MESSAGE = "%s is not a valid"
+
+    private
+
+    def error_message_for value
+      @message || 
+        DEFAULT_ERROR_MESSAGE % value
+    end
+  end
+end

data/lib/validates_phone_number/validator.rb

@@ -2,10 +2,13 @@ require 'active_model/validator'
 
 module ValidatesPhoneNumber
   class Validator < ActiveModel::EachValidator
+    include ValidatesPhoneNumber::Message
+
     def initialize options
       @type = options.delete(:type) || :string
       @allow_nil = options.delete(:allow_nil)
       @format = options.delete(:format)
+      @message = options.delete(:message)
       super
     end
 
@@ -13,7 +16,8 @@ module ValidatesPhoneNumber
       return if @allow_nil && value.nil?
       return if Phoner::Phone.valid? value
       return if value =~ @format
-      record.errors.add attr_name, "'#{value}' is not a valid"
+      message = error_message_for value
+      record.errors.add attr_name, message
     end
   end
 end

data/lib/validates_phone_number/version.rb

@@ -1,3 +1,3 @@
 module ValidatesPhoneNumber
-  VERSION = "0.9.3"
+  VERSION = "1.0.0"
 end

data/test/test_helper.rb

@@ -1,9 +1,25 @@
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
 ENV['RAILS_ENV'] = 'minitest'
-require 'minitest/autorun'
+begin
+  require 'minitest/autorun'
+rescue LoadError
+  require 'rubygems'
+  require 'minitest/unit'
+  MiniTest::Unit.autorun
+end
+
 require 'active_model'
 require 'active_model/validations'
 require 'active_record'
 require 'action_view'
+
 require_relative '../lib/validates_phone_number'
 
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})

data/test/validates_phone_number/validator_test.rb

@@ -23,28 +23,36 @@ class TestValidator < MiniTest::Unit::TestCase
     assert @person.valid?
   end
 
-  def test_allow_nil_option_off
+  def test_allow_nil_option_defaults_to_false
     Person.validates :phone_number, :phone_number => true
     @person.phone_number = nil
     assert !@person.valid?
   end
 
-  def test_allow_nil_option_on
+  def test_nil_is_record_record_if_allow_nil
     Person.validates :phone_number, :phone_number => {:allow_nil => true}
     @person.phone_number = nil
     assert @person.valid?
   end
 
-  def test_valid_record_by_format_option_off
+  def test_invalid_record_by_format_option
     Person.validates :phone_number, :phone_number => true
     @person.phone_number = "555^555^555^5555"
     assert !@person.valid?
   end
 
-  def test_valid_record_by_format_option_on
+  def test_valid_record_by_format_option
     Person.validates :phone_number, :phone_number => {:format => /(\d+\^){3}\d+/}
     @person.phone_number = "555^555^555^5555"
     assert @person.valid?
   end
+
+  def test_specify_message
+    Person.validates :phone_number, :phone_number => {:message => "invalid and can only be attributable to human error"}
+    @person.phone_number = nil
+    @person.valid?
+    assert_equal 1, @person.errors.size
+    assert_match /invalid and can only be attributable to human error/, @person.errors.full_messages.first
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_phone_number
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000Z
+date: 2012-01-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70140013434860 !ruby/object:Gem::Requirement
+  requirement: &70335761603660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70140013434860
+  version_requirements: *70335761603660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70140013434140 !ruby/object:Gem::Requirement
+  requirement: &70335761603140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70140013434140
+  version_requirements: *70335761603140
 - !ruby/object:Gem::Dependency
   name: phone
-  requirement: &70140013433460 !ruby/object:Gem::Requirement
+  requirement: &70335761602660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70140013433460
+  version_requirements: *70335761602660
 - !ruby/object:Gem::Dependency
   name: phone
-  requirement: &70140013433000 !ruby/object:Gem::Requirement
+  requirement: &70335761602200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70140013433000
+  version_requirements: *70335761602200
 description: Adds validation methods to ActiveModel for validating phone numbers.
 email:
 - t@travisjeffery.com
@@ -63,10 +63,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - lib/validates_phone_number.rb
+- lib/validates_phone_number/message.rb
 - lib/validates_phone_number/validator.rb
 - lib/validates_phone_number/version.rb
 - test/test_helper.rb