phonelib 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057bf64ada014da3a08f3355708b52ff368ecbba
-  data.tar.gz: 58f4e1fd554667c03f827fc73b45fdcb91c38cfe
+  metadata.gz: 9c2862f5e9f97af025f8a5beba5a99c68fa24a85
+  data.tar.gz: e1d12a6507f085b7c1ee633e8940cf88dbdd1dab
 SHA512:
-  metadata.gz: e7dc5128f57dd6d743d32ea86ae5de72cf3ac539d19a3bafa7fc8d33153520d7382d786286e417be9b4fb31f0cf69b9e5baa4c353de51d68754397862db28bb5
-  data.tar.gz: 4abda9ec008548813bd838137a4f9139345f57f2e794f296f218db0d48263c14874446aac396f1d264e5f864a35294a22aa6b2b6d8b619d5652f0237eb167caa
+  metadata.gz: 4e5cb8d9c464042b48411057ff7367bcb5ed5d3893454469dd65ddd96812e5ada4048883c4eaa49dc8a5d0927125e9ee40b7c9ccc484121c67489b0427858b2b
+  data.tar.gz: e0541b7cf75c20d71a65297263bfa06b6941a6afffd9375aed0968df040e2bb6f2642e650b4535faf15fc54c0c5827ca3957c525c47ee0197eb10877aff6ab03

data/README.md

@@ -50,6 +50,12 @@ To use the ability to parse special numbers (Short Codes, Emergency etc.) you ca
 Phonelib.parse_special = true
 ```
 
+To allow vanity phone numbers conversion you can set ```Phonelib.vanity_conversion``` to ```true```. This will convert characters in passed phone number to their numeric representation (800-CALL-NOW will be 800-225-5669).
+
+``` ruby
+Phonelib.vanity_conversion = true
+```
+
 To disable sanitizing of passed phone number (keeping digits only)
 
 ``` ruby
@@ -226,6 +232,12 @@ You can get E164 formatted number
 phone.e164 # returns number in E164 format
 ```
 
+There is a ```to_s``` method, it will return ```e164``` in case number is valid and ```original``` otherwise
+
+``` ruby
+phone.to_s # returns number in E164 format if number is valid or original otherwise
+```
+
 There is extended data available for numbers. It will return <tt>nil</tt> in case there is no data or phone is impossible.
 Can return array of values in case there are some results for specified number
 

data/lib/phonelib/core.rb

@@ -117,6 +117,16 @@ module Phonelib
       @@override_phone_data
     end
 
+    @@vanity_conversion = false
+    # setter for vanity phone numbers chars replacement
+    def vanity_conversion=(value)
+      @@vanity_conversion = value
+    end
+
+    def vanity_conversion
+      @@vanity_conversion
+    end
+
     # gem constants definition
 
     # @private Main data file

data/lib/phonelib/data_importer.rb

@@ -18,7 +18,7 @@ module Phonelib
       include Phonelib::DataImporterHelper
 
       # countries that can have double country prefix in number
-      DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR IT)
+      DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR IT NO)
 
       # main data file in repo
       MAIN_FILE = 'resources/PhoneNumberMetadata.xml'

data/lib/phonelib/phone.rb

@@ -32,14 +32,18 @@ module Phonelib
       end
     end
 
+    # method returns string representation of parsed phone
+    def to_s
+      valid? ? e164 : original
+    end
+
     # method to get sanitized phone number (only numbers)
     # @return [String] Sanitized phone number
     def sanitized
-      @sanitized = if Phonelib.strict_check
-                     @original && @original.gsub(/^\+/, '') || ''
-                   else
-                     @original && @original.gsub(/[^0-9]+/, '') || ''
-                   end
+      @sanitized ||=
+          vanity_converted(@original).gsub(
+              Phonelib.strict_check ? /^\+/.freeze : /[^0-9]+/.freeze,
+              '')
     end
 
     # Returns all phone types that matched valid patterns

data/lib/phonelib/phone_analyzer_helper.rb

@@ -3,6 +3,20 @@ module Phonelib
   module PhoneAnalyzerHelper
     private
 
+    def vanity_converted(phone)
+      return phone unless Phonelib.vanity_conversion
+
+      (phone || '').gsub(/[a-z]/i.freeze) do |c|
+        c.upcase!
+        # subtract "A"
+        n = (c.ord - 65) / 3
+        # account for #7 & #9 which have 4 chars
+        n -= 1 if c == 'S'.freeze || c == 'V'.freeze || c >= 'Y'.freeze
+        (n + 2).to_s
+      end
+    end
+
+
     # defines if to validate against single country or not
     def passed_country(country)
       code = country_prefix(country)

data/lib/phonelib/phone_extended_data.rb

@@ -45,6 +45,7 @@ module Phonelib
       return nil unless ext_data[id_key] > 0
 
       res = Phonelib.phone_ext_data[names_key][ext_data[id_key]]
+      return nil unless res
       res.size == 1 ? res.first : res
     end
 

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,11 +152,7 @@ homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-      IMPORTANT NOTICE!
-      Phone types were changed from camel case to snake case!
-      Example: ":tollFree" changed to ":toll_free".
-      Please update your app in case you are checking types!
+post_install_message: 
 rdoc_options:
 - " --no-private - CHANGELOG.md --readme README.md"
 require_paths: