phony_rails 0.12.9 → 0.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 195043058b5e1e586ad0baf7b4eb4c6427daaa5d
-  data.tar.gz: 3ef58e04cd57ecbb86041abfd1404d35eadda443
+  metadata.gz: 894a8528687a58ddd856bcf0225701de847e88db
+  data.tar.gz: c87a623b7bf8c990bfd6d1dd89d1e8a4df3349a5
 SHA512:
-  metadata.gz: e28e02f263a44d1d1e88226c2fa85864282d7c43e32a9c52bec51fe802b11a51ced0806fe9a3fd1efcc89acd4f0bcb04b7a2c33c4c47c6cc8c58fe78f6f654e3
-  data.tar.gz: 8829691aa23f7247ff3a5393332a6f98eaab30a7e3f87ed7e45d4387d647b8dd059ad0d9360ebb301516799aa172e1808c92090e8ae4b3d45b2d7dd31169015b
+  metadata.gz: 128e21023c5b47ccb822d8153f0b188b8196e0fb9ec6f3e989207e64be8f2ddcf43206f9c3347a8f6b307827fad4cfd15995f4ba4b89b08575e2eb29fe055297
+  data.tar.gz: 44f28ddfb2efacae5d67e61f6a08bc9bd14a5d491b493472b801f4fdda875b887b19bb7e3f5bc9d7feb57d974fb197858e22fc0dba6339b04fa0cd14cde8d7b1

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## [Unreleased](https://github.com/joost/phony_rails/tree/HEAD)
+
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.9...HEAD)
+
+**Closed issues:**
+
+- Can i skip a validation with another number? [\#110](https://github.com/joost/phony_rails/issues/110)
+
+- Consider dropping the dependency on the countries gem and using a YAML file instead [\#108](https://github.com/joost/phony_rails/issues/108)
+
+- undefined method `\[\]' for Data:Class [\#106](https://github.com/joost/phony_rails/issues/106)
+
+**Merged pull requests:**
+
+- Don't re-parse country codes YAML file every time it's needed. [\#111](https://github.com/joost/phony_rails/pull/111) ([jcoleman](https://github.com/jcoleman))
+
+- Replace countries dependency with YAML file [\#109](https://github.com/joost/phony_rails/pull/109) ([monfresh](https://github.com/monfresh))
+
 ## [v0.12.9](https://github.com/joost/phony_rails/tree/v0.12.9) (2015-07-13)
 
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.8...v0.12.9)

data/Gemfile

@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-# Preempt the default loading so that we don't get an unqualified Country class imported.
-gem 'countries', :require => 'iso3166'
-
 gemspec # Specify your gem's dependencies in phony_number.gemspec
 
 # For testing

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.12.9)
+    phony_rails (0.12.10)
       activesupport (>= 3.0)
-      countries (~> 0.11, >= 0.11.5)
       phony (~> 2.12)
 
 GEM
@@ -22,28 +21,24 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.2)
-    bson (3.1.2)
+    arel (6.0.3)
+    bson (3.2.1)
     builder (3.2.2)
     coderay (1.1.0)
     connection_pool (2.2.0)
-    countries (0.11.5)
-      currencies (~> 0.4.2)
-      i18n_data (~> 0.7.0)
     coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    currencies (0.4.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     ffi (1.9.10)
     formatador (0.2.5)
-    guard (2.12.8)
+    guard (2.13.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
@@ -57,39 +52,38 @@ GEM
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.1)
+    guard-rspec (4.6.4)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    i18n_data (0.7.0)
     json (1.8.3)
-    listen (3.0.2)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (2.6.1)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.6)
+    moped (2.0.7)
       bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     nenv (0.2.0)
     netrc (0.10.3)
-    notiffany (0.0.6)
+    notiffany (0.0.7)
       nenv (~> 0.1)
       shellany (~> 0.0)
     optionable (0.2.0)
     origin (2.1.1)
-    phony (2.14.7)
+    phony (2.14.14)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -106,12 +100,12 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
@@ -127,7 +121,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.5.4)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -139,7 +133,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0)
-  countries
   coveralls
   guard
   guard-bundler

data/lib/data/country_codes.yaml

@@ -0,0 +1,501 @@
+---
+AD:
+  country_code: '376'
+AE:
+  country_code: '971'
+AF:
+  country_code: '93'
+AG:
+  country_code: '1'
+AI:
+  country_code: '1'
+AL:
+  country_code: '355'
+AM:
+  country_code: '374'
+AN:
+  country_code: '599'
+AO:
+  country_code: '244'
+AQ:
+  country_code: '672'
+AR:
+  country_code: '54'
+AS:
+  country_code: '1'
+AT:
+  country_code: '43'
+AU:
+  country_code: '61'
+AW:
+  country_code: '297'
+AX:
+  country_code: '358'
+AZ:
+  country_code: '994'
+BA:
+  country_code: '387'
+BB:
+  country_code: '1'
+BD:
+  country_code: '880'
+BE:
+  country_code: '32'
+BF:
+  country_code: '226'
+BG:
+  country_code: '359'
+BH:
+  country_code: '973'
+BI:
+  country_code: '257'
+BJ:
+  country_code: '229'
+BL:
+  country_code: '590'
+BM:
+  country_code: '1'
+BN:
+  country_code: '673'
+BO:
+  country_code: '591'
+BQ:
+  country_code: '599'
+BR:
+  country_code: '55'
+BS:
+  country_code: '1'
+BT:
+  country_code: '975'
+BV:
+  country_code: ''
+BW:
+  country_code: '267'
+BY:
+  country_code: '375'
+BZ:
+  country_code: '501'
+CA:
+  country_code: '1'
+CC:
+  country_code: '61'
+CD:
+  country_code: '243'
+CF:
+  country_code: '236'
+CG:
+  country_code: '242'
+CH:
+  country_code: '41'
+CI:
+  country_code: '225'
+CK:
+  country_code: '682'
+CL:
+  country_code: '56'
+CM:
+  country_code: '237'
+CN:
+  country_code: '86'
+CO:
+  country_code: '57'
+CR:
+  country_code: '506'
+CU:
+  country_code: '53'
+CV:
+  country_code: '238'
+CW:
+  country_code: '599'
+CX:
+  country_code: '61'
+CY:
+  country_code: '357'
+CZ:
+  country_code: '420'
+DE:
+  country_code: '49'
+DJ:
+  country_code: '253'
+DK:
+  country_code: '45'
+DM:
+  country_code: '1'
+DO:
+  country_code: '1'
+DZ:
+  country_code: '213'
+EC:
+  country_code: '593'
+EE:
+  country_code: '372'
+EG:
+  country_code: '20'
+EH:
+  country_code: '212'
+ER:
+  country_code: '291'
+ES:
+  country_code: '34'
+ET:
+  country_code: '251'
+FI:
+  country_code: '358'
+FJ:
+  country_code: '679'
+FK:
+  country_code: '500'
+FM:
+  country_code: '691'
+FO:
+  country_code: '298'
+FR:
+  country_code: '33'
+GA:
+  country_code: '241'
+GB:
+  country_code: '44'
+GD:
+  country_code: '1'
+GE:
+  country_code: '995'
+GF:
+  country_code: '594'
+GG:
+  country_code: '44'
+GH:
+  country_code: '233'
+GI:
+  country_code: '350'
+GL:
+  country_code: '299'
+GM:
+  country_code: '220'
+GN:
+  country_code: '224'
+GP:
+  country_code: '590'
+GQ:
+  country_code: '240'
+GR:
+  country_code: '30'
+GS:
+  country_code: '500'
+GT:
+  country_code: '502'
+GU:
+  country_code: '1'
+GW:
+  country_code: '245'
+GY:
+  country_code: '592'
+HK:
+  country_code: '852'
+HM:
+  country_code: ''
+HN:
+  country_code: '504'
+HR:
+  country_code: '385'
+HT:
+  country_code: '509'
+HU:
+  country_code: '36'
+ID:
+  country_code: '62'
+IE:
+  country_code: '353'
+IL:
+  country_code: '972'
+IM:
+  country_code: '44'
+IN:
+  country_code: '91'
+IO:
+  country_code: '246'
+IQ:
+  country_code: '964'
+IR:
+  country_code: '98'
+IS:
+  country_code: '354'
+IT:
+  country_code: '39'
+JE:
+  country_code: '44'
+JM:
+  country_code: '1'
+JO:
+  country_code: '962'
+JP:
+  country_code: '81'
+KE:
+  country_code: '254'
+KG:
+  country_code: '996'
+KH:
+  country_code: '855'
+KI:
+  country_code: '686'
+KM:
+  country_code: '269'
+KN:
+  country_code: '1'
+KP:
+  country_code: '850'
+KR:
+  country_code: '82'
+KW:
+  country_code: '965'
+KY:
+  country_code: '1'
+KZ:
+  country_code: '7'
+LA:
+  country_code: '856'
+LB:
+  country_code: '961'
+LC:
+  country_code: '1'
+LI:
+  country_code: '423'
+LK:
+  country_code: '94'
+LR:
+  country_code: '231'
+LS:
+  country_code: '266'
+LT:
+  country_code: '370'
+LU:
+  country_code: '352'
+LV:
+  country_code: '371'
+LY:
+  country_code: '218'
+MA:
+  country_code: '212'
+MC:
+  country_code: '377'
+MD:
+  country_code: '373'
+ME:
+  country_code: '382'
+MF:
+  country_code: '590'
+MG:
+  country_code: '261'
+MH:
+  country_code: '692'
+MK:
+  country_code: '389'
+ML:
+  country_code: '223'
+MM:
+  country_code: '95'
+MN:
+  country_code: '976'
+MO:
+  country_code: '853'
+MP:
+  country_code: '1'
+MQ:
+  country_code: '596'
+MR:
+  country_code: '222'
+MS:
+  country_code: '1'
+MT:
+  country_code: '356'
+MU:
+  country_code: '230'
+MV:
+  country_code: '960'
+MW:
+  country_code: '265'
+MX:
+  country_code: '52'
+MY:
+  country_code: '60'
+MZ:
+  country_code: '258'
+NA:
+  country_code: '264'
+NC:
+  country_code: '687'
+NE:
+  country_code: '227'
+NF:
+  country_code: '672'
+NG:
+  country_code: '234'
+NI:
+  country_code: '505'
+NL:
+  country_code: '31'
+'NO':
+  country_code: '47'
+NP:
+  country_code: '977'
+NR:
+  country_code: '674'
+NU:
+  country_code: '683'
+NZ:
+  country_code: '64'
+OM:
+  country_code: '968'
+PA:
+  country_code: '507'
+PE:
+  country_code: '51'
+PF:
+  country_code: '689'
+PG:
+  country_code: '675'
+PH:
+  country_code: '63'
+PK:
+  country_code: '92'
+PL:
+  country_code: '48'
+PM:
+  country_code: '508'
+PN:
+  country_code: ''
+PR:
+  country_code: '1'
+PS:
+  country_code: '970'
+PT:
+  country_code: '351'
+PW:
+  country_code: '680'
+PY:
+  country_code: '595'
+QA:
+  country_code: '974'
+RE:
+  country_code: '262'
+RO:
+  country_code: '40'
+RS:
+  country_code: '381'
+RU:
+  country_code: '7'
+RW:
+  country_code: '250'
+SA:
+  country_code: '966'
+SB:
+  country_code: '677'
+SC:
+  country_code: '248'
+SD:
+  country_code: '249'
+SE:
+  country_code: '46'
+SG:
+  country_code: '65'
+SH:
+  country_code: '290'
+SI:
+  country_code: '386'
+SJ:
+  country_code: '47'
+SK:
+  country_code: '421'
+SL:
+  country_code: '232'
+SM:
+  country_code: '378'
+SN:
+  country_code: '221'
+SO:
+  country_code: '252'
+SR:
+  country_code: '597'
+SS:
+  country_code: '211'
+ST:
+  country_code: '239'
+SV:
+  country_code: '503'
+SX:
+  country_code: '1'
+SY:
+  country_code: '963'
+SZ:
+  country_code: '268'
+TC:
+  country_code: '1'
+TD:
+  country_code: '235'
+TF:
+  country_code: ''
+TG:
+  country_code: '228'
+TH:
+  country_code: '66'
+TJ:
+  country_code: '992'
+TK:
+  country_code: '690'
+TL:
+  country_code: '670'
+TM:
+  country_code: '993'
+TN:
+  country_code: '216'
+TO:
+  country_code: '676'
+TR:
+  country_code: '90'
+TT:
+  country_code: '1'
+TV:
+  country_code: '688'
+TW:
+  country_code: '886'
+TZ:
+  country_code: '255'
+UA:
+  country_code: '380'
+UG:
+  country_code: '256'
+UM:
+  country_code: ''
+US:
+  country_code: '1'
+UY:
+  country_code: '598'
+UZ:
+  country_code: '998'
+VA:
+  country_code: '39'
+VC:
+  country_code: '1'
+VE:
+  country_code: '58'
+VG:
+  country_code: '1'
+VI:
+  country_code: '1'
+VN:
+  country_code: '84'
+VU:
+  country_code: '678'
+WF:
+  country_code: '681'
+WS:
+  country_code: '685'
+YE:
+  country_code: '967'
+YT:
+  country_code: '262'
+ZA:
+  country_code: '27'
+ZM:
+  country_code: '260'
+ZW:
+  country_code: '263'

data/lib/phony_rails.rb

@@ -1,13 +1,19 @@
 require 'phony'
-require 'iso3166'
 require 'phony_rails/string_extensions'
 require 'validators/phony_validator'
 require 'phony_rails/version'
+require 'yaml'
 
 module PhonyRails
 
   def self.country_number_for(country_code)
-    ISO3166::Country[country_code.to_s.upcase].try(:data).try(:[], 'country_code')
+    return if country_code.nil?
+
+    country_codes_hash[country_code.to_s.upcase]['country_code']
+  end
+
+  def self.country_codes_hash
+    @country_codes_hash ||= YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), 'data/country_codes.yaml'))
   end
 
   # This method requires a country_code attribute (eg. NL) and phone_number to be set.

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.12.9"
+  VERSION = "0.12.10"
 end

data/phony_rails.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.post_install_message = "It now ads a '+' to the normalized number when it starts with a country number!"
 
   gem.add_dependency "phony", '~> 2.12'
-  gem.add_dependency "countries", '~> 0.11', '>= 0.11.5'
   gem.add_dependency "activesupport", ">= 3.0"
   gem.add_development_dependency "activerecord", ">= 3.0"
   gem.add_development_dependency "mongoid", ">= 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.12.10
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
-- !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +84,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/data/country_codes.yaml
 - lib/phony_rails.rb
 - lib/phony_rails/locales/de.yml
 - lib/phony_rails/locales/en.yml