phonelib 0.6.19 → 0.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9249378077a22dab9790c7a3fa57052d973c82b
-  data.tar.gz: 62ed0e7a587653648cf41c5d3e641ad2f52bbeaf
+  metadata.gz: e5f646f52d422a81f3c5661833bc8fbcd16d58d0
+  data.tar.gz: c95290c503448d13bcbc8155441cd3eaf79db473
 SHA512:
-  metadata.gz: 7513f3968d272f53b6de993e975ee182fe469991906b05b788f4c9bac43be8864bddb325a964c6b56a1ea3648e44c07b085196227face176b69892ac693cec80
-  data.tar.gz: 9e45a5cd7fdca6bec5786669b27347fb7bce3b2b6ece459f1ee698b15225bcbb4395a6b514dfeddbcbb4486e24745d110434ef7d4933ef02bd40816e88894aee
+  metadata.gz: 2081bdbc6d307b6443809a38f3a2bf5e928c7049095a113fe53583d9677f52c38a9b18d8df8b2818dec095abf84dc9d942fb433dd8c68457c745586a3dd304c7
+  data.tar.gz: 22d1502ae3859b9ac61a95c5477c65423454dd312cb2bf0bc92270ea67769ca32bd8d64645ced86b9115e2ca1f9cc02de0b997b7c9d044d806f598fabfbd7f2e

data/lib/phonelib/core.rb

@@ -199,6 +199,8 @@ module Phonelib
     NATIONAL_PREFIX = :national_prefix
     # @private National prefix for parsing key
     NATIONAL_PREFIX_FOR_PARSING = :national_prefix_for_parsing
+    # @private National prefix transform rule key
+    NATIONAL_PREFIX_TRANSFORM_RULE = :national_prefix_transform_rule
     # @private National prefix rule key
     NATIONAL_PREFIX_RULE = :national_prefix_formatting_rule
     # @private Country code key

data/lib/phonelib/data_importer.rb

@@ -78,6 +78,9 @@ module Phonelib
           country = hash_from_xml(el, :attributes)
           country.merge! types_and_formats(el.children)
           country = add_double_country_flag country
+          if country[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
+            country[Core::NATIONAL_PREFIX_TRANSFORM_RULE].gsub!('$', '\\')
+          end
           @data[country[:id]] = country
         end
       end

data/lib/phonelib/data_importer_helper.rb

@@ -91,17 +91,6 @@ module Phonelib
           "\\d{#{m}}"
         end
       end.join('|')
-=begin
-      attributes.map do |k, v|
-        v.split(',').map do |m|
-          if m.include? '-'
-            "\\d{#{m.gsub(/[\[\]]/, '').gsub('-', ',')}}"
-          else
-            "\\d{#{m}}"
-          end
-        end.join('|')
-      end.join('|')
-=end
     end
 
     # method parses raw data file

data/lib/phonelib/phone_analyzer.rb

@@ -46,6 +46,18 @@ module Phonelib
       base_result
     end
 
+    # replacing national prefix to simplified format
+    def with_replaced_national_prefix(phone, data)
+      return phone unless data[Core::NATIONAL_PREFIX_TRANSFORM_RULE]
+      pattern = cr("^(?:#{data[Core::NATIONAL_PREFIX_FOR_PARSING]})")
+      match = phone.match pattern
+      if match && match.captures.compact.size > 0
+        phone.gsub(pattern, data[Core::NATIONAL_PREFIX_TRANSFORM_RULE])
+      else
+        phone
+      end
+    end
+
     # trying to parse phone for single country including international prefix
     # check for provided country
     #
@@ -60,7 +72,7 @@ module Phonelib
       # if country was provided and it's a valid country, trying to
       # create e164 representation of phone number,
       # kind of normalization for parsing
-      e164 = convert_to_e164 phone, data
+      e164 = convert_to_e164 with_replaced_national_prefix(phone, data), data
       # if phone starts with international prefix of provided
       # country try to reanalyze without international prefix for
       # all countries

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.19'
+  VERSION = '0.6.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +28,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement