phonelib 0.4.9 → 0.5.0

data/lib/phonelib/phone_analyzer.rb

@@ -145,7 +145,7 @@ module Phonelib
       prefix_length = data[Core::COUNTRY_CODE].length
       prefix_length += [1, 2].map { |i| country_match[i].to_s.size }.inject(:+)
       result = data.select { |k, v| k != :types && k != :formats }
-      result[:national] = phone[prefix_length..-1]
+      result[:national] = phone[prefix_length..-1] || ''
       result[:format] = get_number_format(result[:national],
                                           data[Core::FORMATS])
       result.merge! all_number_types(result[:national], data[Core::TYPES])

data/lib/phonelib/phone_extended_data.rb

@@ -0,0 +1,68 @@
+module Phonelib
+  # module provides extended data methods for parsed phone
+  module PhoneExtendedData
+    # Returns geo name of parsed phone number or nil if number is invalid or
+    # there is no geo name specified in db for this number
+    def geo_name
+      get_ext_name Phonelib::Core::EXT_GEO_NAMES,
+                   Phonelib::Core::EXT_GEO_NAME_KEY
+    end
+
+    # Returns timezone of parsed phone number or nil if number is invalid or
+    # there is no timezone specified in db for this number
+    def timezone
+      get_ext_name Phonelib::Core::EXT_TIMEZONES,
+                   Phonelib::Core::EXT_TIMEZONE_KEY
+    end
+
+    # Returns carrier of parsed phone number or nil if number is invalid or
+    # there is no carrier specified in db for this number
+    def carrier
+      get_ext_name Phonelib::Core::EXT_CARRIERS,
+                   Phonelib::Core::EXT_CARRIER_KEY
+    end
+
+    private
+
+    # get name from extended phone data by keys
+    #
+    # ==== Attributes
+    #
+    # * +name_key+ - names array key from extended data hash
+    # * +id_key+   - parameter id key in resolved extended data for number
+    #
+    def get_ext_name(names_key, id_key)
+      if ext_data[id_key] > 0
+        res = Phonelib.phone_ext_data[names_key][ext_data[id_key]]
+        res.size == 1 ? res.first : res
+      end
+    end
+
+    # returns extended data ids for current number
+    def ext_data
+      return @ext_data if @ext_data
+
+      ext_keys = [
+          Phonelib::Core::EXT_GEO_NAME_KEY,
+          Phonelib::Core::EXT_TIMEZONE_KEY,
+          Phonelib::Core::EXT_CARRIER_KEY
+      ]
+      result = {}
+      ext_keys.each { |key| result[key] = 0 }
+
+      return result unless possible?
+
+      drill = Phonelib.phone_ext_data[Phonelib::Core::EXT_PREFIXES]
+
+      e164.gsub('+', '').each_char do |num|
+        drill = drill[num.to_i] || break
+
+        ext_keys.each do |key|
+          result[key] = drill[key] if drill[key]
+        end
+      end
+
+      @ext_data = result
+    end
+  end
+end

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.4.9'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -318,6 +318,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/505_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/507_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/53_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/54_en
@@ -376,6 +377,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/975_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
@@ -948,6 +950,8 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -1493,6 +1497,7 @@ files:
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java
+- data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -1529,6 +1534,7 @@ files:
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE
+- data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
@@ -1679,6 +1685,7 @@ files:
 - data/libphonenumber/resources/carrier/en/505.txt
 - data/libphonenumber/resources/carrier/en/506.txt
 - data/libphonenumber/resources/carrier/en/507.txt
+- data/libphonenumber/resources/carrier/en/509.txt
 - data/libphonenumber/resources/carrier/en/51.txt
 - data/libphonenumber/resources/carrier/en/53.txt
 - data/libphonenumber/resources/carrier/en/54.txt
@@ -1736,6 +1743,7 @@ files:
 - data/libphonenumber/resources/carrier/en/973.txt
 - data/libphonenumber/resources/carrier/en/974.txt
 - data/libphonenumber/resources/carrier/en/975.txt
+- data/libphonenumber/resources/carrier/en/976.txt
 - data/libphonenumber/resources/carrier/en/977.txt
 - data/libphonenumber/resources/carrier/en/98.txt
 - data/libphonenumber/resources/carrier/en/992.txt
@@ -1982,6 +1990,7 @@ files:
 - lib/phonelib/data_importer_helper.rb
 - lib/phonelib/phone.rb
 - lib/phonelib/phone_analyzer.rb
+- lib/phonelib/phone_extended_data.rb
 - lib/phonelib/version.rb
 - lib/tasks/phonelib_tasks.rake
 - lib/validators/phone_validator.rb