phonelib 0.4.7 → 0.4.8

data/lib/phonelib/core.rb

@@ -76,6 +76,28 @@ module Phonelib
     MOBILE = :mobile
     # In case MOBILE and FIXED patterns are the same, this type is returned
     FIXED_OR_MOBILE = :fixed_or_mobile
+    # Short code
+    SHORT_CODE = :short_code
+    # emergency numbers
+    EMERGENCY = :emergency
+    # carrier specific type
+    CARRIER_SPECIFIC = :carrier_specific
+    # SMS Services only type
+    SMS_SERVICES = :sms_services
+    # expendad emergency type
+    EXPANDED_EMERGENCY = :expanded_emergency
+    # no international dialling type
+    NO_INTERNATIONAL_DIALING = :no_international_dialling
+    # carrier services type
+    CARRIER_SERVICES = :carrier_services
+    # directory services
+    DIRECTORY_SERVICES = :directory_services
+    # standard rate type
+    STANDARD_RATE = :standard_rate
+    # carrier selection codes
+    CARRIER_SELECTION_CODES = :carrier_selection_codes
+    # area code optional type
+    AREA_CODE_OPTIONAL = :area_code_optional
 
     # Internal use keys for validations
     # Valid regex pattern key
@@ -122,9 +144,27 @@ module Phonelib
       voicemail: 'VoiceMail',
       fixed_line: 'Fixed Line',
       mobile: 'Mobile',
-      fixed_or_mobile: 'Fixed Line or Mobile'
+      fixed_or_mobile: 'Fixed Line or Mobile',
+      short_code: 'Short code',
+      emergency: 'Emergency services',
+      carrier_specific: 'Carrier specific number',
+      sms_services: 'SMS Services only phone',
+      expanded_emergency: 'Expanded emergency',
+      no_international_dialling: 'No International Dialing phone',
+      carrier_services: 'Carrier Services',
+      directory_services: 'Directory Services',
+      standard_rate: 'Standard Rate Destination',
+      carrier_selection_codes: 'Carrier Selection codes',
+      area_code_optional: 'Are code optional'
     }
 
+    SHORT_CODES = [
+        :short_code, :emergency, :carrier_specific, :sms_services,
+        :expanded_emergency, :no_international_dialling, :carrier_services,
+        :directory_services, :standard_rate, :carrier_selection_codes,
+        :area_code_optional
+    ]
+
     # Extended data prefixes hash key
     EXT_PREFIXES = :prefixes
     # Extended data geo names array key

data/lib/phonelib/data_importer.rb

@@ -1,3 +1,5 @@
+require 'phonelib/data_importer_helper'
+
 module Phonelib
   # module processes creation of data files needed for this gem
   module DataImporter
@@ -13,6 +15,8 @@ module Phonelib
 
     # class with functionality for importing data
     class Importer
+      include Phonelib::DataImporterHelper
+
       # main data file in repo
       MAIN_FILE = 'resources/PhoneNumberMetadata.xml'
       # short number metadata
@@ -26,11 +30,6 @@ module Phonelib
       # timezones data dir in repo
       TIMEZONES_DIR= 'resources/timezones/'
 
-      # xml comments attributes names that should not be parsed
-      XML_COMMENT_ATTRIBUTES = %w(text comment)
-      # xml format attributes names
-      XML_FORMAT_NAMES = %w(intlFormat format)
-
       # class initialization method
       def initialize
         @destination = File.path(
@@ -93,17 +92,7 @@ module Phonelib
           country = get_hash_from_xml(el, :attributes)
           country[:types] = {}
 
-          without_comments(el.children).each do | phone_type |
-            if phone_type.name == 'availableFormats'
-              country[:formats] = parse_formats(phone_type.children)
-            else
-              country[:types][name2sym(phone_type.name)] =
-                  get_hash_from_xml(phone_type, :element)
-            end
-          end
-
-          country[:types] = add_possible_if_not_exists(country[:types])
-
+          country.merge! get_types_and_formats(el.children)
           @data[country[:id]] = country
         end
       end
@@ -116,23 +105,13 @@ module Phonelib
           country = get_hash_from_xml(el, :attributes)
           country[:types] = {}
 
-          without_comments(el.children).each do | phone_type |
-            country[:types][name2sym(phone_type.name)] =
-                get_hash_from_xml(phone_type, :element)
-          end
-
-          country[:types] = add_possible_if_not_exists(country[:types])
+          country.merge! get_types_and_formats(el.children)
 
-          id = country[:id]
           country[:types].each do |type, data|
-            @data[id][:types][type] = data && next unless @data[id][:types][type]
-
-            data.each do |k, v|
-              if @data[id][:types][type][k]
-                @data[id][:types][type][k] += "|#{v}"
-              else
-                @data[id][:types][type][k] = v
-              end
+            if @data[country[:id]][:types][type]
+              merge_short_with_main_type(country[:id], type, data)
+            else
+              @data[country[:id]][:types][type] = data
             end
           end
         end
@@ -179,6 +158,36 @@ module Phonelib
                               :c)
       end
 
