phoney 0.1.1 → 0.1.2

data/Gemfile

@@ -1,2 +1,6 @@
 source "http://rubygems.org"
+
 gemspec
+
+# To use debugger
+# gem 'debugger'

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    phoney (0.1.1)
+    phoney (0.1.2)
       phoney
 
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
+    diff-lcs (1.1.3)
     rake (0.9.2.2)
-    rspec (1.3.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
   phoney!
   rake
-  rspec (= 1.3.0)
+  rspec (= 2.11.0)

data/Rakefile

@@ -1,31 +1,12 @@
-require 'rubygems'
-require 'spec/rake/spectask'
-
-require File.join(File.dirname(__FILE__), 'lib', 'phoney')
-
+#!/usr/bin/env rake
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "phoney"
-    gem.summary = %Q{Ruby library that formats phone numbers.}
-    gem.description = %Q{Ruby library that parses a phone number and automatically formats it correctly, depending on the country/locale you set.}
-    gem.email = "jan@habermann24.com"
-    gem.homepage = "http://github.com/habermann24/phoney"
-    gem.authors = ["Jan Habermann"]
-    gem.version = PhoneNumber.version
-  end
-  Jeweler::GemcutterTasks.new
+  require 'bundler/setup'
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
- 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
- 
-require 'rake/rdoctask'
+
+require 'rdoc/task'
+
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.template = ENV['template'] if ENV['template']
@@ -35,3 +16,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb"
+end
+
+Bundler::GemHelper.install_tasks

data/lib/data/regions.yml

@@ -4343,6 +4343,15 @@
   :national_prefix: "0"
   :dialout_prefixes: [ "00" ]
   :rule_sets:
+  - :digits: 6
+    :rules:
+      - :type: 0
+        :min: 169772
+        :max: 169773
+        :total_digits: 9
+        :areacode_length: 5
+        :areacode_offset: 0
+        :format: :"XXXXX XXXX"
   - :digits: 5
     :rules:
       - :type: 0
@@ -4362,10 +4371,10 @@
       - :type: 0
         :min: 13873
         :max: 13873
-        :total_digits: 9
+        :total_digits: 10
         :areacode_length: 5
         :areacode_offset: 0
-        :format: :"XXXXX XXXXXXX XXXX XXXX"
+        :format: :"XXXXX XXXXX"
       - :type: 0
         :min: 15242
         :max: 15242
@@ -4408,22 +4417,64 @@
         :areacode_length: 5
         :areacode_offset: 0
         :format: :"XXXXX XXXXX"
+      - :type: 0
+        :min: 19467
+        :max: 19467
+        :total_digits: 10
+        :areacode_length: 5
+        :areacode_offset: 0
+        :format: :"XXXXX XXXXX"
   - :digits: 3
     :rules:
       - :type: 0
         :min: 500
         :max: 500
+        :total_digits: 9
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXXXXX"
+      - :type: 0
+        :min: 800
+        :max: 800
+        :total_digits: 9
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXXXXX"
+      - :type: 0
+        :min: 300
+        :max: 309
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 300
-        :max: 300
+        :min: 330
+        :max: 339
+        :total_digits: 10
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 342
+        :max: 345
+        :total_digits: 10
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 370
+        :max: 373
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 116
+        :max: 116
+        :total_digits: 6
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX"
       - :type: 0
         :min: 118
         :max: 118
@@ -4432,8 +4483,8 @@
         :areacode_offset: 0
         :format: :"XXX XXX"
       - :type: 0
-        :min: 111
-        :max: 119
+        :min: 113
+        :max: 118
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
@@ -4474,51 +4525,60 @@
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 171
-        :max: 171
+        :min: 191
+        :max: 191
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
+  - :digits: 2
+    :rules:
       - :type: 0
-        :min: 181
-        :max: 181
+        :min: 55
+        :max: 56
         :total_digits: 10
-        :areacode_length: 3
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXX XXXX"
+        :format: :"XX XXXX XXXX"
       - :type: 0
-        :min: 191
-        :max: 191
+        :min: 70
+        :max: 70
         :total_digits: 10
-        :areacode_length: 3
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXX XXXX"
+        :format: :"XX XXXX XXXX"
+      - :type: 0
+        :min: 71
+        :max: 79
+        :total_digits: 10
+        :areacode_length: 4
+        :areacode_offset: 0
+        :format: :"XXXX XXXXXX"
   - :digits: 1
     :rules:
       - :type: 0
-        :min: 8
-        :max: 9
-        :total_digits: 9
-        :areacode_length: 3
+        :min: 2
+        :max: 2
+        :total_digits: 10
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXXXXX"
+        :format: :"XX XXXX XXXX"
       - :type: 0
-        :min: 8
-        :max: 9
+        :min: 3
+        :max: 3
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 7
-        :max: 7
+        :min: 8
+        :max: 9
         :total_digits: 10
-        :areacode_length: 4
+        :areacode_length: 3
         :areacode_offset: 0
-        :format: :"XXXX XXXXXX"
+        :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 2
+        :min: 3
         :max: 6
         :total_digits: 10
         :areacode_length: 2
@@ -4531,6 +4591,13 @@
         :areacode_length: 4
         :areacode_offset: 0
         :format: :"XXXX XXXXXX"
+      - :type: 0
+        :min: 1
+        :max: 1
+        :total_digits: 9
+        :areacode_length: 4
+        :areacode_offset: 0
+        :format: :"XXXX XXXXX"
 
 :uk:
   :country_code: :44
@@ -4538,6 +4605,15 @@
   :national_prefix: "0"
   :dialout_prefixes: [ "00" ]
   :rule_sets:
+  - :digits: 6
+    :rules:
+      - :type: 0
+        :min: 169772
+        :max: 169773
+        :total_digits: 9
+        :areacode_length: 5
+        :areacode_offset: 0
+        :format: :"XXXXX XXXX"
   - :digits: 5
     :rules:
       - :type: 0
@@ -4557,10 +4633,10 @@
       - :type: 0
         :min: 13873
         :max: 13873
-        :total_digits: 9
+        :total_digits: 10
         :areacode_length: 5
         :areacode_offset: 0
-        :format: :"XXXXX XXXXXXX XXXX XXXX"
+        :format: :"XXXXX XXXXX"
       - :type: 0
         :min: 15242
         :max: 15242
@@ -4603,22 +4679,64 @@
         :areacode_length: 5
         :areacode_offset: 0
         :format: :"XXXXX XXXXX"
+      - :type: 0
+        :min: 19467
+        :max: 19467
+        :total_digits: 10
+        :areacode_length: 5
+        :areacode_offset: 0
+        :format: :"XXXXX XXXXX"
   - :digits: 3
     :rules:
       - :type: 0
         :min: 500
         :max: 500
+        :total_digits: 9
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXXXXX"
+      - :type: 0
+        :min: 800
+        :max: 800
+        :total_digits: 9
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXXXXX"
+      - :type: 0
+        :min: 300
+        :max: 309
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 300
-        :max: 300
+        :min: 330
+        :max: 339
+        :total_digits: 10
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 342
+        :max: 345
+        :total_digits: 10
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 370
+        :max: 373
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
+      - :type: 0
+        :min: 116
+        :max: 116
+        :total_digits: 6
+        :areacode_length: 3
+        :areacode_offset: 0
+        :format: :"XXX XXX"
       - :type: 0
         :min: 118
         :max: 118
@@ -4627,8 +4745,8 @@
         :areacode_offset: 0
         :format: :"XXX XXX"
       - :type: 0
-        :min: 111
-        :max: 119
+        :min: 113
+        :max: 118
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
@@ -4669,51 +4787,60 @@
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 171
-        :max: 171
+        :min: 191
+        :max: 191
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
+  - :digits: 2
+    :rules:
       - :type: 0
-        :min: 181
-        :max: 181
+        :min: 55
+        :max: 56
         :total_digits: 10
-        :areacode_length: 3
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXX XXXX"
+        :format: :"XX XXXX XXXX"
       - :type: 0
-        :min: 191
-        :max: 191
+        :min: 70
+        :max: 70
         :total_digits: 10
-        :areacode_length: 3
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXX XXXX"
+        :format: :"XX XXXX XXXX"
+      - :type: 0
+        :min: 71
+        :max: 79
+        :total_digits: 10
+        :areacode_length: 4
+        :areacode_offset: 0
+        :format: :"XXXX XXXXXX"
   - :digits: 1
     :rules:
       - :type: 0
-        :min: 8
-        :max: 9
-        :total_digits: 9
-        :areacode_length: 3
+        :min: 2
+        :max: 2
+        :total_digits: 10
+        :areacode_length: 2
         :areacode_offset: 0
-        :format: :"XXX XXXXXX"
+        :format: :"XX XXXX XXXX"
       - :type: 0
-        :min: 8
-        :max: 9
+        :min: 3
+        :max: 3
         :total_digits: 10
         :areacode_length: 3
         :areacode_offset: 0
         :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 7
-        :max: 7
+        :min: 8
+        :max: 9
         :total_digits: 10
-        :areacode_length: 4
+        :areacode_length: 3
         :areacode_offset: 0
-        :format: :"XXXX XXXXXX"
+        :format: :"XXX XXX XXXX"
       - :type: 0
-        :min: 2
+        :min: 3
         :max: 6
         :total_digits: 10
         :areacode_length: 2
@@ -4726,6 +4853,13 @@
         :areacode_length: 4
         :areacode_offset: 0
         :format: :"XXXX XXXXXX"
+      - :type: 0
+        :min: 1
+        :max: 1
+        :total_digits: 9
+        :areacode_length: 4
+        :areacode_offset: 0
+        :format: :"XXXX XXXXX"
 
 :gr:
   :country_code: :30
@@ -14174,50 +14308,50 @@
         :min: 812
         :max: 812
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 818
         :max: 818
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 831
         :max: 831
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 843
         :max: 843
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 846
         :max: 846
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 861
         :max: 861
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
       - :type: 1
         :min: 863
         :max: 863
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
   - :digits: 1
     :rules:
@@ -14253,15 +14387,15 @@
         :min: 0
         :max: 9
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"(XXX) XXX-XX-XX"
       - :type: 1
         :min: 0
         :max: 9
         :total_digits: 10
-        :areacode_length: 0
-        :areacode_offset: 131
+        :areacode_length: 3
+        :areacode_offset: 0
         :format: :"n (XXX) XXX-XX-XX"
 
 :se:

data/lib/phoney/version.rb

@@ -3,7 +3,7 @@ class PhoneNumber
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/phoney.gemspec

@@ -1,11 +1,13 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "phoney/version"
+
 Gem::Specification.new do |s|
   s.name = %q{phoney}
-  s.version = "0.1.1"
+  s.version = PhoneNumber::VERSION::STRING
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Habermann"]
@@ -38,28 +40,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/habermann24/phoney}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Ruby library that formats phone numbers.}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<phoney>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-    else
-      s.add_dependency(%q<phoney>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<phoney>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
-  end
+  s.add_runtime_dependency(%q<phoney>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
+  s.add_development_dependency(%q<rspec>, ["= 2.11.0"])
 end
 

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
  
 require 'rubygems'
- 
-require 'spec'
 require 'phoney'

metadata

@@ -1,71 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: phoney
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Jan Habermann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-01 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: phoney
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-description: Ruby library that parses a phone number and automatically formats it correctly, depending on the country/locale you set.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+description: Ruby library that parses a phone number and automatically formats it
+  correctly, depending on the country/locale you set.
 email: jan@habermann24.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENCE
@@ -85,33 +86,31 @@ files:
 - spec/phone_number_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/habermann24/phoney
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3048847164725380956
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library that formats phone numbers.
 test_files: []
-