big-phoney 0.0.3 → 0.0.4

data/README.md

@@ -8,7 +8,7 @@ But! Here's what you can do:
 
 
     phone = PhoneNumber.new('20 484-123-1234 x 123')
-    phone.number        # => "4844679726"
+    phone.number        # => "4841231234"
     phone.area_code     # => "484"
     phone.extension     # => "123"
     phone.country_code  # => "20"

data/big-phoney.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{big-phoney}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pat Nakajima"]
-  s.date = %q{2010-08-03}
-  s.files = ["LICENSE", "README.md", "big-phoney.gemspec", "lib/big-phoney.rb", "lib/big_phoney.rb", "lib/big_phoney/.gitignore", "lib/big_phoney/country_codes.rb", "spec/big_phoney_spec.rb", "spec/spec_helper.rb"]
+  s.authors = ["Pat Nakajima", "Brandon Keene"]
+  s.date = %q{2010-08-26}
+  s.files = ["LICENSE", "README.md", "big-phoney.gemspec", "lib/big-phoney.rb", "lib/big_phoney.rb", "lib/big_phoney/.gitignore", "spec/big_phoney_spec.rb", "spec/spec_helper.rb"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple phone number parsing in Ruby}

data/lib/big-phoney.rb

@@ -1,95 +1,2 @@
-MIN_US_LENGTH = 10
-MINLEN        = 7
-EXT           = /\s*(?:(?:ext|ex|xt|x)[\s.:]*(\d+))/i
-
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__))
-
-require 'big_phoney/country_codes'
-
-class PhoneNumber
-  def self.assume_us? ; @assume_us end
-  def self.assume_us=(us) ; @assume_us = us end
-
-  attr_accessor :country_code, :ext, :number
-
-  def initialize(number)
-    @number = number.strip
-    parse_extension
-    parse_country_code
-  end
-
-  def to_s
-    result = '(%s) %s-%s' % [area_code, prefix, rest]
-
-    if country_code != '1'
-      result = '+%s %s' % [country_code, result]
-    end
-
-    if extension
-      result = '%s ext. %s' % [result, extension]
-    end
-
-    result
-  end
-
-  def valid?
-    errors.empty?
-  end
-
-  def area_code
-    number[0..2]
-  end
-
-  def prefix
-    number[3..5]
-  end
-
-  def rest
-    number[6..9]
-  end
-
-  def errors
-    @errors ||= []
-  end
-
-  alias_method :extension, :ext
-
-  private
-
-  def parse_extension
-    @number =~ EXT
-    if $1 && $1.size > 4
-      errors << :extension
-    else
-      @ext = $1
-      @number.sub!(EXT, '')
-    end
-
-    @number.gsub!(/\D/, '')
-    @number.sub!(/^0+/, '')
-  end
-
-  def parse_country_code
-    if @number.size == 10
-      @number = "1#{@number}"
-    end
-
-    0.upto(2) do |len|
-      break if @country_code
-      if COUNTRY_CODES.include?(country_code = @number[0..len])
-        @country_code ||= country_code
-        @number.sub!(/^#{country_code}/, '')
-      end
-    end
-
-    if @country_code.nil?
-      errors << :country_code
-    end
-
-    if @country_code == '1'
-      errors << :too_short if @number.size < MIN_US_LENGTH
-    else
-      errors << :too_short if @number.size <= MINLEN
-    end
-  end
-end
+require 'big_phoney/phone_number'

data/spec/big_phoney_spec.rb

@@ -1,105 +1,109 @@
 require 'spec/spec_helper'
 
-describe PhoneNumber do
+describe BigPhoney::PhoneNumber do
   describe "validity" do
     it "is valid with a valid number" do
-      number = PhoneNumber.new('(484) 123-1234')
+      number = BigPhoney::PhoneNumber.new('(484) 123-1234')
       number.should be_valid
     end
 
     it "is invalid with wrong country code" do
-      number = PhoneNumber.new('+29 (484) 123-1234')
+      number = BigPhoney::PhoneNumber.new('+29 (484) 123-1234')
       number.should_not be_valid
       number.errors.should include(:country_code)
     end
 
     it "is invalid with extension that is too long" do
-      number = PhoneNumber.new('(484) 123-1234 x2343423432')
+      number = BigPhoney::PhoneNumber.new('(484) 123-1234 x2343423432')
       number.should_not be_valid
       number.errors.should include(:extension)
     end
 
     it "is invalid when too short" do
-      number = PhoneNumber.new('535341345')
+      number = BigPhoney::PhoneNumber.new('535341345')
       number.should_not be_valid
       number.errors.should include(:too_short)
     end
   end
 
+  it "handles nil values" do
+    BigPhoney::PhoneNumber.new(nil).number.should == ""
+  end
+
   describe "stripping other characters" do
     it "strips parens" do
-      PhoneNumber.new('(484) 123-1234').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('(484) 123-1234').number.should == '4841231234'
     end
 
     it "allows spaces" do
-      PhoneNumber.new('484 123 1234').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('484 123 1234').number.should == '4841231234'
     end
 
     it "allows dashes" do
-      PhoneNumber.new('484-123-1234').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('484-123-1234').number.should == '4841231234'
     end
 
     it "allows dots" do
-      PhoneNumber.new('484.123.1234').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('484.123.1234').number.should == '4841231234'
     end
 
     it "allows plus signs" do
-      PhoneNumber.new('+1 (484) 123-1234').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('+1 (484) 123-1234').number.should == '4841231234'
     end
   end
 
   describe "parsing extension" do
     it "returns nil when there is none" do
-      PhoneNumber.new('4841231234').ext.should be_nil
+      BigPhoney::PhoneNumber.new('4841231234').ext.should be_nil
     end
 
     it "when 'ext' (no spaces) is used" do
-      PhoneNumber.new('4841231234ext123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234ext123').ext.should == '123'
     end
 
     it "when ' ext ' (with spaces) is used" do
-      PhoneNumber.new('4841231234 ext 123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234 ext 123').ext.should == '123'
     end
 
     it "when ' ext. ' (with period) is used" do
-      PhoneNumber.new('4841231234 ext. 123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234 ext. 123').ext.should == '123'
     end
 
     it "when 'ex' (no spaces) is used" do
-      PhoneNumber.new('4841231234ex123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234ex123').ext.should == '123'
     end
 
     it "when ' ex ' (with spaces) is used" do
-      PhoneNumber.new('4841231234 ex 123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234 ex 123').ext.should == '123'
     end
 
     it "when 'x' (no spaces) is used" do
-      PhoneNumber.new('4841231234x123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234x123').ext.should == '123'
     end
 
     it "when ' x ' (with spaces) is used" do
-      PhoneNumber.new('4841231234 x 123').ext.should == '123'
+      BigPhoney::PhoneNumber.new('4841231234 x 123').ext.should == '123'
     end
 
     it "gets removed from number" do
-      PhoneNumber.new('4841231234 x 123').number.should == '4841231234'
+      BigPhoney::PhoneNumber.new('4841231234 x 123').number.should == '4841231234'
     end
   end
 
   describe "country code" do
     context "when in US-only mode" do
       before(:each) do
-        PhoneNumber.assume_us = true
+        BigPhoney::PhoneNumber.assume_us = true
       end
 
       it "assumes 1" do
-        phone = PhoneNumber.new('4841231234')
+        phone = BigPhoney::PhoneNumber.new('4841231234')
         phone.country_code.should == '1'
         phone.number.should == '4841231234'
       end
 
       it "also parses country code as 1" do
-        phone = PhoneNumber.new('14841231234')
+        phone = BigPhoney::PhoneNumber.new('14841231234')
         phone.country_code.should == '1'
         phone.number.should == '4841231234'
       end
@@ -107,29 +111,29 @@ describe PhoneNumber do
 
     context "when not in US-only mode" do
       before(:each) do
-        PhoneNumber.assume_us = false
+        BigPhoney::PhoneNumber.assume_us = false
       end
 
       it "parses 1 digit country code" do
-        phone = PhoneNumber.new('74841231234')
+        phone = BigPhoney::PhoneNumber.new('74841231234')
         phone.country_code.should == '7'
         phone.number.should == '4841231234'
       end
 
       it "parses 2 digit country code" do
-        phone = PhoneNumber.new('204841231234')
+        phone = BigPhoney::PhoneNumber.new('204841231234')
         phone.country_code.should == '20'
         phone.number.should == '4841231234'
       end
 
       it "parses 3 digit country code" do
-        phone = PhoneNumber.new('9964841231234')
+        phone = BigPhoney::PhoneNumber.new('9964841231234')
         phone.country_code.should == '996'
         phone.number.should == '4841231234'
       end
 
       it "parses international type numbers" do
-        phone = PhoneNumber.new('54-11-4444-3333')
+        phone = BigPhoney::PhoneNumber.new('54-11-4444-3333')
         phone.country_code.should == '54'
         phone.number.should == '1144443333'
       end
@@ -138,22 +142,22 @@ describe PhoneNumber do
 
   describe "area_code" do
     it "takes the first 3 digits of number" do
-      phone = PhoneNumber.new('4841231234')
+      phone = BigPhoney::PhoneNumber.new('4841231234')
       phone.area_code.should == '484'
     end
   end
 
   describe "formatting" do
     it "formats with parens by default" do
-      PhoneNumber.new('4841231234').to_s.should == '(484) 123-1234'
+      BigPhoney::PhoneNumber.new('4841231234').to_s.should == '(484) 123-1234'
     end
 
     it "includes country code when not 1" do
-      PhoneNumber.new('544841231234').to_s.should == '+54 (484) 123-1234'
+      BigPhoney::PhoneNumber.new('544841231234').to_s.should == '+54 (484) 123-1234'
     end
 
     it "includes extension" do
-      PhoneNumber.new('4841231234x123').to_s.should == '(484) 123-1234 ext. 123'
+      BigPhoney::PhoneNumber.new('4841231234x123').to_s.should == '(484) 123-1234 ext. 123'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require 'rubygems'
-require 'spec'
-require 'rr'
+
+begin
+  require 'spec'
+rescue LoadError
+  require 'rspec'
+end
 
 require File.dirname(__FILE__) + '/../lib/big_phoney'
 
-Spec::Runner.configure { |c| c.mock_with(:rr) }

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: big-phoney
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pat Nakajima
+- Brandon Keene
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +35,6 @@ files:
 - lib/big-phoney.rb
 - lib/big_phoney.rb
 - lib/big_phoney/.gitignore
-- lib/big_phoney/country_codes.rb
 - spec/big_phoney_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/big_phoney/country_codes.rb

@@ -1,29 +0,0 @@
-class PhoneNumber
-  COUNTRY_CODES  = %w[
-    1  7  20  27  30  31  32  33  34
-    36  39  40  41  43  44  45  46  47
-    48  49  51  52  53  54  55  56  57
-    58  60  61  62  63  64  65  66  81
-    82  84  86  90  91  92  93  94  95
-    98  212  213  216  218  220  221  222  223
-    224  225  226  227  228  229  230  231  232
-    233  234  235  236  237  238  239  240  241
-    242  243  244  245  246  247  248  249  250
-    251  252  253  254  255  256  257  258  260
-    261  262  263  264  265  266  267  268  269
-    290  291  297  298  299  350  351  352  353
-    354  355  356  357  358  359  370  371  372
-    373  374  375  376  377  378  380  381  385
-    386  387  388  389  420  421  423  500  501
-    502  503  504  505  506  507  508  509  590
-    591  592  593  594  595  596  597  598  599
-    670  672  673  674  675  676  677  678  679
-    680  681  682  683  684  685  686  687  688
-    689  690  691  692  800  808  850  852  853
-    655  856  870  871  872  873  874  878  880
-    881  882  886  960  961  962  963  964  965
-    966  967  968  970  971  972  973  974  975
-    976  977  979  991  992  993  994  995  996
-    998
-  ]
-end