validates_phone_number 1.0.0 → 2.0.0

data/Gemfile

@@ -5,8 +5,6 @@ gemspec
 gem 'rails', '3.1.0'
 gem 'minitest', '2.10.0'
 
-gem 'phone', '1.1'
-
 group :active_record do
   gem 'sqlite3-ruby', :require => 'sqlite3'
 end

data/README.markdown

@@ -10,21 +10,25 @@ phone numbers.
 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:
 
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => true
+end
 ```
-  class Person < ActiveRecord::Base
-    validates :mobile, :phone_number => true
-  end
-```
+
+By default, both 10 and 7 digit numbers are valid.
+
+## Options
 
 ### Message
 
-Specify the message that's added to the errors collection by using the
+Set 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
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => {:message => "invalid and can only be attributable to human error"}
+end
 ```
 
 ### Format/Match by Regular Expression
@@ -32,16 +36,36 @@ Specify the message that's added to the errors collection by using the
 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
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => {:format => /\d{3}-\d{3}-\d{4}/}
+end
 ```
 
 ### Allow Nil
 
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => {:allow_nil => true}
+end
+```
+
+### Seven Digits
+
+I.e. 555-5555
+
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => {:seven_digits => true}
+end
+
 ```
-  class Person < ActiveRecord::Base
-    validates :mobile, :phone_number => {:allow_nil => true}
-  end
+### Ten Digits
+
+I.e. (555)-555-5555
+
+```ruby
+class Person < ActiveRecord::Base
+  validates :mobile, :phone_number => {:ten_digits => true}
+end
 ```

data/lib/validates_phone_number.rb

@@ -1,5 +1,4 @@
-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/formats"
 require_relative "validates_phone_number/validator"

data/lib/validates_phone_number/formats.rb

