validates_and_formats_phones 0.0.4 → 0.0.5

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/gempackagetask'
 require 'spec/rake/spectask'
+require 'metric_fu'
 
 desc 'Default: run specs.'
 task :default => :spec
@@ -23,7 +24,7 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s|
   s.name = "validates_and_formats_phones"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.author = "Bernie Telles"
   s.email = "btelles@gmail.com"

data/lib/validates_and_formats_phones/phone_formatter.rb

@@ -5,7 +5,7 @@ String.class_eval do
   def to_phone(*args)
     args.empty? ?
       formats = {10 => '(###) ###-####'} :
-      formats = format_sizes(args)
+      formats = args.flatten.inject({}) { |all_formats, format| all_formats.merge({format.count('#') => format}) }
 
     to_formatted_number(formats)
   end
@@ -14,8 +14,9 @@ String.class_eval do
 
   def to_formatted_number(formats = {})
     digits = scan(/\d/)
-    if formats[digits.size]
-      final_string = formats[digits.size].each_char.inject('') do |result, character|
+    total_digits = digits.size
+    if formats[total_digits]
+      final_string = formats[total_digits].each_char.inject('') do |result, character|
         character == '#' ? result << digits.shift : result << character
         result
       end
@@ -25,12 +26,4 @@ String.class_eval do
     end
   end
 
-  private
-
-  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

@@ -2,44 +2,44 @@
     DEFAULT_FORMAT = "(###) ###-####"
     def self.included(base)
       base.send :extend, ClassMethods
+      base.send :include, InstanceMethods
     end
 
-    module ClassMethods
+    def self.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
 
+    module ClassMethods
 
       def validates_and_formats_phones(*args)
-        formats, fields = extract_formats_and_fields(args)
-        send :include, InstanceMethods
+        formats, fields = ValidatesAndFormatsPhones.extract_formats_and_fields(args)
+
+        size_options = formats.collect {|format| format.count '#'}
 
         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."
+              message = "must have #{size_options.join(', ')} or #{last} digits."
             else
-              record.errors.add attr, "must have #{size_options[0]} digits."
+              message = "must have #{size_options[0]} digits."
             end
+            record.errors.add attr, message 
           else
             record.format_phone_field(attr, formats)
           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.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bernie Telles
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: []