validates_and_formats_phones 0.0.1 → 0.0.2

data/README

@@ -1,17 +1,27 @@
-ValidatesAndFormatsPhones
-=========================
+= ValidatesAndFormatsPhones
 
 Allows you to easily format and validate phone numbers in your desired format 
 (sensible defaults provided).
 
 Just add 'validates_and_formats_phones' to your ActiveRecord model.
 
-The default format is a 10-digit american phone number on the column 'phone'.
+The default format is a 10-digit US phone number on the column 'phone'.
 But you can change all that...just read on.
 
+== Installation
 
-Example
-=======
+1. Install it as a gem:
+
+      sudo gem install validates_and_formats_phones
+
+2. Then add it to your <tt>environment.rb</tt> file
+
+      config.gem 'validates_and_formats_phones'
+
+3. Add the method <tt>validates_and_formats_phones</tt> to your model
+
+
+== Example
 
 
 Adding the validates_and_formats_phones method by itself gives you
@@ -38,16 +48,21 @@ You can pass your own fields like so:
   end
 
 
-Or your own formats like so:
+Or your own formats by using a # symbol for number substitutions:
 
   class Person
-    validates_and_formats_phones(8 => '####-####')
+    validates_and_formats_phones '####-####', '### ###-####'
   end
 
-or both, like so:
+Note that the validation is simplistic. It counts the number of digits in the given field.
+If the number of digits in the given field matches one of the formats, then the validation
+passes and the format that has the same number of '#' symbols will be used to format
+the phone number.
+
+You can also format and specify fields, like so:
 
   class Person
-    validates_and_formats_phones(:fax, mobile, 8 => '####-####')
+    validates_and_formats_phones :fax, mobile, '####-####'
   end
 
 Copyright (c) 2010 [Bernie Telles], released under the MIT license

data/README.rdoc

@@ -0,0 +1,68 @@
+= ValidatesAndFormatsPhones
+
+Allows you to easily format and validate phone numbers in your desired format 
+(sensible defaults provided).
+
+Just add 'validates_and_formats_phones' to your ActiveRecord model.
+
+The default format is a 10-digit US phone number on the column 'phone'.
+But you can change all that...just read on.
+
+== Installation
+
+1. Install it as a gem:
+
+      sudo gem install validates_and_formats_phones
+
+2. Then add it to your <tt>environment.rb</tt> file
+
+      config.gem 'validates_and_formats_phones'
+
+3. Add the method <tt>validates_and_formats_phones</tt> to your model
+
+
+== Example
+
+
+Adding the validates_and_formats_phones method by itself gives you
+validation and formatting for the field :phone like so:
+
+
+  class Person
+    validates_and_formats_phones
+  end
+
+  > person = Person.new(:phone => '123 456 7890')
+  > person.save 
+  > person.phone 
+  > => '(123) 456-7890'
+  >
+  > person.phone = '123'
+  > person.save
+  > => false
+
+You can pass your own fields like so:
+
+  class Person
+    validates_and_formats_phones :fax, :mobile
+  end
+
+
+Or your own formats by using a # symbol for number substitutions:
+
+  class Person
+    validates_and_formats_phones '####-####', '### ###-####'
+  end
+
+Note that the validation is simplistic. It counts the number of digits in the given field.
+If the number of digits in the given field matches one of the formats, then the validation
+passes and the format that has the same number of '#' symbols will be used to format
+the phone number.
+
+You can also format and specify fields, like so:
+
+  class Person
+    validates_and_formats_phones :fax, mobile, '####-####'
+  end
+
+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.1"
+  s.version = "0.0.2"
 
   s.author = "Bernie Telles"
   s.email = "btelles@gmail.com"

data/lib/validates_and_formats_phones/phone_formatter.rb

@@ -1,10 +1,17 @@
-
 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 => "(###) ###-####"}
-  def to_phone(formats =  { 10 => "(###) ###-####"})
+  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
     digits = scan(/\d/)
     final_string = formats[scan(/\d/).size].each_char.inject('') do |result, character|
       character == '#' ? result << digits.shift : result << character
@@ -13,5 +20,4 @@ String.class_eval do
 
     final_string
   end
-
 end

data/lib/validates_and_formats_phones/validates_and_formats_phones.rb

@@ -1,5 +1,5 @@
   module ValidatesAndFormatsPhones
-    DEFAULT_FORMAT = { 10 => "(###) ###-####"}
+    DEFAULT_FORMAT = "(###) ###-####"
     def self.included(base)
       base.send :extend, ClassMethods
     end
@@ -8,39 +8,45 @@
 
 
       def validates_and_formats_phones(*args)
-        options = args.extract_options!
-        options = DEFAULT_FORMAT if options.empty?
-        args.empty? ? field_names = [:phone] : field_names = args
-
-         send :include, InstanceMethods
-
-         validates_each *field_names do |record, attr, value|
-           size_options = options.keys
-           unless value.blank? || size_options.include?(value.scan(/\d/).size)
-             if size_options.size > 1
-               last = size_options.pop
-               record.errors.add attr, "must have #{size_options.join(', ')} or #{last} digits."
-             else
-               record.errors.add attr, "must have #{size_options[0]} digits."
-           end
-
-         end
-         after_validation "format_phone_fields(#{field_names.inspect}, #{options.inspect})"
+        formats = []
+        fields = []
+        args.each do |option|
+          option.to_s =~ /#/ ?
+            formats << option :
+            fields << option.to_sym
+        end
+        formats << DEFAULT_FORMAT if formats.empty?
+        fields  << :phone if fields.empty?
+
+        send :include, InstanceMethods
+
+        validates_each *fields do |record, attr, value|
+          size_options = formats.collect {|a| a.count '#'}
+          unless value.blank? || size_options.include?(value.scan(/\d/).size)
+            if size_options.size > 1
+              last = size_options.pop
+              record.errors.add attr, "must have #{size_options.join(', ')} or #{last} digits."
+            else
+              record.errors.add attr, "must have #{size_options[0]} digits."
+            end
+          else
+            record.format_phone_fields(fields, formats)
+          end
         end
       end
     end
 
     module InstanceMethods
 
-      def format_phone_fields(fields = [:phone], *args)
-        options = args.empty? ? DEFAULT_FORMAT : args.extract_options!
+      def format_phone_fields(fields = [:phone], formats = [])
+        formats << DEFAULT_FORMAT if formats.empty?
         fields.each do |field_name|
-          format_phone_field(field_name, options) unless send(field_name).blank?
+          format_phone_field(field_name, formats) unless send(field_name).blank?
         end
       end
-      def format_phone_field(field_name, *args)
-        options = args.extract_options! || DEFAULT_FORMAT
-        self.send("#{field_name}=", self.send(field_name).to_s.to_phone(options))
+      def format_phone_field(field_name, formats = [])
+        formats << DEFAULT_FORMAT if formats.empty?
+        self.send("#{field_name}=", self.send(field_name).to_s.to_phone(formats))
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validates_and_formats_phones
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bernie Telles
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -05:00
+date: 2010-02-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 files: 
 - install.rb
 - uninstall.rb
+- README.rdoc
 - init.rb
 - README
 - discover.rb