+      # method extracts formats and types from xml data
+      def get_types_and_formats(children)
+        types = {}
+        formats = []
+
+        without_comments(children).each do | phone_type |
+          if phone_type.name == 'availableFormats'
+            formats = parse_formats(phone_type.children)
+          else
+            types[name2sym(phone_type.name)] =
+                get_hash_from_xml(phone_type, :element)
+          end
+        end
+
+        types = add_possible_if_not_exists(types)
+
+        { types: types, formats: formats }
+      end
+
+      # method adds short number patterns to main data parsed from main xml
+      def merge_short_with_main_type(country_id, type, data)
+        data.each do |k, v|
+          if @data[country_id][:types][type][k]
+            @data[country_id][:types][type][k] += "|#{v}"
+          else
+            @data[country_id][:types][type][k] = v
+          end
+        end
+      end
+
       # adds possible pattern in case it doesn't exists
       def add_possible_if_not_exists(types)
         types.each do |type, data|
@@ -190,33 +199,6 @@ module Phonelib
         types
       end
 
-      # method filters xml elements excluding comments elements
-      def without_comments(data)
-        data.select do |el|
-          !XML_COMMENT_ATTRIBUTES.include? el.name
-        end
-      end
-
-      # method creates hash from xml elements/element attributes
-      def get_hash_from_xml(data, type)
-        hash = {}
-        case type
-          when :attributes
-            data.attributes.each do |k, v|
-              hash[name2sym(k)] = str_clean(v)
-            end
-          when :children
-            data.each do |f|
-              hash[name2sym(f[0])] = f[1]
-            end
-          when :element
-            data.elements.each do |child|
-              hash[name2sym(child.name)] = str_clean(child.children.first)
-            end
-        end
-        hash
-      end
-
       # method parses xml for formats data
       def parse_formats(formats_children)
         without_comments(formats_children).map do |format|
@@ -246,45 +228,6 @@ module Phonelib
         end
       end
 
-      # method updates prefixes hash recursively
-      def fill_prefixes(key, value, prefix, prefixes)
-        prefixes = {} if prefixes.nil?
-        if prefix.size == 1
-          prefixes[prefix.to_i] = {} unless prefixes[prefix.to_i]
-          prefixes[prefix.to_i][key] = value
-        else
-          pr = prefix[0].to_i
-          prefixes[pr] = fill_prefixes(key, value, prefix[1..-1], prefixes[pr])
-        end
-        prefixes
-      end
-
-      # method parses raw data file
-      def parse_raw_file(file)
-        data = {}
-        File.readlines(file).each do |line|
-          line = str_clean line
-          next if line.empty? || line[0] == '#'
-          prefix, line_data = line.split('|')
-          data[prefix] = line_data && line_data.split('&')
-        end
-        data
-      end
-
-      # method for checking if element name is not a format element
-      def is_not_format(name)
-        !XML_FORMAT_NAMES.include? name
-      end
-
-      # get main body from parsed xml document
-      def main_from_xml(file)
-        xml_data = File.read(file)
-        xml_data.force_encoding("utf-8")
-
-        doc = Nokogiri::XML(xml_data)
-        doc.elements.first.elements.first
-      end
-
       # method finds country by country prefix
       def get_country_by_code(country_code)
         match = @data.select { |k, v| v[:country_code] == country_code }
@@ -294,21 +237,6 @@ module Phonelib
 
         match.keys.first
       end
-
-      # helper that cleans string
-      def str_clean(s, white_space = true)
-        s.to_s.tr(white_space ? " \n" : "\n", '')
-      end
-
-      # helper that converts xml element name to symbol
-      def name2sym(name)
-        camel2snake(name).to_sym
-      end
-
-      # method that converts camel case to snake case
-      def camel2snake(s)
-        s.gsub(/[A-Z]+/) { |m| "_#{m.downcase}" }
-      end
     end
   end
 end

data/lib/phonelib/data_importer_helper.rb

