phonelib 0.5.0 → 0.5.1

data/lib/phonelib/phone_analyzer_helper.rb

@@ -0,0 +1,128 @@
+module Phonelib
+  module PhoneAnalyzerHelper
+    private
+
+    # caches regular expression, reusing it for later lookups
+    def cr(regexp)
+      Phonelib.phone_regexp_cache[regexp] ||= Regexp.new(regexp)
+    end
+
+    # checks if country can have numbers with double country prefixes
+    #
+    # ==== Attributes
+    #
+    # * +data+ - country data used for parsing
+    # * +phone+ - phone number being parsed
+    # * +parsed+ - parsed regex match for phone
+    def allows_double_prefix(data, phone, parsed)
+      data[Core::DOUBLE_COUNTRY_PREFIX_FLAG] &&
+          phone =~ cr("^#{data[Core::COUNTRY_CODE]}") &&
+          parsed && (parsed[:valid].nil? || parsed[:valid].empty?)
+    end
+
+    # Get country that was provided or default country in needable format
+    #
+    # ==== Attributes
+    #
+    # * +country+ - country passed for parsing
+    def country_or_default_country(country)
+      country = country || Phonelib.default_country
+      country && country.to_s.upcase
+    end
+
+    # constructs full regex for phone validation for provided phone data
+    # (international prefix, country code, national prefix, valid number)
+    #
+    # ==== Attributes
+    #
+    # * +data+ - country data hash
+    # * +country_optional+ - whether to put country code as optional group
+    def full_regex_for_data(data, type, country_optional = true)
+      regex = []
+      regex << "(#{data[Core::INTERNATIONAL_PREFIX]})?"
+      regex << if country_optional
+                 "(#{data[Core::COUNTRY_CODE]})?"
+               else
+                 data[Core::COUNTRY_CODE]
+               end
+      regex << "(#{data[Core::NATIONAL_PREFIX_FOR_PARSING] || data[Core::NATIONAL_PREFIX]})?"
+      regex << "(#{data[Core::TYPES][Core::GENERAL][type]})"
+
+      cr("^#{regex.join}$")
+    end
+
+    # Check if phone match country data
+    #
+    # ==== Attributes
+    #
+    # * +phone+ - phone number for parsing
+    # * +data+  - country data
+    def phone_match_data?(phone, data, possible = false)
+      country_code = "#{data[Core::COUNTRY_CODE]}"
+      inter_prefix = "(#{data[Core::INTERNATIONAL_PREFIX]})?"
+      return unless phone.match cr("^#{inter_prefix}#{country_code}")
+
+      type = possible ? Core::POSSIBLE_PATTERN : Core::VALID_PATTERN
+      phone.match full_regex_for_data(data, type, false)
+    end
+
+    # checks if types has both :mobile and :fixed_line and replaces it with
+    # :fixed_or_mobile in case both present
+    def sanitize_fixed_mobile(types)
+      fixed_mobile = [Core::FIXED_LINE, Core::MOBILE]
+      [:possible, :valid].each do |key|
+        if (fixed_mobile - types[key]).empty?
+          types[key] = types[key] - fixed_mobile + [Core::FIXED_OR_MOBILE]
+        end
+      end
+      types
+    end
+
+    # returns array of phone types for check for current country data
+    #
+    # ==== Attributes
+    #
+    # * +data+  - country data hash
+    def types_for_check(data)
+      exclude_list = PhoneAnalyzer::NOT_FOR_CHECK
+      exclude_list += Phonelib::Core::SHORT_CODES unless Phonelib.parse_special
+      Core::TYPES_DESC.keys - exclude_list + fixed_and_mobile_keys(data)
+    end
+
+    # Checks if fixed line pattern and mobile pattern are the same and returns
+    # appropriate keys
+    #
+    # ==== Attributes
+    #
+    # * +data+  - country data
+    def fixed_and_mobile_keys(data)
+      if data[Core::FIXED_LINE] == data[Core::MOBILE]
+        [Core::FIXED_OR_MOBILE]
+      else
+        [Core::FIXED_LINE, Core::MOBILE]
+      end
+    end
+
+    # Checks if passed number matches valid and possible patterns
+    #
+    # ==== Attributes
+    #
+    # * +number+ - phone number for validation
+    # * +possible_pattern+ - possible pattern for validation
+    # * +national_pattern+ - valid pattern for validation
+    def number_valid_and_possible?(number, possible_pattern, national_pattern)
+      possible_match = number.match(cr("^(?:#{possible_pattern})$"))
+      possible = possible_match && possible_match.to_s.length == number.length
+
+      return [possible, possible] if possible_pattern == national_pattern
+      valid = false
+      if possible
+        # doing national pattern match only in case possible matches
+        national_match = number.match(cr("^(?:#{national_pattern})$"))
+        valid = national_match && national_match.to_s.length == number.length
+      end
+
+      [valid && possible, possible]
+    end
+  end
+end

data/lib/phonelib/version.rb

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

data/lib/phonelib.rb

@@ -4,6 +4,7 @@ module Phonelib
   autoload :Core, 'phonelib/core'
   autoload :Phone, 'phonelib/phone'
   autoload :PhoneAnalyzer, 'phonelib/phone_analyzer'
