validates_and_formats_phones 0.0.3 → 0.0.4

data/README.rdoc

@@ -65,4 +65,15 @@ You can also format and specify fields, like so:
     validates_and_formats_phones :fax, mobile, '####-####'
   end
 
+As a tiny added benefit, String is extended with a to_phone method.
+
+  > '123 456 7890'.to_phone
+  > => '(123) 456-7890'
+  >
+  > '12345678'.to_phone('####-####')
+  > => '1234-5678'
+
+If you find any bugs, please report them at our github page:
+
+  http://github.com/btelles-validates_and_formats_phones
 Copyright (c) 2010 [Bernie Telles], released under the MIT license

data/Rakefile

@@ -23,7 +23,7 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s|
   s.name = "validates_and_formats_phones"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.author = "Bernie Telles"
   s.email = "btelles@gmail.com"

data/lib/validates_and_formats_phones/phone_formatter.rb

@@ -1,23 +1,36 @@
 String.class_eval do 
   #Formats a phone according to the provided formats.
-  # _formats_ is a hash whose keys are the number of digits
-  # and values are the formats of the phone number.
-  # For example {10 => "(###) ###-####"}
+  # _formats_ is an array whose values are a string
+  # with '#' signs indicating where digits should appear.
   def to_phone(*args)
-    if args.empty?
-      formats = {10 => '(###) ###-####'}
-    else
-      formats = args.flatten.inject({}) do |all_formats, format|
-        all_formats[format.count('#')] = format
-        all_formats
-      end
-    end
+    args.empty? ?
+      formats = {10 => '(###) ###-####'} :
+      formats = format_sizes(args)
+
+    to_formatted_number(formats)
+  end
+
+  private
+
+  def to_formatted_number(formats = {})
     digits = scan(/\d/)
-    final_string = formats[scan(/\d/).size].each_char.inject('') do |result, character|
-      character == '#' ? result << digits.shift : result << character
-      result
+    if formats[digits.size]
+      final_string = formats[digits.size].each_char.inject('') do |result, character|
+        character == '#' ? result << digits.shift : result << character
+        result
+      end
+      final_string
+    else
+      self
     end
+  end
+
+  private
 
-    final_string
+  def format_sizes(formats_array)
+    formats_array.flatten.inject({}) do |all_formats, format|
+      all_formats[format.count('#')] = format
+      all_formats
+    end
   end
 end

data/lib/validates_and_formats_phones/validates_and_formats_phones.rb

@@ -8,18 +8,7 @@
 
 
       def validates_and_formats_phones(*args)
-        formats = []
-        fields = []
-        args.each do |option|
-          if option.to_s =~ /#/
-            formats << option
-          else
-            fields << option.to_sym
-          end
-        end
-        formats << DEFAULT_FORMAT if formats.empty?
-        fields  << :phone if fields.empty?
-
+        formats, fields = extract_formats_and_fields(args)
         send :include, InstanceMethods
 
         validates_each *fields do |record, attr, value|
@@ -36,6 +25,21 @@
           end
         end
       end
+
+      private
+
+      def extract_formats_and_fields(formats_and_fields)
+        formats = []
+        fields = []
+        formats_and_fields.each do |option|
+          option.to_s =~ /#/ ?
+            formats << option :
+            fields << option.to_sym
+        end
+        formats << DEFAULT_FORMAT if formats.empty?
+        fields  << :phone if fields.empty?
+        [formats, fields]
+      end
     end
 
     module InstanceMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_and_formats_phones
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Bernie Telles
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -05:00
+date: 2010-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,13 +22,13 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- install.rb
-- uninstall.rb
-- README.rdoc
 - init.rb
+- Rakefile
 - README
+- install.rb
 - discover.rb
-- Rakefile
+- uninstall.rb
+- README.rdoc
 - lib/validates_and_formats_phones/validates_and_formats_phones.rb
 - lib/validates_and_formats_phones/phone_formatter.rb
 - lib/validates_and_formats_phones.rb