dialable 0.1.1 → 0.5.0

data/dialable.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
+  s.licenses = ['MIT', 'LGPL-2']
   s.name     = "dialable"
-  s.version  = "0.1.1"
-  s.date     = "2010-06-28"
+  s.version  = "0.5.0"
+  s.date     = "2011-06-22"
   s.summary  = "Provides parsing and output of phone numbers according to NANPA standards."
   s.email    = "chorn@chorn.com"
   s.homepage = "http://github.com/chorn/dialable"
@@ -14,12 +15,10 @@ Gem::Specification.new do |s|
                  "TODO",
                  "dialable.gemspec",
                  "lib/dialable.rb",
-                 "script/destroy",
-                 "script/generate",
+                 "data/nanpa.yaml",
                  "spec/dialable_spec.rb",
                  "spec/spec_helper.rb",
-                 "support/make_yaml_nanpa.rb",
-                 "support/nanpa.yaml",
+                 "support/make_yaml_nanpa.rb"
                  ]
   s.test_files = []
   s.rdoc_options = []

data/lib/dialable.rb

@@ -1,9 +1,9 @@
-# Copyright (c) 2008-2010 Chris Horn http://chorn.com/
+# Copyright (c) 2008-2011 Chris Horn http://chorn.com/
 # See MIT-LICENSE.txt
 
-# TODO: Make this less sucky.
-
 require "yaml"
+require "tzinfo"
+require 'rubygems'
 
 module Dialable
   class NANP
@@ -29,7 +29,7 @@ module Dialable
     end
 
     ##
-    # Regex's to match valid phone numbers
+    # Regexs to match valid phone numbers
     module Patterns
       VALID = [
         /^\D*1?\D*([2-9]\d\d)\D*(\d{3})\D*(\d{4})\D*[ex]+\D*(\d{1,5})\D*$/i,
@@ -44,10 +44,12 @@ module Dialable
     ##
     # Valid area codes per nanpa.com
     module AreaCodes
-      NANP = YAML.load_file(File.dirname(__FILE__) + "/../support/nanpa.yaml")
+      data_path = Gem::datadir('dialable')
+      data_path ||= File.join(File.dirname(__FILE__), '..', 'data')
+      NANP = YAML.load_file(data_path + "/nanpa.yaml")
     end
     
-    attr_accessor :areacode, :prefix, :line, :extension, :location, :country, :timezones, :relative_timezones
+    attr_accessor :areacode, :prefix, :line, :extension, :location, :country, :timezones, :relative_timezones, :raw_timezone
     
     def initialize(parts={})
       self.areacode  = parts[:areacode]  ? parts[:areacode]  : nil
@@ -62,13 +64,14 @@ module Dialable
         @areacode = raw_code
         self.location = AreaCodes::NANP[code][:location] if AreaCodes::NANP[code][:location]
         self.country = AreaCodes::NANP[code][:country] if AreaCodes::NANP[code][:country]
+        self.raw_timezone = AreaCodes::NANP[code][:timezone] if AreaCodes::NANP[code][:timezone]
 
         if AreaCodes::NANP[code][:timezone]
           self.timezones = []
           self.relative_timezones = []
           tz = AreaCodes::NANP[code][:timezone]
-          t = Time.now
-          local_utc_offset = t.utc_offset/3600
+          now = Time.now
+          local_utc_offset = now.utc_offset/3600
 
           if tz =~ /UTC(-\d+)/
             self.timezones << tz
@@ -78,7 +81,7 @@ module Dialable
             tz.split(//).each do |zone|  # http://www.timeanddate.com/library/abbreviations/timezones/na/
               zone = "HA" if zone == "H"
               zone = "AK" if zone == "K"
-              tz = zone + (t.dst? ? "D" : "S") + "T"  # This is cludgey
+              tz = zone + (now.dst? ? "D" : "S") + "T"  # This is cludgey
               self.timezones << tz
               delta = nil
               if Time.zone_offset(tz)
@@ -94,7 +97,7 @@ module Dialable
                 when /HA?[SD]T/
                   delta = -10 - local_utc_offset
                 end
-                delta = delta - 1 if t.dst?
+                delta = delta - 1 if delta and now.dst?
               end
               # puts "#{delta} // #{Time.zone_offset(tz)} // #{tz} // #{local_utc_offset}"
               self.relative_timezones << delta if delta
@@ -121,7 +124,6 @@ module Dialable
     #   end
     #   rt
     # end
-    
 
     def self.parse(number)
       Patterns::VALID.each do |pattern|

data/spec/dialable_spec.rb

@@ -1,7 +1,40 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "dialable" do
-  it "should do nothing" do
-    true.should == true
+describe Dialable do
+  describe "with a full NANP number with extension" do
+    subject { Dialable::NANP.parse("+1(307)555-1212 ext 1234") }
+    
+    it("should extract the area code") { subject.areacode.should == "307" }
+    it("should extract the prefix") { subject.prefix.should == "555" }
+    it("should extract the line number") { subject.line.should == "1212" }
+    it("should extract the extension") { subject.extension.should == "1234" }
+    it("should determine the time zone") { subject.timezones.should == ["MDT"] }
   end
+
+  NANP = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'data') + "/nanpa.yaml")
+  NANP.delete(:created)
+  NANP.each do |nanp|
+    areacode = nanp[0]
+    describe "recognize the area code #{areacode} in ()'s" do
+      subject { Dialable::NANP.parse("(#{areacode})5551212") }
+      it("should extract the area code") { subject.areacode.should == areacode.to_s }
+    end
+    describe "recognize the area code #{areacode} with garbage" do
+      subject { Dialable::NANP.parse("noise #{areacode}noise5551212") }
+      it("should extract the area code") { subject.areacode.should == areacode.to_s }
+    end
+    describe "with a sloppy areacode of #{areacode} and number" do
+      subject { Dialable::NANP.parse("+1-#{areacode}555  1212") }
+      it("should match the location") { subject.location.should == nanp[1][:location] }
+    end
+    describe "with areacode of #{areacode} and a sloppy extension" do
+      subject { Dialable::NANP.parse("1 #{areacode} 867 5309 xAAA0001") }
+      it("should match the country") { subject.country.should == nanp[1][:country] }
+    end
+    describe "with areacode of #{areacode} and lots of garbage" do
+      subject { Dialable::NANP.parse("1 #{areacode}yadayada867BLAH5309....derp") }
+      it("should match the timezone") { subject.raw_timezone.should == nanp[1][:timezone] }
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,2 +1,7 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require "rubygems"
+require "dialable"
+
+RSpec.configure do |config|
+end

