validates_phone_number 0.1.4 → 0.9.0

data/README.markdown

@@ -1,47 +1,12 @@
-[![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
-phone numbers.
-
-### Basic Usage
+Validate phone numbers in your Rails project.
 
-Given a User model with a phone number attribute of `phone number`
+For example, 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 :mobile, :phone_number => true
-  end
-```
-
-### 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"}
+    validates :phone_number, :phone_number => true
   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
-```
+You can also specify the usual options like `allow_nil`, and `format`.

data/Rakefile

@@ -1,12 +1 @@
 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/validator.rb

@@ -2,13 +2,10 @@ 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
 
@@ -16,8 +13,7 @@ module ValidatesPhoneNumber
       return if @allow_nil && value.nil?
       return if Phoner::Phone.valid? value
       return if value =~ @format
-      message = error_message_for value
-      record.errors.add attr_name, message
+      record.errors.add attr_name, "'#{value}' is not a valid"
     end
   end
 end

data/lib/validates_phone_number/version.rb

@@ -1,3 +1,3 @@
 module ValidatesPhoneNumber
-  VERSION = "0.1.4"
+  VERSION = "0.9.0"
 end

data/lib/validates_phone_number.rb

@@ -1,5 +1,10 @@
 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/test/test_helper.rb

@@ -1,25 +1,9 @@
-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'
-begin
-  require 'minitest/autorun'
-rescue LoadError
-  require 'rubygems'
-  require 'minitest/unit'
-  MiniTest::Unit.autorun
-end
-
+require 'minitest/autorun'
 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,36 +23,28 @@ class TestValidator < MiniTest::Unit::TestCase
     assert @person.valid?
   end
 
-  def test_allow_nil_option_defaults_to_false
+  def test_allow_nil_option_off
     Person.validates :phone_number, :phone_number => true
     @person.phone_number = nil
     assert !@person.valid?
   end
 
-  def test_nil_is_record_record_if_allow_nil
+  def test_allow_nil_option_on
     Person.validates :phone_number, :phone_number => {:allow_nil => true}
     @person.phone_number = nil
     assert @person.valid?
   end
 
-  def test_invalid_record_by_format_option
+  def test_valid_record_by_format_option_off
     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_valid_record_by_format_option_on
     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
 

data/test/validates_phone_number_test.rb

@@ -0,0 +1,3 @@
+require 'test_helper'
+
+

data/validates_phone_number.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Travis Jeffery"]
   s.email       = ["t@travisjeffery.com"]
   s.homepage    = ""
-  s.summary     = %q{Adds validation methods to ActiveModel for validating phone numbers.}
-  s.description = %q{Adds validation methods to ActiveModel for validating phone numbers.}
+  s.summary     = %q{Adds validation methods to ActiveModel for validating dates and times.}
+  s.description = %q{Adds validation methods to ActiveModel for validating dates and times.}
 
   s.rubyforge_project = "validates_phone_number"
 
@@ -18,9 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  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'
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rails"
+  s.add_development_dependency "phone"
+  s.add_runtime_dependency "phone"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_phone_number
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,53 +9,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70167044806360 !ruby/object:Gem::Requirement
+  requirement: &70106801756540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167044806360
+  version_requirements: *70106801756540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70167044805800 !ruby/object:Gem::Requirement
+  requirement: &70106801756060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167044805800
+  version_requirements: *70106801756060
 - !ruby/object:Gem::Dependency
   name: phone
-  requirement: &70167044805240 !ruby/object:Gem::Requirement
+  requirement: &70106801755240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70167044805240
+  version_requirements: *70106801755240
 - !ruby/object:Gem::Dependency
   name: phone
-  requirement: &70167044804780 !ruby/object:Gem::Requirement
+  requirement: &70106801754640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167044804780
-description: Adds validation methods to ActiveModel for validating phone numbers.
+  version_requirements: *70106801754640
+description: Adds validation methods to ActiveModel for validating dates and times.
 email:
 - t@travisjeffery.com
 executables: []
@@ -63,16 +63,16 @@ 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/railtie.rb
 - lib/validates_phone_number/validator.rb
 - lib/validates_phone_number/version.rb
 - test/test_helper.rb
 - test/validates_phone_number/validator_test.rb
+- test/validates_phone_number_test.rb
 - validates_phone_number.gemspec
 homepage: ''
 licenses: []
@@ -97,7 +97,8 @@ rubyforge_project: validates_phone_number
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Adds validation methods to ActiveModel for validating phone numbers.
+summary: Adds validation methods to ActiveModel for validating dates and times.
 test_files:
 - test/test_helper.rb
 - test/validates_phone_number/validator_test.rb
+- test/validates_phone_number_test.rb

data/.travis.yml

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

data/lib/validates_phone_number/message.rb

@@ -1,12 +0,0 @@
-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