gphone 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c4ba05b34d16b4da6ef784c35c47334ab5d34a
-  data.tar.gz: 5cb16f4316cac2fc44f2834993fd5aac40b71d77
+  metadata.gz: e9345357baa42222d0a0fb7a47dab16542f28013
+  data.tar.gz: c28779d3c930ad8788bd2daced1759809192b8f1
 SHA512:
-  metadata.gz: ec9eb157c6d46b9e138b20379e3207345bc69c2394c3f009236fc60a1d793d51eda3777e44fe30e8abacb29d543a463b06f5b7cc508fd040f94d332c1a19d1b2
-  data.tar.gz: 7ad1376290ac4dce79d040e6f0e7bc7743d17f7f9e580624dff17d799e4c7c905896666551f1c98587789ce342a56a2a19627b2793e433fc7d50e2f099a66640
+  metadata.gz: 802a4aa361f20e82dbd56b0406fac04e4a6f918161e3ff51213dcb68e454547eec5e228adb397c6b2b2b4778c62aea4d77c18706731cbc9e5fe9fd3d759d435a
+  data.tar.gz: da9d3e32e272f00c04a9867d029cb7ba69e285ff791bc589e23fb732d5d9a6ac1615f61c0b1c3e0c2db06f022de7a1ef604053d188515c6087008f1294a7f73e

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/ext/gphone/gphone.cc

@@ -3,6 +3,7 @@
 #include "rice/Data_Type.hpp"
 #include "rice/Constructor.hpp"
 #include <string>
+#include <iostream>
 #include <phonenumbers/phonenumberutil.h>
 #include <phonenumbers/phonenumbermatcher.h>
 
@@ -108,6 +109,55 @@ namespace {
       return formatted_number;
     }
 
+    const string national_prefix()
+    {
+      string region_code;
+      string national_prefix;
+
+      pu().GetRegionCodeForCountryCode(parsed_number.country_code(), &region_code);
+      pu().GetNddPrefixForRegion(region_code, true, &national_prefix);
+
+      return national_prefix;
+    }
+
+    const string area_code()
+    {
+      string area_code;
+      string national_significant_number;
+      string region_code;
+
+      pu().GetNationalSignificantNumber(parsed_number, &national_significant_number);
+      pu().GetRegionCodeForCountryCode(parsed_number.country_code(), &region_code);
+
+
+      int area_code_length = pu().GetLengthOfGeographicalAreaCode(parsed_number);
+
+      if (area_code_length > 0) {
+        area_code = national_significant_number.substr(0, area_code_length);
+      } else {
+        area_code = "";
+      }
+
+      return area_code;
+    }
+
+    const string subscriber_number()
+    {
+      string subscriber_number;
+      string national_significant_number;
+      pu().GetNationalSignificantNumber(parsed_number, &national_significant_number);
+
+      int area_code_length = pu().GetLengthOfGeographicalAreaCode(parsed_number);
+
+      if (area_code_length > 0) {
+        subscriber_number = national_significant_number.substr(area_code_length, string::npos);
+      } else {
+        subscriber_number = national_significant_number;
+      }
+
+      return subscriber_number;
+    }
+
     const string get_type()
     {
       switch(type) {

data/ext/gphone/gphone_ruby.cc

@@ -18,6 +18,9 @@ void Init_gphone() {
         .define_method("possible?", &GPhone::is_possible)
         .define_method("format_national", &GPhone::format_national)
         .define_method("normalize", &GPhone::normalize)
+        .define_method("national_prefix", &GPhone::national_prefix)
+        .define_method("area_code", &GPhone::area_code)
+        .define_method("subscriber_number", &GPhone::subscriber_number)
         .define_method("type", &GPhone::get_type);
 
       Class rb_cGPhoneOfflineGeocoder = define_class<GPhoneOfflineGeocoder>("GPhoneOfflineGeocoder")

data/gphone.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gphone 0.2.2 ruby ext
+# stub: gphone 0.3.0 ruby ext
 # stub: ext/gphone/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "gphone"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["ext"]
   s.authors = ["Tobias Begalke"]
-  s.date = "2015-10-05"
+  s.date = "2016-01-08"
   s.description = "ruby bindings for Google's libphonenumber (see http://code.google.com/p/libphonenumber/)"
   s.email = "tob@spyz.org"
   s.extensions = ["ext/gphone/extconf.rb"]

data/spec/gphone_spec.rb

@@ -21,6 +21,9 @@ describe "GPhone.new('+49 09131/76352435', 'DE') (ie. with a valid number)" do
   its(:national_number) { should == 913176352435 }
   its(:normalize) { should == '+49913176352435' }
   its(:format_national) { should == '09131 76352435' }
+  its(:area_code) { should == '9131' }
+  its(:subscriber_number) { should == '76352435' }
+  its(:national_prefix) { should == '0' }
   its(:type) { should == 'fixed line' }
 
 end
@@ -46,6 +49,9 @@ describe "GPhone.new('09131/76352435', 'DE') (with a valid number but sans count
   its(:national_number) { should == 913176352435 }
   its(:normalize) { should == '+49913176352435' }
   its(:format_national) { should == '09131 76352435' }
+  its(:area_code) { should == '9131' }
+  its(:subscriber_number) { should == '76352435' }
+  its(:national_prefix) { should == '0' }
   its(:type) { should == 'fixed line' }
 end
 
@@ -71,6 +77,9 @@ describe "GPhone.new('+499131/76352435') (with a valid number but sans country p
   its(:national_number) { should == 913176352435 }
   its(:normalize) { should == '+49913176352435' }
   its(:format_national) { should == '09131 76352435' }
+  its(:area_code) { should == '9131' }
+  its(:subscriber_number) { should == '76352435' }
+  its(:national_prefix) { should == '0' }
   its(:type) { should == 'fixed line' }
 end
 
@@ -101,6 +110,9 @@ describe "GPhone.new('+12069735100') (i.e. a fully qualified number)" do
   its(:national_number) { should == 2069735100 }
   its(:normalize) { should == '+12069735100' }
   its(:format_national) { should == '(206) 973-5100' }
+  its(:area_code) { should == '206' }
+  its(:subscriber_number) { should == '9735100' }
+  its(:national_prefix) { should == '1' }
   its(:type) { should == "unknown" }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gphone
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Begalke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice