]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

luatz/timetable: Fix `rfc_3339()` bad rounding behaviour. Closes issue #4
authordaurnimator <quae@daurnimator.com>
Sun, 9 Nov 2014 07:11:55 +0000 (02:11 -0500)
committerdaurnimator <quae@daurnimator.com>
Sun, 9 Nov 2014 07:11:55 +0000 (02:11 -0500)
luatz/timetable.lua
spec/timetable_spec.lua

index fc89fcaec5c7271d6756ed4c3ff0429e01ff7280..7058d7f5cfbac828f0a5fd4f3d776d3309446e94 100644 (file)
@@ -171,8 +171,9 @@ function timetable_methods:timestamp ( )
 end
 
 function timetable_methods:rfc_3339 ( )
 end
 
 function timetable_methods:rfc_3339 ( )
-       -- %06.3f gives 3 (=6-3) digits after decimal
-       return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.3f" , self:unpack ( ) )
+       local year , month , day , hour , min , sec = self:unpack ( )
+       local sec , msec = borrow ( sec , 0 , 1000 )
+       return strformat ( "%04u-%02u-%02uT%02u:%02u:%02d.%03d" , year , month , day , hour , min , sec , msec )
 end
 
 function timetable_methods:strftime ( format_string )
 end
 
 function timetable_methods:strftime ( format_string )
index 569864fc8beba43faeee83a8a036fcce84c9bc86..7f6c7041a5ca6b8d86d576d522ed902494e224d1 100644 (file)
@@ -104,4 +104,11 @@ describe ( "Timetable library" , function ( )
                round_trip_add(timetable.new(2014,8,28,19,23,0), "month", 0.4)
                round_trip_add(timetable.new(2014,14.5,28,0,0,0), "month", 0.4)
        end )
                round_trip_add(timetable.new(2014,8,28,19,23,0), "month", 0.4)
                round_trip_add(timetable.new(2014,14.5,28,0,0,0), "month", 0.4)
        end )
+
+       it("#rfc_3339 doesn't round seconds up to 60 (issue #4)", function()
+               assert.same("2014-11-04T22:55:59.999", timetable.new_from_timestamp(1415141759.999911111):rfc_3339())
+               assert.same("1970-01-01T00:00:59.999", timetable.new_from_timestamp(59.9999999):rfc_3339())
+               assert.same("1969-12-31T23:59:59.999", timetable.new_from_timestamp(-0.001):rfc_3339())
+               assert.same("1969-12-31T23:59:00.000", timetable.new_from_timestamp(-59.9999999):rfc_3339())
+       end)
 end )
 end )