Download as
Browse Code »

Commit 67a7c282a2abfb48f2e0458109056301db24f8ed

Authored by Antonio Terceiro
1 parent fbc702c7
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem916: coping with other date formats

Showing 1 changed file with 17 additions and 2 deletions   Show diff stats
db/migrate/059_add_birth_date_to_person.rb
  Diff comments   View file @67a7c28
... ... @@ -18,8 +18,14 @@ class AddBirthDateToPerson < ActiveRecord::Migration
18 18 date_string = date_string[0..-3] + (year > (Date.today.year - 2000) ? year + 1900 : year + 2000).to_s
19 19 end
20 20  
21   - date_string =~ (/(\d+)[^\d]+(\d+)[^\d]+(\d+)/)
22   - Date.new($3.to_i, $2.to_i, $1.to_i)
  21 + if ! ((date_string =~ /(\d+)[^\d]+(\d+)[^\d]+(\d+)/) || (date_string =~ /^(\d\d)(\d\d)(\d\d\d\d)$/))
  22 + return nil
  23 + end
  24 + begin
  25 + Date.new($3.to_i, $2.to_i, $1.to_i)
  26 + rescue Exception => e
  27 + nil
  28 + end
23 29 end
24 30 end
25 31  
... ... @@ -106,6 +112,15 @@ if $PROGRAM_NAME == __FILE__
106 112 assert_nil date
107 113 end
108 114  
  115 + should 'convert date without separators' do
  116 + date = AddBirthDateToPerson::ConvertDates.convert('27071977')
  117 + assert_equal [ 1977, 07, 27] , [date.year, date.month, date.day]
  118 + end
  119 +
  120 + should 'not try to create invalid date' do
  121 + assert_nil AddBirthDateToPerson::ConvertDates.convert('70/05/1987')
  122 + end
  123 +
109 124 end
110 125  
111 126 end
... ...