parse: tz_offset should be returned in seconds

diff --git a/luatz/parse.lua b/luatz/parse.lua
index a1a0431c5006f5f9b44f8216f354ea273402af0f..f5cf735c7ac33a7878c27f1ae1c095c5fed4f2c4 100644 (file)
--- a/luatz/parse.lua
+++ b/luatz/parse.lua
@@ -25,7 +25,7 @@ local function rfc_3339 ( str , init )
        else
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
        else
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then

-                       tz_offset = tonumber ( hour_offset )*60 + tonumber ( min_offset )
+                       tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60

                else
                        -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min
                        -- tz_offset will be nil
                else
                        -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min
                        -- tz_offset will be nil

diff --git a/spec/parse_spec.lua b/spec/parse_spec.lua
index f66015a7fc9e40c852eb9e280499ebf15ea1b004..71df5fb22738f2833ec2d0daad079ea2ed66d717 100644 (file)
--- a/spec/parse_spec.lua
+++ b/spec/parse_spec.lua
@@ -6,7 +6,7 @@ describe ( "Time parsing library" , function ( )
                assert.same ( timetable.new(2013,10,22,14,17,02) , (parse.rfc_3339 "2013-10-22T14:17:02Z") )
 
                -- Numeric offsets accepted
                assert.same ( timetable.new(2013,10,22,14,17,02) , (parse.rfc_3339 "2013-10-22T14:17:02Z") )
 
                -- Numeric offsets accepted

-               assert.same ( { timetable.new(2013,10,22,14,17,02) , 10*60 } , { parse.rfc_3339 "2013-10-22T14:17:02+10:00" } )
+               assert.same ( { timetable.new(2013,10,22,14,17,02) , 10*3600 } , { parse.rfc_3339 "2013-10-22T14:17:02+10:00" } )

 
                -- Missing offsets parse
                assert.same ( timetable.new(2013,10,22,14,17,02) , (parse.rfc_3339 "2013-10-22T14:17:02") )
 
                -- Missing offsets parse
                assert.same ( timetable.new(2013,10,22,14,17,02) , (parse.rfc_3339 "2013-10-22T14:17:02") )