phonelib 0.6.26 → 0.6.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fb00c428cdddcf7bcf9253fa39ebd0c56c5dfc
-  data.tar.gz: 871afff63d98345ca549360c3f96730b0233dfdd
+  metadata.gz: 0bbc14f23529356b7e5f1ae1f8d189e7b586aa44
+  data.tar.gz: 96bb81f6b1a68d873452ce0d16b7e305cf9254a8
 SHA512:
-  metadata.gz: 364ac4b3ac70b75589fab797cbb1c8b492f06c44a6bda41289b4f41d5c460aa7ab1376e06ea6f713064585c33f6456f5ab02e4c77c34020baf200132330272e1
-  data.tar.gz: fac36e5b7ab249ef88f9e43a8dd89f5090c2c02f5cebba2955044a36a217e500f5b2c568252647be773e40259b398a1f25446e7de48fe26e5621a723d16149f8
+  metadata.gz: 46baab7368eda1a4defbcb9ce688811d8dc4c13df64dad099afb104a76e1cd5eda9f1d4bc1c9c332e89147965ba94ee7d1b6cdfd1ec4c2004aca91d7f2a7479d
+  data.tar.gz: 816cf2b257288ca4173d7809fc8d3e8c1f192d50c0b6d56aa27f5392a1e15db6ab7df4c9343e491b5febaebcc99abcc3599a4e7d93ed7f9074bff7b64afea04c

data/README.md

@@ -111,7 +111,7 @@ if mixed with <tt>possible</tt> will check if number is possible for specified t
 <tt>countries: :us</tt> or <tt>countries: [:us, :ca]</tt> - allows to validate against specific countries, 
 if mixed with <tt>possible</tt> will check if number is possible for specified countries
 
-<tt>country_specifier: -> phone { phone.country.try(:upcase) }</tt> - allows to specify country for validation dynamically for each validation. Usefull when phone is stored as national number without country prefix.
+<tt>country_specifier: :method_name</tt> or <tt>country_specifier: -> instance { instance.country.try(:upcase) }</tt> - allows to specify country for validation dynamically for each validation. Usefull when phone is stored as national number without country prefix.
 
 <tt>extensions: false</tt> - set to perform check for phone extension to be blank
 

data/lib/phonelib/core.rb

@@ -285,6 +285,8 @@ module Phonelib
     EXT_PREFIXES = :prefixes
     # @private Extended data geo names array key
     EXT_GEO_NAMES = :geo_names
+    # @private Extended data country names array key
+    EXT_COUNTRY_NAMES = :country_names
     # @private Extended data timezones array key
     EXT_TIMEZONES = :timezones
     # @private Extended data carriers array key

data/lib/phonelib/data_importer.rb

@@ -42,6 +42,7 @@ module Phonelib
         @geo_names = []
         @timezones = []
         @carriers = []
+        @countries = {}
 
         run_import
       end
@@ -57,6 +58,7 @@ module Phonelib
         import_geocoding_data
         import_timezone_data
         import_carrier_data
+        import_country_names
         save_data_file
         save_extended_data_file
       end
@@ -137,6 +139,21 @@ module Phonelib
                               :c)
       end
 
+      # import country names
+      def import_country_names
+        puts 'IMPORTING COUNTRY NAMES'
+
+        require 'open-uri'
+        require 'csv'
+        io = open('http://download.geonames.org/export/dump/countryInfo.txt')
+        csv = CSV.new(io, {col_sep: "\t"})
+        csv.each do |row|
+          next if row[0].start_with?('#') || row[0].empty?
+
+          @countries[row[0]] = row[4]
+        end
+      end
+
       # adds double country code flag in case country allows
       def add_double_country_flag(country)
         if DOUBLE_COUNTRY_CODES_COUNTRIES.include?(country[:id])

data/lib/phonelib/data_importer_helper.rb

@@ -22,6 +22,7 @@ module Phonelib
       extended = {
         Phonelib::Core::EXT_PREFIXES => @prefixes,
         Phonelib::Core::EXT_GEO_NAMES => @geo_names,
+        Phonelib::Core::EXT_COUNTRY_NAMES => @countries,
         Phonelib::Core::EXT_TIMEZONES => @timezones,
         Phonelib::Core::EXT_CARRIERS => @carriers
       }

data/lib/phonelib/phone_extended_data.rb

@@ -32,6 +32,13 @@ module Phonelib
                    Phonelib::Core::EXT_CARRIER_KEY
     end
 
+    # returns valid country name
+    def valid_country_name
+      return unless valid?
+
+      Phonelib.phone_ext_data[Phonelib::Core::EXT_COUNTRY_NAMES][valid_country]
+    end
+
     private
 
     # @private get name from extended phone data by keys

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.26'
+  VERSION = '0.6.27'
 end

data/lib/validators/phone_validator.rb

@@ -92,7 +92,12 @@ class PhoneValidator < ActiveModel::EachValidator
 
   def specified_country(record)
     return unless options[:country_specifier]
-    options[:country_specifier].call(record)
+
+    if options[:country_specifier].is_a?(Symbol)
+      record.send(options[:country_specifier])
+    else
+      options[:country_specifier].call(record)
+    end
   end
 
   # @private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.26
+  version: 0.6.27
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake