phone_wrangler 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/phone_wrangler.rb

@@ -21,6 +21,20 @@ module PhoneWrangler
       @@default_area_code
     end
 
+    @@formats = {
+            :us => "%c (%a) %m-%p x %x",
+            :us_short => "(%a) %m-%p",
+            :nanp_short => "(%a) %m-%p"
+    }
+
+    @@pattern_map = {
+            /%c/ => :country_code,
+            /%a/ => :area_code,
+            /%p/ => :prefix,
+            /%n/ => :number,
+            /%e/ => :extension
+    }
+
     #-------------------args-----------------------------------------
     def initialize(args='')
       @original = args
@@ -58,15 +72,31 @@ module PhoneWrangler
       end
     end
 
+    def empty?
+      answer = true
+      NUMBER_PARTS.each do |field|
+        if self.respond_to?(field)
+          field_val = self.send(field)
+          answer = answer && (field_val.nil? || field_val.empty?)
+        end
+      end
+      return answer
+    end
+
     #------------------------------------------------------------
-    def to_s(format = nil)
-      if format.nil?
-        format = ''
+    def to_s(format = '')
+      return '' if self.empty?
+
+      case format
+      when Symbol
+        format = @@formats[format]
+      when ''
         format += "(%a) " unless area_code.nil? or area_code.empty?
         format += "%p-" unless prefix.nil? or prefix.empty?
         format += "%n" unless number.nil? or number.empty?
         format += " x%e" unless extension.nil? or extension.empty?
       end
+
       format_number(format)
     end
 
@@ -75,7 +105,7 @@ module PhoneWrangler
     end
 
     # TODO: Should #digits method include the extension digits at all?  Probably not
-    # with an 'x' anyway.
+    # with an 'x', anyway.
     def digits
       digitstring = ''
       [:area_code, :prefix, :number].each {|part|
@@ -95,15 +125,18 @@ module PhoneWrangler
     #   my $us_phone_regex = '1?\s*\W\s*([2-9][0-8][0-9])\W*([2-9][0-9]{2})\W*([0-9]{4})(\se?x?t?(\d*))?';
 
     def parse_from_string(raw_string)
-      # Optional 1 -./ 256 (opt) 456 -./ 1234 ext(opt) 1234 (opt)
-      phone_regexp = /1? \s* [.\/-]? \s* [\(]?([2-9][0-8][0-9])?[\)]? \s* [.\/-]? \s* ([2-9][0-9]{2}) \s* [.\/-]? \s* ([0-9]{4}) \s* (\s*e?x?t?\s*(\d+))?/x
+      # Optional +  1 -./ 256 (opt) 456 -./ 1234 ext(opt) 1234 (opt)
+      phone_regexp = / \+? \s* 1? \s* [.\/-]? \s*
+                       [\(]?([2-9][0-8]\d)?[\)]? \s* [.\/-]? \s*
+                       ([2-9]\d{2}) \s* [.\/-]? \s*
+                       (\d{4}) \s* (?:\s*e?x?t?\s*(\d+))? /x
       match = phone_regexp.match(raw_string)
       if ! match.nil?
         # puts "Setting values #{match.captures.pretty_inspect}"
         @area_code = match.captures[0]
         @prefix = match.captures[1]
         @number = match.captures[2]
-        @extension = match.captures[4]
+        @extension = match.captures[3]
       else
         # puts "No matchy :("
       end
@@ -148,19 +181,14 @@ module PhoneWrangler
       }
     end
 
-    # This next part borrowed from http://github.com/erebor/phone/blob/master/lib/phone.rb
-    private
+    # This part borrowed from http://github.com/midas/phone_number/blob/master/lib/phone_number/number.rb
+  private
 
-    def format_number(fmt)
-      fmt.
-      #        gsub("%c", country_code || "").
-      gsub("%a", area_code || "").
-      gsub("%p", prefix || "").
-      #        gsub("%A", area_code_long || "").
-      gsub("%n", number || "").
-      #        gsub("%f", number1 || "").
-      #        gsub("%l", number2 || "").
-      gsub("%e", extension || "")
+    def format_number(format)
+      @@pattern_map.each do |pat, field|
+        format = format.gsub( pat, self.send(field) || '' ) if self.respond_to?(field)
+      end
+      format
     end
 
   end

data/phone_wrangler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phone_wrangler}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Waldron"]

data/test/phone_wrangler_test.rb

@@ -29,6 +29,16 @@ class PhoneWranglerTest < Test::Unit::TestCase
       assert_equal PhoneNumber, pn.class
     end
 
+    should "agree it is empty when it is" do
+      pn = PhoneNumber.new
+      assert pn.empty?
+    end
+
+    should "not agree it is empty when it is not" do
+      pn = PhoneNumber.new(:area_code => '256', :prefix => '555', :number => '1234')
+      assert ! pn.empty?
+    end
+
     should "correctly parse phone number strings" do
       pn = PhoneNumber.new("(256) 555-1234")
       assert_equal '256', pn.area_code
@@ -187,6 +197,13 @@ class PhoneWranglerTest < Test::Unit::TestCase
       assert_equal String, @pn.to_s.class
     end
 
+    # TODO: I don't know if this is the right behavior, actually.  If the user
+    # passes in a format string with extra decorative content, does he want it
+    # back with only the decorative structure?  Or is an empty string better?
+    should "return an empty string if the PhoneNumber is empty" do
+      assert_equal '', PhoneNumber.new.to_s("x%e foo")
+    end
+
     should "format numbers properly with to_s" do
       assert_equal "(256) 555-1234", @pn.to_s
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: phone_wrangler
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan Waldron