test/unit/phone_number_test.rb @@ -13,9 +13,9 @@ <p><b>We need an email address and at least one phone number we can contact you on.</b></p> <%= f.text_field_row :email_address %> <div class="clear"> - <%= f.text_field_row :mobile_phone %> - <%= f.text_field_row :home_phone %> - <%= f.text_field_row :work_phone %> + <%= f.text_field_row :mobile_phone, nil, :value => @volunteer.mobile_phone.format %> + <%= f.text_field_row :home_phone, nil, :value => @volunteer.home_phone.format %> + <%= f.text_field_row :work_phone, nil, :value => @volunteer.work_phone.format %> </fieldset> <fieldset> app/views/volunteers/new.html.erb @@ -23,6 +23,7 @@ ActiveRecord::Schema.define(:version => 20090216025059) do t.string "work_phone" t.datetime "created_at" t.datetime "updated_at" + t.string "email_address" t.integer "can_keep_dogs" t.integer "can_keep_cats" t.string "can_keep_other" @@ -38,7 +39,6 @@ ActiveRecord::Schema.define(:version => 20090216025059) do t.boolean "requires_financial_support" t.boolean "can_administer_medical" t.integer "offer_duration" - t.string "email_address" end end db/schema.rb @@ -5,7 +5,9 @@ class PhoneNumber < String end def normalize - tr(' ()-.', '').gsub(/\A\+/, '').gsub(/\A0/, '61') + result = tr(' ()-.', '').gsub(/\A\+/, '') + result = "03#{result}" if result =~ /^\d{8}$/ + result.gsub(/\A0/, '61') end def valid_australian_mobile? lib/phone_number.rb @@ -8,7 +8,7 @@ module ActiveRecord def wraps_attribute(attribute, wrapper_class, options = {}) options = { :validate => :valid?, :message => "must be valid" }.merge(options) - before_validation {|object| object.send(:write_attribute, attribute, object.send(attribute).normalize) } + before_save {|object| object.send(:write_attribute, attribute, object.send(attribute).normalize) } if options[:validate] validate do |object| vendor/plugins/wraps_attribute/lib/wraps_attribute.rb 3322720dde8aebb7b4ec0e6858897e8bfdf69bbf Pete Yandell pete@notahat.com http://github.com/mbailey/fun4paws/commit/f893418741ffc706ce213b145fa0769d85baa674 f893418741ffc706ce213b145fa0769d85baa674 2009-02-16T19:47:21-08:00 2009-02-16T19:47:21-08:00 Made the phone number validation much more friendly. It now accepts phone numbers without an area code (and assumes they are 03), and formats the results more nicely if there's an error. 55000c48121e7bddabb822b1f167d7f76f4e3cb1 Pete Yandell pete@notahat.com