phony_rails 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.1.0)
+    phony_rails (0.1.2)
       activerecord (~> 3.0)
+      countries (~> 0.8.2)
       phony (~> 1.7.4)
 
 GEM
@@ -21,6 +22,10 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.0)
+    countries (0.8.2)
+      currencies (= 0.4.0)
+      currencies (>= 0.2.0)
+    currencies (0.4.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     multi_json (1.3.6)

data/README.md

@@ -34,7 +34,7 @@ PhonyRails will also check your model for a country_code method to use when norm
 
 Use the Phony.plausible method to validate an attribute:
 
-    validate :phone_number, :phony_plausible => true
+    validates :phone_number, :phony_plausible => true
 
 In your views use:
 
@@ -42,6 +42,10 @@ In your views use:
 
 ## Changelog
 
+0.1.2
+* Using countries gem as suggested by brutuscat.
+* Fixes bugs mentioned by ddidier.
+
 0.1.0
 * Added specs.
 

data/lib/phony_rails.rb

@@ -1,26 +1,14 @@
 require 'phony'
-require "phony_rails/string_extensions"
-require "phony_rails/version"
+require 'countries'
+require 'phony_rails/string_extensions'
+require 'validators/phony_validator'
+require 'phony_rails/version'
 
 module PhonyRails
 
-  # Quick fix to get country_phone_number (phone number) for all relevant countries.
-  # TODO: Replace with some gem or something.
-  COUNTRY_NUMBER = {
-    'NL' => '31',
-    'BE' => '32',
-    'DE' => '49',
-    'GB' => '44',
-    'FR' => '33',
-    'ES' => '34',
-    'IT' => '39',
-    'US' => '1',
-    'AU' => '61',
-    'LU' => '352',
-    'AT' => '43',
-    'CH' => '41',
-    'PL' => '48'
-  }
+  def self.country_number_for(country_code)
+    ISO3166::Country::Data[country_code].try(:[], 'country_code')
+  end
 
   # This method requires a country_code attribute (eg. NL) and phone_number to be set.
   # Options:
@@ -33,14 +21,14 @@ module PhonyRails
     number = number.clone # Just to be sure, we don't want to change the original.
     number.gsub!(/[^\d\+]/, '') # Strips weird stuff from the number
     return if number.blank?
-    if country_number = COUNTRY_NUMBER[options[:country_code] || options[:default_country_code]]
+    if country_number = country_number_for(options[:country_code] || options[:default_country_code])
       # Add country_number if missing
       number = "#{country_number}#{number}" if not number =~ /^(00|\+)?#{country_number}/
     end
     number = Phony.normalize(number)
     return number.to_s
-  rescue
-    number # If all goes wrong .. we still return the original input.
+  # rescue
+  #   number # If all goes wrong .. we still return the original input.
   end
 
   # This module is added to AR.

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/phony_rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["joost@joopp.com"]
   gem.description   = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
   gem.summary       = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/joost/phony_rails"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = PhonyRails::VERSION
 
   gem.add_dependency "phony", "~> 1.7.4"
+  gem.add_dependency "countries", "~> 0.8.2"
   gem.add_dependency "activerecord", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.4
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +79,7 @@ files:
 - phony_rails.gemspec
 - spec/lib/phony_rails_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/joost/phony_rails
 licenses: []
 post_install_message: 
 rdoc_options: []