phonie 1.0.1 → 1.0.2

data/lib/phonie/railties/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      invalid_phone_number: Invalid phone number

data/lib/phonie/railties/locales/es.yml

@@ -0,0 +1,4 @@
+es:
+  errors:
+    messages:
+      invalid_phone_number: Teléfono inválido

data/lib/phonie/railties/validator.rb

@@ -0,0 +1,15 @@
+I18n.load_path += Dir.glob( File.expand_path('../locales/*.{rb,yml}', __FILE__) )
+
+class PhoneValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    return if value.blank?
+    phone = Phonie::Phone.parse(value)
+
+    if phone.nil?
+      object.errors.add(attribute, :invalid_phone_number)
+    else
+      formated = phone.format( phone.extension ? :default_with_extension : :default)
+      object.send("#{attribute}=", formated) if object.respond_to?("#{attribute}=")
+    end
+  end
+end

data/lib/phonie/version.rb

@@ -1,3 +1,3 @@
 module Phonie
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/phonie.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Phonie::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors  = ['Tomislav Car', 'Todd Eichel', 'Don Morrison', 'Wesley Moxam']
-  s.email    = ['tomislav@infinum.hr', 'todd@toddeichel.com', 'elskwid@gmail.com', 'wesley@wmoxam.com'] 
+  s.email    = ['tomislav@infinum.hr', 'todd@toddeichel.com', 'elskwid@gmail.com', 'wesley@wmoxam.com']
   s.homepage    = "http://github.com/wmoxam/phonie"
   s.summary     = %q{Phone number parsing, validation and formatting}
   s.description = %q{Phone number parsing, validation and formatting}
@@ -15,4 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'activemodel'
 end

data/tasks/tests.rake

@@ -0,0 +1,9 @@
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Run unit tests.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end

data/test/countries/am_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Armenia
+class AMTest < Phonie::TestCase
+  def test_local
+    parse_test('+37422212345',  '374', '222',  '12345', 'Armenia', false)
+  end
+  
+  def test_mobile
+    parse_test('+37451234567', '374', '5', '1234567', 'Armenia', true)
+  end
+end 

data/test/countries/az_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Azerbaijan
+class AZTest < Phonie::TestCase
+  def test_local
+    parse_test('+994221234567',  '994', '22',  '1234567', 'Azerbaijan', false)
+  end
+  
+  def test_mobile
+    parse_test('+994401234567', '994', '40', '1234567', 'Azerbaijan', true)
+  end
+end 

data/test/countries/bs_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Bahamas
+class BSTest < Phonie::TestCase
+
+  def test_local
+    parse_test('+12424611234', '1', '242', '4611234', 'Bahamas')
+  end
+
+  def test_mobile
+    parse_test('+12424621234', '1', '242', '4621234', 'Bahamas')
+  end
+end

data/test/countries/cl_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Chile
+class CLTest < Phonie::TestCase
+
+  def test_local
+    parse_test('+56 2 12345678', '56', '2', '12345678', 'Chile', false)
+  end
+
+  def test_mobile
+    parse_test('+56 9 12345678', '56', '9', '12345678', 'Chile', true)
+  end
+
+  def test_other_cities
+     parse_test('+56 32 1234567', '56', '32', '1234567', 'Chile', false)
+   end
+
+  def test_voip
+    parse_test('+56 44 1234567', '56', '44', '1234567', 'Chile', false)
+  end
+
+end

data/test/countries/it_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Italy
+class ITTest < Phonie::TestCase
+  def test_local
+    parse_test('+39 035 1234567',  '39', '035',  '1234567', 'Italy', false)
+  end
+  
+  def test_mobile
+    parse_test('+39 383 1234567', '39', '383', '1234567', 'Italy', true)
+  end
+end

data/test/countries/lt_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Lithuania
+class LTTest < Phonie::TestCase
+  def test_local
+    parse_test('+37042512345',  '370', '425',  '12345', 'Lithuania', false)
+  end
+  
+  def test_mobile
+    parse_test('+37062512345', '370', '625', '12345', 'Lithuania', true)
+  end
+end

data/test/countries/lu_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Luxembourg 
+class LUTest < Phonie::TestCase
+  def test_local
+    parse_test('+352 2422 1234', '352', '2422', '1234', "Luxembourg", false)
+  end
+  
+  def test_mobile
+   parse_test('+352 671 123456', '352', '671', '123456', "Luxembourg", true) 
+  end
+end

