phonelib 0.6.3 → 0.6.4

data/data/libphonenumber/tools/java/cpp-build/pom.xml

@@ -54,28 +54,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Invoke Protocol Buffers compiler to generate Phonemetadata.java. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.4.0</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <executable>protoc</executable>
-          <arguments>
-            <argument>--javanano_out=java_package=phonemetadata.proto|com.google.i18n.phonenumbers.nano:../../../java/libphonenumber/src</argument>
-            <argument>../../../resources/phonemetadata.proto</argument>
-            <argument>--proto_path=../../../resources</argument>
-          </arguments>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -118,12 +96,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>protobuf-java-lib</id>
-      <url>file://${project.basedir}/../../../java/lib</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -132,9 +104,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <groupId>com.google.protobuf.nano</groupId>
+      <artifactId>protobuf-javanano</artifactId>
+      <!-- If updating the version, see instructions in java/lib/protobuf-javanano-readme.md. -->
+      <version>3.0.0-alpha-7</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/tools/java/java-build/pom.xml

@@ -103,12 +103,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>protobuf-java-lib</id>
-      <url>file://${project.basedir}/../../../java/lib</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -117,9 +111,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <groupId>com.google.protobuf.nano</groupId>
+      <artifactId>protobuf-javanano</artifactId>
+      <!-- If updating the version, see instructions in java/lib/protobuf-javanano-readme.md. -->
+      <version>3.0.0-alpha-7</version>
     </dependency>
   </dependencies>
 

data/lib/phonelib/phone.rb

@@ -36,7 +36,7 @@ module Phonelib
     # @return [String] Sanitized phone number
     def sanitized
       @sanitized = if Phonelib.strict_check
-                     @original
+                     @original || ''
                    else
                      @original && @original.gsub(/[^0-9]+/, '') || ''
                    end

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -332,6 +332,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/376_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/382_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/387_en
@@ -384,10 +385,14 @@ files:
 - 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
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en
@@ -399,6 +404,7 @@ files:
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en
+- data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_ar
 - data/libphonenumber/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/965_en
@@ -999,10 +1005,9 @@ files:
 - data/libphonenumber/java/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PhonePrefixMapTest.java
 - data/libphonenumber/java/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReaderTest.java
 - data/libphonenumber/java/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMapTest.java
-- data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
-- data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
-- data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml
 - data/libphonenumber/java/lib/junit-4.8.1.jar
+- data/libphonenumber/java/lib/protobuf-javanano-3.0.0-alpha-7.jar
+- data/libphonenumber/java/lib/protobuf-javanano-readme.md
 - data/libphonenumber/java/libphonenumber/pom.xml
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java
 - data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -1555,7 +1560,6 @@ 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/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java
@@ -1604,7 +1608,6 @@ 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/pending_code_changes.txt
 - data/libphonenumber/java/pom.xml
 - data/libphonenumber/java/release_notes.txt
@@ -1735,6 +1738,7 @@ files:
 - data/libphonenumber/resources/carrier/en/376.txt
 - data/libphonenumber/resources/carrier/en/380.txt
 - data/libphonenumber/resources/carrier/en/381.txt
+- data/libphonenumber/resources/carrier/en/382.txt
 - data/libphonenumber/resources/carrier/en/385.txt
 - data/libphonenumber/resources/carrier/en/386.txt
 - data/libphonenumber/resources/carrier/en/387.txt
@@ -1801,6 +1805,7 @@ files:
 - data/libphonenumber/resources/carrier/en/960.txt
 - data/libphonenumber/resources/carrier/en/961.txt
 - data/libphonenumber/resources/carrier/en/962.txt
+- data/libphonenumber/resources/carrier/en/963.txt
 - data/libphonenumber/resources/carrier/en/964.txt
 - data/libphonenumber/resources/carrier/en/965.txt
 - data/libphonenumber/resources/carrier/en/966.txt
@@ -1825,6 +1830,10 @@ files:
 - data/libphonenumber/resources/carrier/fa/98.txt
 - data/libphonenumber/resources/carrier/ru/374.txt
 - data/libphonenumber/resources/carrier/ru/375.txt
+- data/libphonenumber/resources/carrier/zh/852.txt
+- data/libphonenumber/resources/carrier/zh/86.txt
+- data/libphonenumber/resources/carrier/zh_Hant/852.txt
+- data/libphonenumber/resources/carrier/zh_Hant/86.txt
 - data/libphonenumber/resources/geocoding/am/374.txt
 - data/libphonenumber/resources/geocoding/ar/82.txt
 - data/libphonenumber/resources/geocoding/ar/966.txt
@@ -2099,7 +2108,8 @@ post_install_message: |2
       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!
-rdoc_options: []
+rdoc_options:
+- " --no-private - CHANGELOG.md --readme README.md"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-java</artifactId>
-  <version>2.6.1</version>
-  <description>POM was created from install:install-file</description>
-</project>

data/data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-java</artifactId>
-  <versioning>
-    <release>2.6.1</release>
-    <versions>
-      <version>2.6.1</version>
-    </versions>
-    <lastUpdated>20151102180249</lastUpdated>
-  </versioning>
-</metadata>