@@ -0,0 +1,7 @@
+module ValidatesPhoneNumber
+  module Formats
+    TEN_DIGITS = /^\(?([0-9]{3})\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$/
+    SEVEN_DIGITS = /^(?:\(?([0-9]{3})\)?[-. ]?)?([0-9]{3})[-. ]?([0-9]{4})$/
+    LEADING_1 = /^(?:\+?1[-. ]?)?\(?([0-9]{3})\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$/
+  end
+end

data/lib/validates_phone_number/message.rb

@@ -1,6 +1,6 @@
 module ValidatesPhoneNumber
   module Message
-    DEFAULT_ERROR_MESSAGE = "%s is not a valid"
+    DEFAULT_ERROR_MESSAGE = "%s is not valid"
 
     private
 

data/lib/validates_phone_number/validator.rb

@@ -3,19 +3,27 @@ require 'active_model/validator'
 module ValidatesPhoneNumber
   class Validator < ActiveModel::EachValidator
     include ValidatesPhoneNumber::Message
+    include ValidatesPhoneNumber::Formats
 
     def initialize options
+      @default = options.keys.size == 1
       @type = options.delete(:type) || :string
       @allow_nil = options.delete(:allow_nil)
       @format = options.delete(:format)
       @message = options.delete(:message)
+      @ten_digits = options.delete(:ten_digits)
+      @seven_digits = options.delete(:seven_digits)
+      @leading_1 = options.delete(:leading_1)
       super
     end
 
     def validate_each record, attr_name, value
       return if @allow_nil && value.nil?
-      return if Phoner::Phone.valid? value
       return if value =~ @format
+      return if value =~ TEN_DIGITS if @ten_digits
+      return if value =~ SEVEN_DIGITS if @seven_digits
+      return if value =~ LEADING_1 if @leading_1
+      return if value =~ TEN_DIGITS || value =~ SEVEN_DIGITS if @default
       message = error_message_for value
       record.errors.add attr_name, message
     end

data/lib/validates_phone_number/version.rb

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

data/test/validates_phone_number/validator_test.rb

@@ -10,49 +10,104 @@ class TestValidator < MiniTest::Unit::TestCase
   def test_model_validates_with_phone_number_option
     Person.validates :phone_number, :phone_number => true
   end
-
-  def test_invalid_record_if_invalid_phone_number
-    Person.validates :phone_number, :phone_number => true
-    @person.phone_number = "423432432452"
-    assert !@person.valid?
-  end
   
-  def test_valid_record_if_valid_phone_number
+  def test_validates_defaults
     Person.validates :phone_number, :phone_number => true
+
     @person.phone_number = "555-565-5703"
-    assert @person.valid?
+    assert @person.valid?, @person.errors.full_messages
+
+    @person.phone_number = "565-5703"
+    assert @person.valid?, @person.errors.full_messages
   end
 
-  def test_allow_nil_option_defaults_to_false
+  def test_invalidates
     Person.validates :phone_number, :phone_number => true
-    @person.phone_number = nil
+    @person.phone_number = "423432432452"
     assert !@person.valid?
-  end
-
-  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_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
+  def test_validates_with_format
     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
+  def test_explicit_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
+
+  def test_validates_international_number
+    Person.validates :phone_number, :phone_number => {:format => /(\d+\^){3}\d+/}
+    @person.phone_number = "555^555^555^5555"
+    assert @person.valid?
+  end
+
+  def test_validates_ten_digit_number
+    Person.validates :phone_number, :phone_number => {:ten_digits => true}
+    @person.phone_number = "(555)-555-5555"
+    assert @person.valid?
+
+    @person.phone_number = "(55)-555-5555"
+    assert !@person.valid?
+
+    @person.phone_number = "-(555)-555-5555"
+    assert !@person.valid?
+
+    @person.phone_number = "555-555-5555"
+    assert @person.valid?
+
+    @person.phone_number = "555.555.5555"
+    assert @person.valid?
+
+    @person.phone_number = "5555555555"
+    assert @person.valid?
+  end
+
+  def test_validates_seven_digit_number
+    Person.validates :phone_number, :phone_number => {:seven_digits => true}
+    @person.phone_number = "555-5555"
+    assert @person.valid?
+
+    @person.phone_number = "-55-5555"
+    assert !@person.valid?
+
+    @person.phone_number = "5555555"
+    assert @person.valid?
+
+    @person.phone_number = "555.5555"
+    assert @person.valid?
+  end
+
+  def test_validates_leading_1
+    Person.validates :phone_number, :phone_number => {:leading_1 => true}
+    @person.phone_number = "+1 (123) 456-7890"
+    assert @person.valid?
+
+    @person.phone_number = "1-123-456-7890"
+    assert @person.valid?
+
+    @person.phone_number = "2-123-456-7890"
+    assert !@person.valid?
+  end
+
+  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_validates_nil_phone_number
+    Person.validates :phone_number, :phone_number => {:allow_nil => true}
+    @person.phone_number = nil
+    assert @person.valid?
+  end
 end
 

data/validates_phone_number.gemspec

@@ -20,7 +20,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "minitest", '2.10.0'
   s.add_development_dependency "rails", '3.1.0'
-  s.add_development_dependency "phone", '1.1'
-
-  s.add_runtime_dependency "phone", '1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_phone_number
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70335761603660 !ruby/object:Gem::Requirement
+  requirement: &70269310105660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70335761603660
+  version_requirements: *70269310105660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70335761603140 !ruby/object:Gem::Requirement
+  requirement: &70269310105080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,29 +32,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70335761603140
-- !ruby/object:Gem::Dependency
-  name: phone
-  requirement: &70335761602660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: *70335761602660
-- !ruby/object:Gem::Dependency
-  name: phone
-  requirement: &70335761602200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70335761602200
+  version_requirements: *70269310105080
 description: Adds validation methods to ActiveModel for validating phone numbers.
 email:
 - t@travisjeffery.com
@@ -68,6 +46,7 @@ files:
 - README.markdown
 - Rakefile
 - lib/validates_phone_number.rb
+- lib/validates_phone_number/formats.rb
 - lib/validates_phone_number/message.rb
 - lib/validates_phone_number/validator.rb
 - lib/validates_phone_number/version.rb
@@ -86,12 +65,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3377125952189612186
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3377125952189612186
 requirements: []
 rubyforge_project: validates_phone_number
 rubygems_version: 1.8.10