data/test/countries/lv_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Latvia
+class LVTest < Phonie::TestCase
+  def test_local
+    parse_test('+37164123456',  '371', '64',  '123456', 'Latvia', false)
+  end
+  
+  def test_mobile
+    parse_test('+37129123456', '371', '29', '123456', 'Latvia', true)
+  end
+end

data/test/countries/ru_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## Russia
+class RUTest < Phonie::TestCase
+  def test_local
+    parse_test('+74845612345',  '7', '48456',  '12345', 'Russian Federation', false)
+  end
+  
+  def test_mobile
+    parse_test('+79123456789', '7', '9', '123456789', 'Russian Federation', true)
+  end
+end

data/test/railties/validator_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+require 'active_model'
+require 'phonie/railties/validator'
+class SomeModel < Struct.new(:phone)
+  include ActiveModel::Validations
+  validates :phone, phone: true
+end
+
+
+class PhoneValidatorTest < Phonie::TestCase
+  def test_blank_phone
+    assert SomeModel.new(nil).valid?
+    assert SomeModel.new('').valid?
+  end
+
+  def test_valid_model
+    model = SomeModel.new('+1 251 123 4567')
+    assert model.valid?
+
+    assert model.phone == '+12511234567'
+  end
+
+  def test_valid_number_with_extension
+    model = SomeModel.new('+1 251 123 4567 ex 1234')
+    assert model.valid?
+
+    assert model.phone == '+12511234567x1234'
+  end
+
+  def test_invalid_model
+    model = SomeModel.new('+1 251 123 456')
+    assert model.invalid?
+
+    assert !model.errors[:phone].empty?
+  end
+end

data/test/test_helper.rb

@@ -6,9 +6,7 @@ require 'test/unit'
 require 'phonie'
 
 def parse_test(raw, country_code, area_code, number, country_name = nil, is_mobile = nil)
-  pn = Phonie::Phone.parse(raw)
-
-  assert_not_nil pn, %Q{parse should pass}
+  pn = Phonie::Phone.parse!(raw)
   assert_equal pn.country_code, country_code
   assert_equal pn.area_code, area_code
   assert_equal pn.number, number

data/tools/generate

@@ -0,0 +1,112 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+require 'tempfile'
+require 'fileutils'
+
+@data_file = File.join(File.dirname(__FILE__), '..', 'lib', 'phonie', 'data', 'phone_countries.yml')
+@readme_file = File.join(File.dirname(__FILE__), '..', 'Readme.rdoc')
+
+def usage
+  puts "USAGE: tools/generate COUNTRY_NAME"
+  puts "Generates test case, adds missing fields to country data, and updates README.rdoc to include country" 
+  exit(0)
+end
+
+def already_exists?
+  if File.exists?(@test_filename)
+    puts "It appears that #{@country} is already supported. See #{@test_filename}"
+    true
+  else
+    false
+  end
+end
+
+def get_country_code
+  YAML.load(File.read(@data_file)).each_pair do |key, c|
+    return c[:char_3_code].downcase if c[:name].downcase == @country.downcase
+  end
+  nil
+end
+
+def get_country_call_code
+  YAML.load(File.read(@data_file)).each_pair do |key, c|
+    return key if c[:name].downcase == @country.downcase
+  end
+  nil
+end
+
+def create_test_file
+  country_call_code = get_country_call_code
+
+  File.open(@test_filename, 'w') do |test_file|
+  test_file.print <<-eof
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+## #{@country}
+class #{@country_code.upcase}Test < Phonie::TestCase
+  def test_local
+    parse_test('+#{country_call_code}',  '#{country_call_code}', '',  '', '#{@country}', false)
+  end
+  
+  def test_mobile
+    parse_test('+#{country_call_code}', '#{country_call_code}', '', '', '#{@country}', true)
+  end
+end 
+    eof
+  end
+end
+
+def add_missing_fields
+  hash = YAML.load(File.read(@data_file))
+  hash[get_country_call_code].merge!({:area_code => ' ', 
+    :local_number_format => ' ',
+    :mobile_format => ' ',
+    :number_format => ' '})
+  File.open(@data_file, 'w') do |f|
+    f.puts hash.to_yaml
+  end
+end
+
+def update_readme
+  readme = File.open(@readme_file, 'r')
+  new_readme = Tempfile.new('readme')
+
+  inserted_new_country = false
+
+  readme.each_line do |line|
+    match_data = line.match(/\[(\w+)\] (.+)$/)
+    if match_data.nil?
+      new_readme.puts(line)
+    else
+      code = match_data[1]
+      country = match_data[2]
+
+      if !inserted_new_country && code.downcase > @country_code
+        new_readme.puts "[#{@country_code.upcase}] #{@country}"
+        inserted_new_country = true
+      end
+      
+      new_readme.puts "[#{code}] #{country}"
+    end
+  end 
+
+  FileUtils.mv(new_readme.path, readme.path)
+end
+
+def generate
+  return if already_exists?
+
+  create_test_file
+  add_missing_fields
+  update_readme
+end
+
+usage if ARGV.length < 1
+
+@country = ARGV[0]
+@country_code = get_country_code
+
+@test_filename = File.join(File.dirname(__FILE__), '..', 'test', 'countries', "#{@country_code}_test.rb")
+
+generate

