@@ -1,21 +1,29 @@ module ClientDate def format_date(date) return "" if date.nil? - "<script>fd("+date_params(date)+");</script>" + assemble_javascript(date,"fd") end - def format_datetime(date) + def format_datetime(date,seconds=false) return "" if date.nil? - "<script>fdt("+date_params(date)+");</script>" + function = seconds ? "fdts" : "fdt" + assemble_javascript(date,function) end - def date_params(date) - return "" if date.nil? - text = date.year.to_s + "," - text += date.month.to_s + "," - text += date.day.to_s + "," - text += date.hour.to_s + "," - text += date.min.to_s - text - end + private + + def date_params(date) + return "" if date.nil? + text = date.year.to_s + "," + text += date.month.to_s + "," + text += date.day.to_s + "," + text += date.hour.to_s + "," + text += date.min.to_s + "," + text += date.sec.to_s + text + end + + def assemble_javascript(date,function) + "<script>"+function+"("+date_params(date)+");</script>" + end end \ No newline at end of file lib/client_date.rb @@ -4,18 +4,27 @@ require File.dirname(__FILE__) + '/../lib/client_date' class ClientDateTest < Test::Unit::TestCase include ClientDate - def test_date_params - assert_equal "", date_params(nil) - assert_equal "2000,1,1,20,15", date_params(Time.gm(2000,"jan",1,20,15,1)) - end - + # + # format_date + # + def test_format_date assert_equal "", format_date(nil) - assert_equal "<script>fd(2000,1,1,20,15);</script>", format_date(Time.gm(2000,"jan",1,20,15,1)) + assert_equal "<script>fd(2000,1,1,20,15,39);</script>", format_date(Time.gm(2000,"jan",1,20,15,39)) end + # + # format_datetime + # + def test_format_datetime assert_equal "", format_datetime(nil) - assert_equal "<script>fdt(2000,1,1,20,15);</script>", format_datetime(Time.gm(2000,"jan",1,20,15,1)) + assert_equal "<script>fdt(2000,1,1,20,15,47);</script>", format_datetime(Time.gm(2000,"jan",1,20,15,47)) end + + def test_format_datetime_with_seconds + assert_equal "", format_datetime(nil,true) + assert_equal "<script>fdts(2000,1,1,20,15,23);</script>", format_datetime(Time.gm(2000,"jan",1,20,15,23),true) + end + end \ No newline at end of file test/client_date_test.rb f96d37006d57ce41599f007a0cb29f24750f7124 Ryan Lowe ryanlowe@gmail.com http://github.com/ryanlowe/client_date/commit/ea5a9026fbc3f8bfdc6235ed45898207af840d43 ea5a9026fbc3f8bfdc6235ed45898207af840d43 2008-05-13T14:15:18-07:00 2008-05-13T14:15:18-07:00 add support for seconds d638e99e81393472c9459c3371bfddecce0fe7a7 Ryan Lowe ryanlowe@gmail.com