@@ -0,0 +1,89 @@
+module Phonelib
+  module DataImporterHelper
+    # xml comments attributes names that should not be parsed
+    XML_COMMENT_ATTRIBUTES = %w(text comment)
+    # xml format attributes names
+    XML_FORMAT_NAMES = %w(intlFormat format)
+
+    # method updates prefixes hash recursively
+    def fill_prefixes(key, value, prefix, prefixes)
+      prefixes = {} if prefixes.nil?
+      if prefix.size == 1
+        prefixes[prefix.to_i] = {} unless prefixes[prefix.to_i]
+        prefixes[prefix.to_i][key] = value
+      else
+        pr = prefix[0].to_i
+        prefixes[pr] = fill_prefixes(key, value, prefix[1..-1], prefixes[pr])
+      end
+      prefixes
+    end
+
+    # method for checking if element name is not a format element
+    def is_not_format(name)
+      !XML_FORMAT_NAMES.include? name
+    end
+
+    # method filters xml elements excluding comments elements
+    def without_comments(data)
+      data.select do |el|
+        !XML_COMMENT_ATTRIBUTES.include? el.name
+      end
+    end
+
+    # method creates hash from xml elements/element attributes
+    def get_hash_from_xml(data, type)
+      hash = {}
+      case type
+        when :attributes
+          data.attributes.each do |k, v|
+            hash[name2sym(k)] = str_clean(v)
+          end
+        when :children
+          data.each do |f|
+            hash[name2sym(f[0])] = f[1]
+          end
+        when :element
+          data.elements.each do |child|
+            hash[name2sym(child.name)] = str_clean(child.children.first)
+          end
+      end
+      hash
+    end
+
+    # method parses raw data file
+    def parse_raw_file(file)
+      data = {}
+      File.readlines(file).each do |line|
+        line = str_clean line
+        next if line.empty? || line[0] == '#'
+        prefix, line_data = line.split('|')
+        data[prefix] = line_data && line_data.split('&')
+      end
+      data
+    end
+
+    # get main body from parsed xml document
+    def main_from_xml(file)
+      xml_data = File.read(file)
+      xml_data.force_encoding("utf-8")
+
+      doc = Nokogiri::XML(xml_data)
+      doc.elements.first.elements.first
+    end
+
+    # helper that cleans string
+    def str_clean(s, white_space = true)
+      s.to_s.tr(white_space ? " \n" : "\n", '')
+    end
+
+    # helper that converts xml element name to symbol
+    def name2sym(name)
+      camel2snake(name).to_sym
+    end
+
+    # method that converts camel case to snake case
+    def camel2snake(s)
+      s.gsub(/[A-Z]+/) { |m| "_#{m.downcase}" }
+    end
+  end
+end

data/lib/phonelib/phone.rb

@@ -21,7 +21,7 @@ module Phonelib
       if sanitized.empty?
         @data = {}
       else
-        @data = analyze(sanitized, country)
+        @data = analyze(sanitized, @original.start_with?('+') ? nil : country)
         first = @data.values.first
         @national_number = first ? first[:national] : sanitized
       end

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -326,6 +326,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/58_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/591_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/595_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/598_en
@@ -346,6 +347,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/679_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/685_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
@@ -875,6 +877,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_id
@@ -1684,6 +1687,7 @@ files:
 - data/libphonenumber/resources/carrier/en/57.txt
 - data/libphonenumber/resources/carrier/en/58.txt
 - data/libphonenumber/resources/carrier/en/591.txt
+- data/libphonenumber/resources/carrier/en/592.txt
 - data/libphonenumber/resources/carrier/en/595.txt
 - data/libphonenumber/resources/carrier/en/597.txt
 - data/libphonenumber/resources/carrier/en/598.txt
@@ -1704,6 +1708,7 @@ files:
 - data/libphonenumber/resources/carrier/en/679.txt
 - data/libphonenumber/resources/carrier/en/685.txt
 - data/libphonenumber/resources/carrier/en/686.txt
+- data/libphonenumber/resources/carrier/en/689.txt
 - data/libphonenumber/resources/carrier/en/7.txt
 - data/libphonenumber/resources/carrier/en/84.txt
 - data/libphonenumber/resources/carrier/en/852.txt
@@ -1835,6 +1840,7 @@ files:
 - data/libphonenumber/resources/geocoding/en/56.txt
 - data/libphonenumber/resources/geocoding/en/57.txt
 - data/libphonenumber/resources/geocoding/en/58.txt
+- data/libphonenumber/resources/geocoding/en/592.txt
 - data/libphonenumber/resources/geocoding/en/599.txt
 - data/libphonenumber/resources/geocoding/en/62.txt
 - data/libphonenumber/resources/geocoding/en/64.txt
@@ -1973,6 +1979,7 @@ files:
 - lib/phonelib.rb
 - lib/phonelib/core.rb
 - lib/phonelib/data_importer.rb
+- lib/phonelib/data_importer_helper.rb
 - lib/phonelib/phone.rb
 - lib/phonelib/phone_analyzer.rb
 - lib/phonelib/version.rb