data/tools/russian_area_codes.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'nokogiri'
+require 'open-uri'
+
+url = 'http://old.rt.ru/en/help-info/mg/index.php?SELECTED_CHAR='
+
+codes = %w{A B C D E F G H I J K L M N O P R S T U V Y Z}.collect do |c|
+  data = Nokogiri::HTML(open(url + c))
+  data.css("table.fmain_table tbody tr td:nth-child(3)").collect {|e| e.text.split(/,/).collect {|str| str.strip } }
+end.flatten.uniq.compact.reject {|str| str =~ /\D/ }
+
+puts codes.join("|")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,8 +12,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Phone number parsing, validation and formatting
 email:
 - tomislav@infinum.hr
@@ -26,7 +74,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Rakefile
 - Readme.rdoc
@@ -34,25 +81,33 @@ files:
 - lib/phonie/country.rb
 - lib/phonie/data/phone_countries.yml
 - lib/phonie/phone.rb
+- lib/phonie/railties/locales/en.yml
+- lib/phonie/railties/locales/es.yml
+- lib/phonie/railties/validator.rb
 - lib/phonie/support.rb
 - lib/phonie/version.rb
 - phonie.gemspec
+- tasks/tests.rake
 - test/countries/ae_test.rb
 - test/countries/af_test.rb
 - test/countries/al_test.rb
+- test/countries/am_test.rb
 - test/countries/ar_test.rb
 - test/countries/at_test.rb
 - test/countries/au_test.rb
+- test/countries/az_test.rb
 - test/countries/ba_test.rb
 - test/countries/bd_test.rb
 - test/countries/be_test.rb
 - test/countries/bg_test.rb
 - test/countries/bo_test.rb
 - test/countries/br_test.rb
+- test/countries/bs_test.rb
 - test/countries/bt_test.rb
 - test/countries/by_test.rb
 - test/countries/bz_test.rb
 - test/countries/ca_test.rb
+- test/countries/cl_test.rb
 - test/countries/cr_test.rb
 - test/countries/cy_test.rb
 - test/countries/cz_test.rb
@@ -77,8 +132,12 @@ files:
 - test/countries/il_test.rb
 - test/countries/in_test.rb
 - test/countries/ir_test.rb
+- test/countries/it_test.rb
 - test/countries/ke_test.rb
 - test/countries/lk_test.rb
+- test/countries/lt_test.rb
+- test/countries/lu_test.rb
+- test/countries/lv_test.rb
 - test/countries/ng_test.rb
 - test/countries/nl_test.rb
 - test/countries/no_test.rb
@@ -88,6 +147,7 @@ files:
 - test/countries/pt_test.rb
 - test/countries/qa_test.rb
 - test/countries/rs_test.rb
+- test/countries/ru_test.rb
 - test/countries/sa_test.rb
 - test/countries/se_test.rb
 - test/countries/si_test.rb
@@ -101,8 +161,11 @@ files:
 - test/country_test.rb
 - test/extension_test.rb
 - test/phone_test.rb
+- test/railties/validator_test.rb
 - test/test_helper.rb
 - test_usa_phones_with_extensions.csv
+- tools/generate
+- tools/russian_area_codes.rb
 homepage: http://github.com/wmoxam/phonie
 licenses: []
 post_install_message: