gphone 0.1.0 → 0.2.0

data/Gemfile

@@ -1,18 +1,14 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
+gemspec
 gem 'rice'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-
 group :test do
  gem 'rake-compiler'
 end
 
 group :development do
+  gem "ruby-debug19"
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"

data/README.md

@@ -1,7 +1,8 @@
 gphone
 ======
 
-Ruby bindings to Google's libphonenumber. With gphone you can parse,
+Ruby bindings to Google's libphonenumber
+(http://code.google.com/p/libphonenumber/). With gphone you can parse,
 validate and normalize and format phone numbers and determine their
 type. So far this library offers only very basic coverage of the
 features the C++ library offers.
@@ -9,6 +10,8 @@ features the C++ library offers.
 Usage
 -----
 
+**GPhone**
+
 ```ruby
 require 'gphone'
 
@@ -28,8 +31,45 @@ ph.format_national
 
 ph.type
 > "fixed line"
+
+ph.raw_number
+> "+49 09131/76352435"
+
+ph.country_code
+> 'DE'
+
+ph.numeric_country_code
+> 49
+
+ph.national_number
+> 913176352435
+```
+
+**GPhoneOfflineGeocoder**
+
+
+```ruby
+
+geocoder = GPhoneOfflineGeocoder.new()
+
+gastgeocoder.get_location_for_number('12063554274')
+> "Washington"
+
 ```
 
+**GPhoneNumberMatcher**
+
+
+```ruby
+
+m = GPhoneNumberMatcher.new('Hier steht eine Nummer: 0211/543235-3, und hier noch eine: +1 213 542 8427.', 'DE')
+m.numbers
+> ["0211/543235-3", "+1 213 542 8427"]
+
+
+```
+
+
 
 Contribute
 ----------

data/Rakefile

@@ -12,7 +12,7 @@ end
 require 'rake'
 
 require 'jeweler'
-Jeweler::Tasks.new do |gem|
+jeweler_tasks = Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "gphone"
   gem.homepage = "http://github.com/elcamino/gphone"
@@ -23,8 +23,14 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Tobias Begalke"]
   gem.files += Dir['ext/gphone/*.{cc,rb}']
   gem.require_paths = ['ext']
+	gem.platform = Gem::Platform::RUBY
+	gem.extensions = FileList["ext/gphone/extconf.rb"]
   # dependencies defined in Gemfile
 end
+
+$gemspec = jeweler_tasks.gemspec
+$gemspec.version = jeweler_tasks.jeweler.version
+
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
@@ -39,6 +45,7 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
+task :rebuild => [:clean, :clobber, :compile, :spec]
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
@@ -51,4 +58,26 @@ Rake::RDocTask.new do |rdoc|
 end
 
 require 'rake/extensiontask'
-Rake::ExtensionTask.new('gphone')
+Gem::PackageTask.new($gemspec) do |pkg|
+	pkg.need_tar = false
+	pkg.need_zip = false
+end
+
+Rake::ExtensionTask.new('gphone', $gemspec) do |ext|
+end
+
+CLEAN.include 'lib/**/*.so'
+
+Rake::Task.tasks.each do |task_name|
+  case task_name.to_s
+    when /^native/
+       task_name.prerequisites.unshift("fix_rake_compiler_gemspec_dump")
+   end
+end
+
+task :fix_rake_compiler_gemspec_dump do
+   %w{files extra_rdoc_files test_files}.each do |accessor|
+     $gemspec.send(accessor).instance_eval { @exclude_procs = Array.new }
+   end
+end
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/ext/gphone/Makefile

@@ -12,12 +12,12 @@ ECHO = $(ECHO1:0=@echo)
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /usr/local/rvm/rubies/ruby-1.9.3-p327/include/ruby-1.9.1
-hdrdir = /usr/local/rvm/rubies/ruby-1.9.3-p327/include/ruby-1.9.1
-arch_hdrdir = /usr/local/rvm/rubies/ruby-1.9.3-p327/include/ruby-1.9.1/$(arch)
+topdir = /usr/local/rvm/rubies/ruby-1.9.3-p392/include/ruby-1.9.1
+hdrdir = /usr/local/rvm/rubies/ruby-1.9.3-p392/include/ruby-1.9.1
+arch_hdrdir = /usr/local/rvm/rubies/ruby-1.9.3-p392/include/ruby-1.9.1/$(arch)
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
 
-prefix = $(DESTDIR)/usr/local/rvm/rubies/ruby-1.9.3-p327
+prefix = $(DESTDIR)/usr/local/rvm/rubies/ruby-1.9.3-p392
 
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 
@@ -61,7 +61,7 @@ localstatedir = $(prefix)/var
 
 sharedstatedir = $(prefix)/com
 
-sysconfdir = $(prefix)/etc
+sysconfdir = $(DESTDIR)/etc
 
 datadir = $(datarootdir)
 
@@ -92,8 +92,8 @@ CC = gcc
 CXX = g++
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -Wl,-R -Wl,/usr/local/rvm/rubies/ruby-1.9.3-p327/lib -L/usr/local/rvm/rubies/ruby-1.9.3-p327/lib -lruby-static
+LIBRUBYARG_SHARED = '-Wl,-rpath,$${ORIGIN}/../lib' -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = '-Wl,-rpath,${ORIGIN}/../lib' -Wl,-R -Wl,/usr/local/rvm/rubies/ruby-1.9.3-p392/lib -L/usr/local/rvm/rubies/ruby-1.9.3-p392/lib -lruby-static
 empty =
 OUTFLAG = -o $(empty)
 COUTFLAG = -o $(empty)
@@ -103,12 +103,12 @@ cflags   =  $(optflags) $(debugflags) $(warnflags)
 optflags = -O3
 debugflags = -ggdb
 warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
-CFLAGS   = -fPIC -I/usr/local/rvm/usr/include -fPIC $(ARCH_FLAG)
+CFLAGS   = -fPIC $(cflags)  -fPIC $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS =   $(DEFS) $(cppflags)  -I/usr/local/rvm/gems/ruby-1.9.3-p327/gems/rice-1.4.3/ruby/lib/include
+CPPFLAGS =   $(DEFS) $(cppflags)  -I/usr/local/rvm/gems/ruby-1.9.3-p392/gems/rice-1.6.0/ruby/lib/include
 CXXFLAGS = $(CFLAGS)  -Wall -g
-ldflags  = -L. -L/usr/local/rvm/usr/lib -rdynamic -Wl,-export-dynamic  -L/usr/local/rvm/gems/ruby-1.9.3-p327/gems/rice-1.4.3/ruby/lib/lib
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic  -L/usr/local/rvm/gems/ruby-1.9.3-p392/gems/rice-1.6.0/ruby/lib/lib -lrice
 dldflags = 
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
@@ -123,7 +123,7 @@ RUBY_SO_NAME = ruby
 arch = x86_64-linux
 sitearch = $(arch)
 ruby_version = 1.9.1
-ruby = /usr/local/rvm/rubies/ruby-1.9.3-p327/bin/ruby
+ruby = /usr/local/rvm/rubies/ruby-1.9.3-p392/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
@@ -154,9 +154,9 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = -lphonenumber -lboost_thread -lrice -Wl,-R -Wl,/usr/local/rvm/rubies/ruby-1.9.3-p327/lib -L/usr/local/rvm/rubies/ruby-1.9.3-p327/lib -lruby -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = gphone.cc
-OBJS = gphone.o
+LIBS = -lgeocoding -lphonenumber -lboost_thread '-Wl,-rpath,${ORIGIN}/../lib' -Wl,-R -Wl,/usr/local/rvm/rubies/ruby-1.9.3-p392/lib -L/usr/local/rvm/rubies/ruby-1.9.3-p392/lib -lruby -lpthread -lrt -ldl -lcrypt -lm   -lc
+SRCS = gphone.cc gphone_number_matcher.cc gphone_offline_geocoder.cc gphone_ruby.cc
+OBJS = gphone.o gphone_number_matcher.o gphone_offline_geocoder.o gphone_ruby.o
 TARGET = gphone
 DLLIB = $(TARGET).so
 EXTSTATIC = 
@@ -178,11 +178,12 @@ static: $(STATIC_LIB)
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-rb
 
+clean-static::
 clean-rb-default::
 clean-rb::
 clean-so::
-clean: clean-so clean-rb-default clean-rb
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+clean: clean-so clean-static clean-rb-default clean-rb
+		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
 
 distclean-rb-default::
 distclean-rb::

data/ext/gphone/extconf.rb

@@ -2,6 +2,5 @@ require 'mkmf-rice'
 
 have_library('boost_thread')
 have_library('phonenumber')
+have_library('geocoding')
 create_makefile('gphone')
-
-

data/ext/gphone/gphone.cc

@@ -10,38 +10,70 @@ using namespace std;
 using namespace i18n::phonenumbers;
 using namespace Rice;
 
+#ifndef GPHONE_CLASS
+#define GPHONE_CLASS
+
 namespace {
   class GPhoneException
     : public exception
   {
+    PhoneNumberUtil::ErrorType errorType;
+    string message;
+
+    #define DEFAULT_MESSAGE "Not a valid phone number!";
+
+  public:
+    GPhoneException() {
+      message = DEFAULT_MESSAGE;
+    }
+
+    GPhoneException(PhoneNumberUtil::ErrorType e) {
+      errorType = e;
+
+      message = DEFAULT_MESSAGE;
+    }
+
     virtual const char* what() const throw()
     {
-      return "Not a valid phone number!";
+      return message.c_str();
+    }
+
+    virtual ~GPhoneException() throw() {
+
     }
   };
 
   class GPhone {
     string raw_number;
-    string country_code;
+    string iso_country_code;
     PhoneNumber parsed_number;
     PhoneNumberUtil::PhoneNumberType type;
 
   public:
 
-    GPhone(const string number, const string cc) {
+    GPhone(const string number, const string cc = "ZZ") {
       raw_number = number;
-      country_code = cc;
 
-      if (pu().Parse(raw_number, country_code, &parsed_number) != pu().NO_PARSING_ERROR) {
-        throw GPhoneException();
+      PhoneNumberUtil::ErrorType er = pu().Parse(raw_number, iso_country_code, &parsed_number);
+
+      if (er != pu().NO_PARSING_ERROR) {
+        throw GPhoneException(er);
       }
 
+      if (cc != "ZZ") {
+	iso_country_code = cc;
+      } else {
+	pu().GetRegionCodeForNumber(parsed_number, &iso_country_code);
+      }
+     
       type = pu().GetNumberType(parsed_number);
 
     }
 
     string get_raw_number() { return raw_number; }
-    string get_country_code() { return country_code; }
+    string get_iso_country_code() { return iso_country_code; }
+    uint64 get_national_number() { return parsed_number.national_number(); }
+    int32 get_numeric_country_code() { return parsed_number.country_code(); }
 
     PhoneNumberUtil& pu() {
       return *PhoneNumberUtil::GetInstance();
@@ -52,14 +84,17 @@ namespace {
       string formatted_number;
       pu().Format(parsed_number, PhoneNumberUtil::E164, &formatted_number);
       return formatted_number;
-    }
-
+    }    
 
     bool is_valid()
     {
       return pu().IsValidNumber(parsed_number);
     }
 
+    bool is_valid_for_region(const string region_code) {
+      return pu().IsValidNumberForRegion(parsed_number, region_code);
+    }
+
     bool is_possible()
     {
       return pu().IsPossibleNumber(parsed_number);
@@ -96,27 +131,10 @@ namespace {
       case PhoneNumberUtil::VOICEMAIL:
         return "voicemail";
       default:
-        return NULL;
+        return "unknown";
       }
     }
   };
 
 }
-extern "C"
-
-void Init_gphone() {
-  RUBY_TRY
-    {
-      Class rb_cGPhone = define_class<GPhone>("GPhone")
-        .define_constructor(Constructor<GPhone, const string, const string>())
-        .define_method("raw_number", &GPhone::get_raw_number)
-        .define_method("country_code", &GPhone::get_country_code)
-        .define_method("valid?", &GPhone::is_valid)
-        .define_method("possible?", &GPhone::is_possible)
-        .define_method("format_national", &GPhone::format_national)
-        .define_method("normalize", &GPhone::normalize)
-        .define_method("type", &GPhone::get_type);
-    }
-  RUBY_CATCH
-}
-
+#endif

data/ext/gphone/gphone_number_matcher.cc

@@ -0,0 +1,45 @@
+#include "rice/Class.hpp"
+#include "rice/String.hpp"
+#include "rice/Array.hpp"
+#include "rice/Data_Type.hpp"
+#include "rice/Constructor.hpp"
+#include <string>
+#include <phonenumbers/phonenumberutil.h>
+#include <phonenumbers/phonenumbermatcher.h>
+#include <phonenumbers/phonenumbermatch.h>
+
+using namespace std;
+using namespace i18n::phonenumbers;
+using namespace Rice;
+
+#ifndef GPHONE_NUMBER_MATCHER_CLASS
+#define GPHONE_NUMBER_MATCHER_CLASS
+
+namespace {
+
+
+  class GPhoneNumberMatcher {
+    string raw_text;
+    string country_code;
+    Array matches;
+
+  public:
+
+    GPhoneNumberMatcher(const string text, const string cc) {
+      PhoneNumberMatcher matcher(text, cc);
+      PhoneNumberMatch m;
+
+      while (matcher.HasNext()) {
+
+        matcher.Next(&m);
+        matches.push(String(m.raw_string()));
+      }
+    }
+
+    Array numbers() {
+      return matches;
+    }
+  };
+}
+
+#endif

data/ext/gphone/gphone_offline_geocoder.cc

@@ -0,0 +1,41 @@
+#include "rice/Class.hpp"
+#include "rice/String.hpp"
+#include "rice/Data_Type.hpp"
+#include "rice/Constructor.hpp"
+#include <string>
+#include <phonenumbers/phonenumberutil.h>
+#include <phonenumbers/phonenumbermatcher.h>
+#include <phonenumbers/geocoding/phonenumber_offline_geocoder.h>
+
+using namespace std;
+using namespace i18n::phonenumbers;
+using namespace Rice;
+
+#ifndef GPHONEOFFLINEGEOCODER_CLASS
+#define GPHONEOFFLINEGEOCODER_CLASS
+
+namespace {
+  class GPhoneOfflineGeocoder {
+    PhoneNumberOfflineGeocoder geocoder;
+
+  public:
+    GPhoneOfflineGeocoder() {
+
+    }
+
+    string get_location_for_number(string number, string locale = "en_US", string user_region = "US") {
+      const PhoneNumberUtil& pu = *PhoneNumberUtil::GetInstance();
+
+      PhoneNumber pn;
+      const PhoneNumberUtil::ErrorType status = pu.Parse(number, user_region, &pn);
+
+      assert(status == PhoneNumberUtil::NO_PARSING_ERROR);
+
+      const string description = geocoder.GetDescriptionForNumber(pn, icu::Locale(locale.c_str()), user_region);
+  
+      return description;
+    }
+  };
+}
+
+#endif

data/ext/gphone/gphone_ruby.cc

@@ -0,0 +1,32 @@
+#include "gphone.cc"
+#include "gphone_offline_geocoder.cc"
+#include "gphone_number_matcher.cc"
+
+extern "C"
+
+void Init_gphone() {
+  RUBY_TRY
+    {
+      Class rb_cGPhone = define_class<GPhone>("GPhone")
+        .define_constructor(Constructor<GPhone, const string, const string>(), (Arg("number"), Arg("country_code") = (string) "ZZ"))
+        .define_method("raw_number", &GPhone::get_raw_number)
+        .define_method("country_code", &GPhone::get_iso_country_code)
+        .define_method("numeric_country_code", &GPhone::get_numeric_country_code)
+        .define_method("national_number", &GPhone::get_national_number)
+        .define_method("valid?", &GPhone::is_valid)
+        .define_method("valid_for_region?", &GPhone::is_valid_for_region)
+        .define_method("possible?", &GPhone::is_possible)
+        .define_method("format_national", &GPhone::format_national)
+        .define_method("normalize", &GPhone::normalize)
+        .define_method("type", &GPhone::get_type);
+
+      Class rb_cGPhoneOfflineGeocoder = define_class<GPhoneOfflineGeocoder>("GPhoneOfflineGeocoder")
+        .define_constructor(Constructor<GPhoneOfflineGeocoder>())
+        .define_method("get_location_for_number", &GPhoneOfflineGeocoder::get_location_for_number, (Arg("number"), Arg("locale") = (string) "en_US", Arg("user_region") = (string) "US"));
+
+      Class rb_cGPhoneNumberMatcher = define_class<GPhoneNumberMatcher>("GPhoneNumberMatcher")
+        .define_constructor(Constructor<GPhoneNumberMatcher, const string, const string>())
+        .define_method("numbers", &GPhoneNumberMatcher::numbers);
+    }
+  RUBY_CATCH
+}

data/gphone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gphone"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Begalke"]
-  s.date = "2012-11-14"
+  s.date = "2014-02-12"
   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"]
@@ -28,41 +28,139 @@ Gem::Specification.new do |s|
     "ext/gphone/Makefile",
     "ext/gphone/extconf.rb",
     "ext/gphone/gphone.cc",
+    "ext/gphone/gphone_number_matcher.cc",
+    "ext/gphone/gphone_offline_geocoder.cc",
+    "ext/gphone/gphone_ruby.cc",
     "gphone.gemspec",
+    "spec/gphone_number_matcher_spec.rb",
+    "spec/gphone_offline_geocoder_spec.rb",
     "spec/gphone_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/elcamino/gphone"
   s.licenses = ["BSD"]
   s.require_paths = ["ext"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "ruby bindings for Google's libphonenumber"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<gphone>, [">= 0"])
       s.add_runtime_dependency(%q<rice>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
+      s.add_dependency(%q<gphone>, [">= 0"])
       s.add_dependency(%q<rice>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<gphone>, [">= 0"])
     s.add_dependency(%q<rice>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/spec/gphone_number_matcher_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "GPhoneNumberMatcher" do
+  subject { GPhoneNumberMatcher.new('Hier steht eine Nummer: 0211/543235-3, und hier noch eine: +1 213 542 8427.', 'DE') }
+
+  it { should be }
+  it { should be_an_instance_of GPhoneNumberMatcher }
+  it "should return both numbers in the given text" do
+    subject.numbers.should == ["0211/543235-3", "+1 213 542 8427"]
+  end
+end

data/spec/gphone_offline_geocoder_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "GPhoneOfflineGeocoder.new()" do
+  subject { GPhoneOfflineGeocoder.new() }
+
+  it { should be }
+  it { should be_an_instance_of GPhoneOfflineGeocoder }
+  it "should return locations for numbers" do
+    subject.get_location_for_number("12063554274").should == "Washington"
+  end
+end

data/spec/gphone_spec.rb

@@ -7,9 +7,18 @@ describe "GPhone.new('+49 09131/76352435', 'DE') (ie. with a valid number)" do
 
   it { should be_an_instance_of GPhone }
   its(:valid?) { should be }
+  it "should be valid for region 'DE'" do
+    subject.valid_for_region?('DE').should be
+  end
+
+  it "should not be valid for region 'US'" do
+    subject.valid_for_region?('US').should_not be
+  end
   its(:possible?) { should be }
   its(:raw_number) { should == '+49 09131/76352435' }
   its(:country_code) { should == 'DE' }
+  its(:numeric_country_code) { should == 49 }
+  its(:national_number) { should == 913176352435 }
   its(:normalize) { should == '+49913176352435' }
   its(:format_national) { should == '09131 76352435' }
   its(:type) { should == 'fixed line' }
@@ -20,3 +29,30 @@ end
 describe "GPhone.new('09543657 4567474567 4674', 'DE') (ie. with an invalid number)" do
   it { lambda { GPhone.new('09543657 4567474567 4674', 'DE') }.should raise_error }
 end
+
+describe "GPhone.new('+12069735100') (i.e. a fully qualified number)" do
+  subject { GPhone.new('+12069735100') }
+
+  it { should be }
+
+  it { should be_an_instance_of GPhone }
+  its(:valid?) { should be }
+  it "should not be valid for region 'DE'" do
+    subject.valid_for_region?('DE').should_not be
+  end
+
+  it "should be valid for region 'US'" do
+    subject.valid_for_region?('US').should be
+  end
+  its(:possible?) { should be }
+  its(:country_code) { should == 'US' }
+  its(:numeric_country_code) { should == 1 }
+  its(:national_number) { should == 2069735100 }
+  its(:normalize) { should == '+12069735100' }
+  its(:format_national) { should == '(206) 973-5100' }
+  its(:type) { should == "unknown" }
+end
+
+describe "GPhone.new('12345234') (ie. with an invalid number)" do
+  it { lambda { GPhone.new('12345234') }.should raise_error }
+end

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'gphone'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gphone
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gphone
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,486 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ruby bindings for Google's libphonenumber (see http://code.google.com/p/libphonenumber/)
 email: tob@spyz.org
 executables: []
@@ -126,7 +622,12 @@ files:
 - ext/gphone/Makefile
 - ext/gphone/extconf.rb
 - ext/gphone/gphone.cc
+- ext/gphone/gphone_number_matcher.cc
+- ext/gphone/gphone_offline_geocoder.cc
+- ext/gphone/gphone_ruby.cc
 - gphone.gemspec
+- spec/gphone_number_matcher_spec.rb
+- spec/gphone_offline_geocoder_spec.rb
 - spec/gphone_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/elcamino/gphone
@@ -144,7 +645,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1938156335739255995
+      hash: 2453741018466773048
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +654,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ruby bindings for Google's libphonenumber