phonelib 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa38e795e6d299330a008f39f359cdd29ba221fc
-  data.tar.gz: 9bf8ce164c4838722a06aff72037147852100244
+  metadata.gz: a160b71aed28582490691f2c087b27908f2df154
+  data.tar.gz: 0a33eb3d681531632e0663826a75d7825e284e67
 SHA512:
-  metadata.gz: 61367e9387768b79bbb6d43c5b9718098c4a6772281b24111acd9bce2e6dadcfe08b9aa54aa64e4463b4457e593d4fb08e92da6e15d537dcf083df14d3c5e3f1
-  data.tar.gz: 58ba6833ce8aec90171faacef75b9fbfd865cd236242cb621c4fff26e457b4dc387c49d9e2293c7b9e0d77eac36d8442cbba830f1fe68011fff4539f54374758
+  metadata.gz: 241b111cf80d110df3f4cf27b3bdfe348ff87f3154c8bedd2241439b17594c517323d0c4917891ea23b9c3e95e5a153a704c313d8f58184d565e4e0c3645ccb6
+  data.tar.gz: 787995a5acc1ff9cd308a7a359011659566e404c113f53815c4e23ca27c0d77930e47cd952d66181eeb8f491cb379aa612922ad8215037d5cf8557fe2861fd83

data/lib/phonelib/core.rb

@@ -217,7 +217,10 @@ module Phonelib
     FORMATS = :formats
     # @private Pattern key
     PATTERN = :pattern
+    # @private Short key
+    SHORT = :short
 
+    # @private Plus sign
     PLUS_SIGN = '+'.freeze
 
     # @private vanity numbers 4 keys letters

data/lib/phonelib/data_importer.rb

@@ -50,7 +50,7 @@ module Phonelib
 
       # running import method
       def run_import
-        clone_repo
+        #clone_repo
         import_main_data
         import_short_data
         import_alternate_formats
@@ -147,7 +147,9 @@ module Phonelib
         result = { types: {}, formats: [] }
 
         without_comments(children).each do |phone_type|
-          if phone_type.name == 'availableFormats'
+          if phone_type.name == 'references'
+            next
+          elsif phone_type.name == 'availableFormats'
             result[:formats] = parse_formats(phone_type.children)
           else
             result[:types][name2sym(phone_type.name)] =
@@ -161,11 +163,12 @@ module Phonelib
       # method adds short number patterns to main data parsed from main xml
       def merge_short_with_main_type(country_id, type, data)
         @data[country_id][:types][type] ||= {}
+        @data[country_id][:types][type][Core::SHORT] ||= {}
         data.each do |k, v|
-          if @data[country_id][:types][type][k]
-            @data[country_id][:types][type][k] += "|#{v}"
+          if @data[country_id][:types][type][Core::SHORT][k]
+            @data[country_id][:types][type][Core::SHORT][k] += "|#{v}"
           else
-            @data[country_id][:types][type][k] = v
+            @data[country_id][:types][type][Core::SHORT][k] = v
           end
         end
       end
@@ -174,13 +177,23 @@ module Phonelib
       def fill_possible_to_types_if_nil(result)
         result[:types].each do |type, data|
           if data[Core::VALID_PATTERN] && !data[Core::POSSIBLE_PATTERN]
-            result[:types][type][Core::POSSIBLE_PATTERN] =
-                data[Core::VALID_PATTERN]
+            result[:types][type][Core::POSSIBLE_PATTERN] = case type
+                  when Core::GENERAL
+                    national_possible result[:types]
+                  else
+                    data[Core::VALID_PATTERN]
+                  end
           end
         end
         result
       end
 
+      # take all possible patters from all types
+      def national_possible(types)
+        types.map { |k, v| v[:possible_number_pattern] }.
+            compact.map { |e| e.split('|') }.flatten.uniq.join('|')
+      end
+
       # method parses xml for formats data
       def parse_formats(formats_children)
         without_comments(formats_children).map do |format|

data/lib/phonelib/data_importer_helper.rb

@@ -71,12 +71,39 @@ module Phonelib
         end
       when :element
         data.elements.each do |child|
-          hash[name2sym(child.name)] = str_clean(child.children.first)
+          if child.name == 'possibleLengths'
+            hash[Core::POSSIBLE_PATTERN] =
+                possible_length_regex(hash_from_xml(child, :attributes))
+          else
+            hash[name2sym(child.name)] = str_clean(child.children.first)
+          end
         end
       end
       hash
     end
 
+    def possible_length_regex(attributes)
+      return '' unless attributes[:national]
+      attributes[:national].split(',').map do |m|
+        if m.include? '-'
+          "\\d{#{m.gsub(/[\[\]]/, '').gsub('-', ',')}}"
+        else
+          "\\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
     def parse_raw_file(file)
       data = {}

data/lib/phonelib/phone_analyzer.rb

@@ -187,10 +187,13 @@ module Phonelib
       type = Core::FIXED_LINE if type == Core::FIXED_OR_MOBILE
       patterns = all_patterns[type]
 
-      if patterns.nil?
-        [nil, nil]
+      if patterns
+        [
+          type_regex(patterns, Core::POSSIBLE_PATTERN),
+          type_regex(patterns, Core::VALID_PATTERN)
+        ]
       else
-        [patterns[Core::POSSIBLE_PATTERN], patterns[Core::VALID_PATTERN]]
+        [nil, nil]
       end
     end
   end

data/lib/phonelib/phone_analyzer_helper.rb

@@ -105,11 +105,25 @@ module Phonelib
       regex << "(#{data[Core::INTERNATIONAL_PREFIX]})?"
       regex << "(#{data[Core::COUNTRY_CODE]})#{country_optional ? '?' : ''}"
       regex << "(#{data[Core::NATIONAL_PREFIX_FOR_PARSING] || data[Core::NATIONAL_PREFIX]})?"
-      regex << "(#{data[Core::TYPES][Core::GENERAL][type]})"
+      regex << "(#{type_regex(data[Core::TYPES][Core::GENERAL], type)})"
 
       cr("^#{regex.join}$")
     end
 
+    # Returns regex for type with special types if needed
+    #
+    # ==== Attributes
+    #
+    # * +data+ - country types data for single type
+    # * +type+ - possible or valid regex type needed
+    def type_regex(data, type)
+      regex = [data[type]]
+      if Phonelib.parse_special && data[Core::SHORT] && data[Core::SHORT][type]
+        regex << data[Core::SHORT][type]
+      end
+      regex.join('|')
+    end
+
     # Check if phone match country data
     #
     # ==== Attributes

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.11'
+  VERSION = '0.6.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database