validates_telephone 0.2.1 → 1.0.0

data/spec/validates_telephone_spec.rb

@@ -1,10 +1,16 @@
 require 'spec_helper'
 
 describe TelephoneValidator do
-  context "with br as locale" do
-    context "when telephone is invalid" do
+  let(:valid_numbers) { { :br_telephone => "(11)1111-1111",
+                          :usa_telephone => "(111)111-1111",
+                          :telephone => "(111)111-1111" } }
+
+  context "on a field validated as a valid telephone from Brazil" do
+    context "with an invalid number" do
       before :each do
-        @user = BrUser.new(:telephone => "12345")
+        @user = User.new(valid_numbers.merge(:br_telephone => "12345"))
+        I18n.stub(:t).with(:"activerecord.errors.models.user.attributes.br_telephone.invalid",
+                           :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
       end
 
       it "should set object as invalid" do
@@ -13,13 +19,13 @@ describe TelephoneValidator do
 
       it "should set an error on attribute" do
         @user.valid?
-        @user.errors[:telephone].should == ['is invalid']
+        @user.errors[:br_telephone].should == ['is invalid']
       end
     end
 
-    context "when telephone is valid" do
+    context "with a valid number" do
       before :each do
-        @user = BrUser.new(:telephone => "(11)1111-1111")
+        @user = User.new(valid_numbers)
       end
 
       it "should set object as valid" do
@@ -28,20 +34,61 @@ describe TelephoneValidator do
 
       it "should not set an error on attribute" do
         @user.valid?
-        @user.errors[:telephone].should be_blank
+        @user.errors[:br_telephone].should be_blank
+      end
+    end
+
+    it "should accept a nil value" do
+      @user = User.new(valid_numbers.merge(:br_telephone => nil))
+      @user.valid?.should be_true
+    end
+  end
+
+  context "on a field validated as a valid telephone from United States" do
+    context "with an invalid number" do
+      before :each do
+        @user = User.new(valid_numbers.merge(:usa_telephone => "12345"))
+        I18n.stub(:t).with(:"activerecord.errors.models.user.attributes.usa_telephone.invalid",
+                           :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
+      end
+
+      it "should set object as invalid" do
+        @user.valid?.should be_false
+      end
+
+      it "should set an error on attribute" do
+        @user.valid?
+        @user.errors[:usa_telephone].should == ['is invalid']
+      end
+    end
+
+    context "with a valid number" do
+      before :each do
+        @user = User.new(valid_numbers)
+      end
+
+      it "should set object as valid" do
+        @user.valid?.should be_true
+      end
+
+      it "should not set an error on attribute" do
+        @user.valid?
+        @user.errors[:usa_telephone].should be_blank
       end
     end
 
     it "should accept a nil value" do
-      @user = BrUser.new(:telephone => nil)
+      @user = User.new(valid_numbers.merge(:usa_telephone => nil))
       @user.valid?.should be_true
     end
   end
 
-  context "with usa as locale" do
-    context "when telephone is invalid" do
+  context "on a field validated as a valid telephone" do
+    context "with an invalid number" do
       before :each do
-        @user = EnUser.new(:telephone => "12345")
+        @user = User.new(valid_numbers.merge(:telephone => "12345"))
+        I18n.stub(:t).with(:"activerecord.errors.models.user.attributes.telephone.invalid",
+                           :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
       end
 
       it "should set object as invalid" do
@@ -54,10 +101,24 @@ describe TelephoneValidator do
       end
     end
 
-    context "when telephone is valid" do
+    context "with a valid number from Brazil" do
       before :each do
-        @user = EnUser.new(:telephone => "(111)111-1111")
+        @user = User.new(valid_numbers.merge(:telephone => "(11)1111-1111"))
+      end
+
+      it "should set object as valid" do
+        @user.valid?.should be_true
+      end
+
+      it "should not set an error on attribute" do
         @user.valid?
+        @user.errors[:telephone].should be_blank
+      end
+    end
+
+    context "with a valid number from United States" do
+      before :each do
+        @user = User.new(valid_numbers.merge(:telephone => "(111)111-1111"))
       end
 
       it "should set object as valid" do
@@ -71,7 +132,7 @@ describe TelephoneValidator do
     end
 
     it "should accept a nil value" do
-      @user = EnUser.new(:telephone => nil)
+      @user = User.new(valid_numbers.merge(:usa_telephone => nil))
       @user.valid?.should be_true
     end
   end

data/validates_telephone.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("activerecord", ">= 3.0.0")
 
-  s.rubyforge_project = "validates_cpf"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_telephone
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &6809500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *6809500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6807740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6807740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6807200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *6807200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &6806680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +69,31 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *6806680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: remarkable_activerecord
-  requirement: &6806100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0.alpha4
   type: :development
   prerelease: false
-  version_requirements: *6806100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.alpha4
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &6805640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6805640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Validates Telephone for Brazil and United States and test it with matchers
   in a simple way.
 email: plribeiro3000@gmail.com
@@ -87,26 +117,27 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - lib/validates_telephone.rb
-- lib/validates_telephone/remarkable/validate_as_br_telephone_matcher.rb
-- lib/validates_telephone/remarkable/validate_as_usa_telephone_matcher.rb
-- lib/validates_telephone/shoulda-matchers/validate_as_br_telephone_matcher.rb
-- lib/validates_telephone/shoulda-matchers/validate_as_usa_telephone_matcher.rb
-- lib/validates_telephone/telephone.rb
+- lib/validates_telephone/formatter.rb
+- lib/validates_telephone/regex.rb
+- lib/validates_telephone/remarkable/require_a_valid_telephone_matcher.rb
+- lib/validates_telephone/shoulda-matchers/require_a_valid_telephone_matcher.rb
+- lib/validates_telephone/telephone_validator.rb
+- lib/validates_telephone/validator.rb
 - lib/validates_telephone/version.rb
-- spec/fake_app/admin.rb
-- spec/fake_app/db/create_admins.rb
 - spec/fake_app/db/create_users.rb
 - spec/fake_app/user.rb
-- spec/remarkable/validate_as_br_telephone_matcher_spec.rb
-- spec/remarkable/validate_as_usa_telephone_matcher_spec.rb
-- spec/shoulda-matchers/validate_as_br_telephone_matcher_spec.rb
-- spec/shoulda-matchers/validate_as_usa_telephone_matcher_spec.rb
 - spec/spec_helper.rb
-- spec/validates_telephone/telephone_spec.rb
+- spec/validates_telephone/formatter_spec.rb
+- spec/validates_telephone/regex_spec.rb
+- spec/validates_telephone/remarkable/require_a_valid_telephone_matcher_spec.rb
+- spec/validates_telephone/shoulda-matchers/require_a_valid_telephone_matcher_spec.rb
+- spec/validates_telephone/validator_spec.rb
 - spec/validates_telephone_spec.rb
 - validates_telephone.gemspec
 homepage: ''
@@ -128,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: validates_cpf
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Telephone Validation GEM

data/lib/validates_telephone/remarkable/validate_as_br_telephone_matcher.rb

@@ -1,34 +0,0 @@
-require 'remarkable/active_record'
-
-module Remarkable
-  module ActiveRecord
-    module Matchers
-      class ValidateAsBrTelephoneMatcher < Remarkable::ActiveRecord::Base
-        arguments :telephone
-
-        collection_assertions :telephone_valid?, :allow_nil?, :formatted_number?
-
-        protected
-
-        def telephone_valid?
-          @subject.telephone = '123456'
-          @subject.valid?.errors[:telephone].should == ['is invalid']
-        end
-
-        def allow_nil?
-          @subject.telephone = nil
-          @subject.valid?.errors[:telephone].should == []
-        end
-
-        def formatted_number?
-          @subject.telephone = '1122223333'
-          @subject.valid?.telephone.should == '(11)2222-3333'
-        end
-      end
-
-      def validate_as_br_telephone(*args, &block)
-        ValidateAsBrTelephoneMatcher.new(*args, &block).spec(self)
-      end
-    end
-  end
-end

data/lib/validates_telephone/remarkable/validate_as_usa_telephone_matcher.rb

@@ -1,34 +0,0 @@
-require 'remarkable/active_record'
-
-module Remarkable
-  module ActiveRecord
-    module Matchers
-      class ValidateAsUsaTelephoneMatcher < Remarkable::ActiveRecord::Base
-        arguments :telephone
-
-        collection_assertions :telephone_valid?, :allow_nil?, :formatted_number?
-
-        protected
-
-        def telephone_valid?
-          @subject.telephone = '123456'
-          @subject.valid?.errors[:telephone].should == ['is invalid']
-        end
-
-        def allow_nil?
-          @subject.telephone = nil
-          @subject.valid?.errors[:telephone].should == []
-        end
-
-        def formatted_number?
-          @subject.telephone = '1112223333'
-          @subject.valid?.telephone.should == '(111)222-3333'
-        end
-      end
-
-      def validate_as_usa_telephone(*args, &block)
-        ValidateAsUsaTelephoneMatcher.new(*args, &block).spec(self)
-      end
-    end
-  end
-end

data/lib/validates_telephone/shoulda-matchers/validate_as_br_telephone_matcher.rb

@@ -1,45 +0,0 @@
-require "shoulda-matchers"
-
-module Shoulda
-  module Matchers
-    module ActiveModel
-      def validate_as_br_telephone(attr)
-        ValidateAsBrTelephoneMatcher.new(attr)
-      end
-
-      class ValidateAsBrTelephoneMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
-        def description
-          "validate #{@attribute} as a valid Telephone number for Brazil"
-        end
-
-        def failure_message
-          "expected #{@attribute} to be validated as a valid Telephone number for Brazil"
-        end
-
-        def matches?(subject)
-          super(subject)
-
-          disallows_invalid_value and allows_valid_value and allows_nil_value
-        end
-
-        private
-
-        def disallows_invalid_value
-          disallows_value_of("123456")
-        end
-
-        def allows_valid_value
-          allows_value_of("(11)2222-3333")
-        end
-
-        def allows_nil_value
-          allows_value_of(nil)
-        end
-      end
-    end
-  end
-end

data/lib/validates_telephone/shoulda-matchers/validate_as_usa_telephone_matcher.rb

@@ -1,45 +0,0 @@
-require "shoulda-matchers"
-
-module Shoulda
-  module Matchers
-    module ActiveModel
-      def validate_as_usa_telephone(attr)
-        ValidateAsUsaTelephoneMatcher.new(attr)
-      end
-
-      class ValidateAsUsaTelephoneMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
-        def description
-          "validate #{@attribute} as a valid Telephone number for United States"
-        end
-
-        def failure_message
-          "expected #{@attribute} to be validated as a valid Telephone number for United States"
-        end
-
-        def matches?(subject)
-          super(subject)
-
-          disallows_invalid_value and allows_valid_value and allows_nil_value
-        end
-
-        private
-
-        def disallows_invalid_value
-          disallows_value_of("123456")
-        end
-
-        def allows_valid_value
-          allows_value_of("(111)222-3333")
-        end
-
-        def allows_nil_value
-          allows_value_of(nil)
-        end
-      end
-    end
-  end
-end

data/lib/validates_telephone/telephone.rb

@@ -1,34 +0,0 @@
-class Telephone
-  def initialize(number, locale)
-    @number = number
-    @locale = locale
-    if @locale == :br
-      @match = number =~ /^(\(?\d{2}\)?)(\d{4})-?(\d{4})$/
-    else
-      @match = number =~ /^(\(?[^2-9]\d{2}\)?)(\d{3})-?(\d{4})$/
-    end
-    @cleaned_number = $1.nil? ? nil : @number.gsub(/[\(\)-]/, "")
-    format_number! if @cleaned_number
-  end
-
-  def valid?
-    return false unless @number.nil? or @match
-    true
-  end
-
-  def number
-    @number
-  end
-
-  private
-
-  def format_number!
-    if @locale == :br
-      @cleaned_number =~ /^(\d{2})(\d{4})(\d{4})$/
-      @number = "(#{$1})#{$2}-#{$3}"
-    else
-      @cleaned_number =~ /^(\d{3})(\d{3})(\d{4})$/
-      @number = "(#{$1})#{$2}-#{$3}"
-    end
-  end
-end

data/spec/fake_app/admin.rb

@@ -1,2 +0,0 @@
-class Admin < ActiveRecord::Base
-end

data/spec/fake_app/db/create_admins.rb

@@ -1,11 +0,0 @@
-class CreateAdmins < ActiveRecord::Migration
-  def self.up
-    create_table :admins do |u|
-      u.string :telephone
-    end
-  end
-
-  def self.down
-    drop_table :admins
-  end
-end

data/spec/remarkable/validate_as_br_telephone_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'remarkable/active_record'
-
-describe Remarkable::ActiveRecord::Matchers::ValidateAsBrTelephoneMatcher do
-  context "on a attribute which validates telephone" do
-    it "should require a valid telephone" do
-      @user = BrUser.new(:telephone => '123456')
-      @user.should validate_as_br_telephone(:telephone)
-    end
-
-    it "should allow a nil value" do
-      @user = BrUser.new(:telephone => nil)
-      @user.should validate_as_br_telephone(:telephone)
-    end
-  end
-
-  context "on a attribute which not validates telephone" do
-    before do
-      @user = Admin.new(:telephone => '123456')
-    end
-
-    it "should not require a valid telephone" do
-      @user.should_not validate_as_br_telephone(:telephone)
-    end
-  end
-end

data/spec/remarkable/validate_as_usa_telephone_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'remarkable/active_record'
-
-describe Remarkable::ActiveRecord::Matchers::ValidateAsUsaTelephoneMatcher do
-  context "on a attribute which validates telephone" do
-    it "should require a valid telephone" do
-      @user = EnUser.new(:telephone => '123456')
-      @user.should validate_as_usa_telephone(:telephone)
-    end
-
-    it "should allow a nil value" do
-      @user = EnUser.new(:telephone => nil)
-      @user.should validate_as_usa_telephone(:telephone)
-    end
-  end
-
-  context "on a attribute which not validates telephone" do
-    before do
-      @user = Admin.new(:telephone => '123456')
-    end
-
-    it "should not require a valid telephone" do
-      @user.should_not validate_as_usa_telephone(:telephone)
-    end
-  end
-end

data/spec/shoulda-matchers/validate_as_br_telephone_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'shoulda-matchers'
-
-describe Shoulda::Matchers::ActiveModel::ValidateAsBrTelephoneMatcher do
-  context "on a attribute which validates telephone" do
-    it "should require a valid telephone" do
-      @user = BrUser.new(:telephone => '123456')
-      @user.should validate_as_br_telephone(:telephone)
-    end
-
-    it "should allow a nil value" do
-      @user = BrUser.new(:telephone => nil)
-      @user.should validate_as_br_telephone(:telephone)
-    end
-  end
-
-  context "on a attribute which not validates telephone" do
-    before do
-      @user = Admin.new(:telephone => '123456')
-    end
-
-    it "should not require a valid telephone" do
-      @user.should_not validate_as_br_telephone(:telephone)
-    end
-  end
-end

data/spec/shoulda-matchers/validate_as_usa_telephone_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'shoulda-matchers'
-
-describe Shoulda::Matchers::ActiveModel::ValidateAsUsaTelephoneMatcher do
-  context "on a attribute which validates telephone" do
-    it "should require a valid telephone" do
-      @user = EnUser.new(:telephone => '123456')
-      @user.should validate_as_usa_telephone(:telephone)
-    end
-
-    it "should allow a nil value" do
-      @user = EnUser.new(:telephone => nil)
-      @user.should validate_as_usa_telephone(:telephone)
-    end
-  end
-
-  context "on a attribute which not validates telephone" do
-    before do
-      @user = Admin.new(:telephone => '123456')
-    end
-
-    it "should not require a valid telephone" do
-      @user.should_not validate_as_usa_telephone(:telephone)
-    end
-  end
-end