validates_telephone 1.0.1 → 1.1.0

data/lib/validates_telephone/formatter.rb

@@ -2,9 +2,9 @@ module ValidatesTelephone
   module Formatter
     def self.br(number)
       return nil if number.nil?
-      number.gsub(/[\(\)-]/, "") =~ /^(\d{2})(\d{4})(\d{4})$/
+      number.gsub(/[\(\)-]/, "") =~ /^(\d{2})(9)?(\d{4})(\d{4})$/
       return number if $1.nil?
-      "(#{$1})#{$2}-#{$3}"
+      "(#{$1})#{$2}#{$3}-#{$4}"
     end
 
     def self.usa(number)
@@ -18,4 +18,4 @@ module ValidatesTelephone
       number
     end
   end
-end
+end

data/lib/validates_telephone/regex.rb

@@ -1,7 +1,7 @@
 module ValidatesTelephone
   module Regex
     def self.br(number)
-      number =~ /^(\(?\d{2}\)?)(\d{4})-?(\d{4})$/
+      number =~ /^(\(?\d{2}\)?)(9)?(\d{4})-?(\d{4})$/
     end
 
     def self.usa(number)
@@ -12,4 +12,4 @@ module ValidatesTelephone
       number =~ /^(\(\d{2}\))(\d{4})-(\d{4})|(\([^2-9]\d{2}\))(\d{3})-(\d{4})$/
     end
   end
-end
+end

data/lib/validates_telephone/remarkable/require_a_valid_telephone_matcher.rb

@@ -14,13 +14,13 @@ module Remarkable
 
         def telephone_valid?
           return allows_value_of("(111)222-3333") if @options[:locale] == :usa
-          return allows_value_of("(11)2222-3333") if @options[:locale] == :br
+          return (allows_value_of("(11)2222-3333") and allows_value_of("(11)91111-1111")) if @options[:locale] == :br
           allows_value_of("(111)222-3333") and allows_value_of("(11)2222-3333")
         end
 
         def telephone_invalid?
           return (disallows_value_of("123456") and disallows_value_of("(11)2222-3333")) if @options[:locale] == :usa
-          return (disallows_value_of("123456") and disallows_value_of("(111)222-3333")) if @options[:locale] == :br
+          return (disallows_value_of("123456") and disallows_value_of("(111)222-3333") and disallows_value_of("(11)81111-1111")) if @options[:locale] == :br
           disallows_value_of("123456")
         end
 
@@ -40,4 +40,4 @@ module Remarkable
       end
     end
   end
-end
+end

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

@@ -32,16 +32,16 @@ module Shoulda
 
         def disallows_invalid_value
           return (disallows_value_of("123456") and disallows_value_of("(11)2222-3333")) if @options[:locale] == :usa
-          return (disallows_value_of("123456") and disallows_value_of("(111)222-3333")) if @options[:locale] == :br
+          return (disallows_value_of("123456") and disallows_value_of("(111)222-3333") and disallows_value_of("(11)81111-1111")) if @options[:locale] == :br
           disallows_value_of("123456")
         end
 
         def allows_valid_value
           return allows_value_of("(111)222-3333") if @options[:locale] == :usa
-          return allows_value_of("(11)2222-3333") if @options[:locale] == :br
+          return (allows_value_of("(11)2222-3333") and allows_value_of("(11)91111-1111")) if @options[:locale] == :br
           allows_value_of("(111)222-3333") and allows_value_of("(11)2222-3333")
         end
       end
     end
   end
-end
+end

data/lib/validates_telephone/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTelephone
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/validates_telephone/validator_spec.rb

@@ -14,6 +14,10 @@ describe ValidatesTelephone::Validator do
       it "12345678910 as number" do
         ValidatesTelephone::Validator.new('12345678910', :br).should_not be_valid
       end
+
+      it "11811111111 as number" do
+        ValidatesTelephone::Validator.new('11811111111', :br).should_not be_valid
+      end
     end
 
     context "should be valid with" do
@@ -36,12 +40,20 @@ describe ValidatesTelephone::Validator do
       it "(11)1111-1111 as number" do
         ValidatesTelephone::Validator.new('(11)1111-1111', :br).should be_valid
       end
+
+      it "(11)91111-1111 as number" do
+        ValidatesTelephone::Validator.new('(11)91111-1111', :br).should be_valid
+      end
     end
 
     context "with a valid value" do
       it "should return it formatted" do
         ValidatesTelephone::Validator.new('1111111111', :br).number.should == '(11)1111-1111'
       end
+
+      it "should return it formatted(sp format)" do
+        ValidatesTelephone::Validator.new('11911111111', :br).number.should == '(11)91111-1111'
+      end
     end
 
     context "with an invalid value" do
@@ -142,4 +154,4 @@ describe ValidatesTelephone::Validator do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_telephone
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -168,12 +168,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3480777395687768892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3480777395687768892
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24