data/support/make_yaml_nanpa.rb

@@ -11,19 +11,24 @@ system('mdb-export AllNPAs.mdb "`mdb-tables -1 AllNPAs.mdb`" > AllNPAs.csv')
 all = CSV.read("AllNPAs.csv")
 h = all[0]
 
+in_service = h.index("In Service?")
+location   = h.index("Location")
+country    = h.index("Country")
+tz         = h.index("Time Zone")
+npa        = h.index("NPA")
+
 nanpa = { :created => Time.now }
 
 all.each do |row|
-  next unless row[h.index("In Service?")] == "Yes"
-  areacode = row.values_at(h.index("NPA")).to_s.to_i
+  next unless row[in_service] == "Yes"
+  areacode = row[npa].to_s.to_i
   nanpa[areacode] = {}
-  nanpa[areacode][:location] = row.values_at(h.index("Location")).to_s if row.values_at(h.index("Location")).to_s.size > 0 and row.values_at(h.index("Location")).to_s.size =~ /NANP area/
-  nanpa[areacode][:country] = row.values_at(h.index("Country")).to_s if row.values_at(h.index("Country")).to_s.size > 0
-  nanpa[areacode][:timezone] = row.values_at(h.index("Time Zone")).to_s if row.values_at(h.index("Time Zone")).to_s.size > 0
+  nanpa[areacode][:country] = row[country].to_s if row[country].to_s.size > 0
+  nanpa[areacode][:timezone] = row[tz].to_s if row[tz].to_s.size > 0
+  nanpa[areacode][:location] = row[location].to_s if row[location].to_s.size > 0 and row[location].to_s !~ /NANP Area/i and row[location].to_s !~ /^#{row[country].to_s}$/i 
 end
 
 puts nanpa.to_yaml
 
 FileUtils.rm ["AllNPAs.zip", "AllNPAs.mdb", "AllNPAs.csv"]
 
-

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dialable
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chris Horn
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -04:00
-default_executable: 
+date: 2011-06-22 00:00:00 Z
 dependencies: []
 
 description: A gem that provides parsing and output of phone numbers according to NANPA (North American Numbering Plan Administration) standards.  If possible, time zones are populated by abbreviation as well as offset relative to the local timezone.
@@ -34,16 +28,14 @@ files:
 - TODO
 - dialable.gemspec
 - lib/dialable.rb
-- script/destroy
-- script/generate
+- data/nanpa.yaml
 - spec/dialable_spec.rb
 - spec/spec_helper.rb
 - support/make_yaml_nanpa.rb
-- support/nanpa.yaml
-has_rdoc: true
 homepage: http://github.com/chorn/dialable
-licenses: []
-
+licenses: 
+- MIT
+- LGPL-2
 post_install_message: 
 rdoc_options: []
 
@@ -54,23 +46,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Provides parsing and output of phone numbers according to NANPA standards.

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:newgem_simple, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)