+  autoload :PhoneAnalyzerHelper, 'phonelib/phone_analyzer_helper'
   autoload :PhoneExtendedData, 'phonelib/phone_extended_data'
 
   extend Module.new {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Google libphonenumber library was taken as a basis for
       this gem. Gem uses its data file for validations and number formatting.
@@ -684,6 +698,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
@@ -962,6 +977,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30
@@ -1298,6 +1314,8 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK
@@ -1322,6 +1340,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI
@@ -1371,6 +1390,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY
@@ -1411,6 +1431,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI
@@ -1452,6 +1473,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV
@@ -1491,6 +1513,7 @@ files:
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW
+- data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -1538,6 +1561,7 @@ files:
 - 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
+- data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting
 - data/libphonenumber/java/pom.xml
 - data/libphonenumber/java/release_notes.txt
 - data/libphonenumber/javadoc/allclasses-frame.html
@@ -1565,7 +1589,7 @@ files:
 - data/libphonenumber/javadoc/resources/inherit.gif
 - data/libphonenumber/javadoc/serialized-form.html
 - data/libphonenumber/javadoc/stylesheet.css
-- data/libphonenumber/javascript/README
+- data/libphonenumber/javascript/README.md
 - data/libphonenumber/javascript/build.xml
 - data/libphonenumber/javascript/i18n/phonenumbers/asyoutypeformatter.js
 - data/libphonenumber/javascript/i18n/phonenumbers/asyoutypeformatter_test.html
@@ -1990,6 +2014,7 @@ files:
 - lib/phonelib/data_importer_helper.rb
 - lib/phonelib/phone.rb
 - lib/phonelib/phone_analyzer.rb
+- lib/phonelib/phone_analyzer_helper.rb
 - lib/phonelib/phone_extended_data.rb
 - lib/phonelib/version.rb
 - lib/tasks/phonelib_tasks.rake

data/data/libphonenumber/javascript/README

@@ -1,101 +0,0 @@
-Info:
-=====
-Google's JavaScript library for parsing, formatting, and validating
-international phone numbers.
-
-
-How to setup:
-=============
-1.  Checkout closure-library, closure-compiler, closure-linter and python-gflags
-    next to libphonenumber:
-
-e.g.
-git clone https://github.com/googlei18n/libphonenumber/
-git clone https://github.com/google/closure-library/
-git clone https://github.com/google/closure-compiler.git
-svn checkout http://closure-linter.googlecode.com/svn/trunk/ ~/src/closure-linter
-svn checkout http://python-gflags.googlecode.com/svn/trunk/ ~/src/python-gflags
-
-(If you don't checkout the dependencies next to libphonenumber:
-a. change the path of the <script src=""> in the html pages to point to wherever
-   base.js is located
-b. update javascript/build.xml with the correct paths)
-
-2.  Run the unit tests to make sure everything is working. Open the following
-pages with your web browser:
-  javascript/i18n/phonenumbers/phonenumberutil_test.html
-  javascript/i18n/phonenumbers/asyoutypeformatter_test.html
-
-3.  Run the demo: javascript/i18n/phonenumbers/demo.html
-
-
-How to compile:
-===============
-1.  Build Closure's compiler.jar:
-
-e.g.
-ant -f ~/src/closure-compiler/build.xml
-
-2.  Compile the demo.js and all its dependencies to one file: demo-compiled.js:
-
-ant -f javascript/build.xml compile-demo
-
-3.  Run the compiled demo: javascript/i18n/phonenumbers/demo-compiled.html
-
-
-How to use:
-===========
-To use and compile the library in your own project, use the
-javascript/i18n/phonenumbers/demo.js as an example. You will need to
-goog.exportSymbol all the methods you use in your html so that the compiler
-won't rename them. You can then invoke the compiler similarly to how the
-compile-demo ant target in javascript/build.xml invokes it.
-
-
-How to update:
-==============
-The JavaScript library is ported from the Java implementation (revision 536).
-When the Java project gets updated follow these steps to update the JavaScript
-project:
-
-1.  If the protocol buffers (phonemetadata.proto and phonenumber.proto)
-    have changed:
-  a.  Manually update the .pb.js files with the changes of the .proto files.
-  b.  Manually update the toJsArray() Java methods in
-      tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataJsonFromXml.java
-  c.  Build tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-      by running:
-      mvn -f tools/java/java-build/pom.xml package
-
-2.  If the phone number metadata in the XML format has changed
-    (resources/PhoneNumberMetadata.xml)
-    run the following commands to regenerate metadata.js and
-    metadatafortesting.js:
-
-    ant -f java/build.xml build-js-metadata
-
-3.  Manually port any changes of the Java code to the JavaScript code:
-      PhoneNumberUtil.java => phonenumberutil.js
-      AsYouTypeFormatter.java => asyoutypeformatter.js
-      PhoneNumberUtilTest.java => phonenumberutil_test.js
-      AsYouTypeFormatterTest.java => asyoutypeformatter_test.js
-
-4.  Run the Closure Compiler to get your changes syntax and type checked.
-    This will also generate demo-compiled.js used by demo-compiler.html
-    (TODO: Use target "compile" rather than "compile-demo" once
-     visibility issues for getExtractedNationalPrefix_ have been resolved):
-
-    ant -f javascript/build.xml compile-demo
-
-5.  Run the Closure Linter to lint the JavaScript files:
-
-    ant -f javascript/build.xml lint
-
-
-TODO:
-=====
-Port functionality to extract phone-numbers from text (findNumbers).
-Port offline phone number geocoder.
-Enable PhoneNumberUtil to handle all digits, rather than a subset
-(JavaScript has no equivalent to the Java Character.digit).
-Port ShortNumberInfo.