luatz/parse: On a non-conforming string, return `nil, err` instead of throwing an...

Closes #6

diff --git a/doc/parse.md b/doc/parse.md
index 39529dd1308b50350e7ebe53523c343217c0b346..649ee8121c8c56244ad1177893acba9c75dd6f9b 100644 (file)
--- a/doc/parse.md
+++ b/doc/parse.md
@@ -6,4 +6,7 @@ Functions take the source string and an optional initial postition.
 
 ### `rfc_3339 ( string [, init] )`
 
 
 ### `rfc_3339 ( string [, init] )`
 

-Returns a luatz timetable and the (optional) time zone offset in seconds
+If the string is a valid RFC-3339 timestamp,
+returns a luatz timetable and the (optional) time zone offset in seconds.
+
+Otherwise returns `nil` and an error message

diff --git a/luatz/parse.lua b/luatz/parse.lua
index 0b3b2ddcb0b488fdc84be8078b9759334b505c92..8de9a365bd2bfe305e3840f9b0797575db1c4c2b 100644 (file)
--- a/luatz/parse.lua
+++ b/luatz/parse.lua
@@ -8,7 +8,7 @@ local new_timetable = require "luatz.timetable".new
 local function rfc_3339 ( str , init )
        local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
        if not year then
 local function rfc_3339 ( str , init )
        local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
        if not year then

-               error ( "Invalid RFC 3339 timestamp" )
+               return nil, "Invalid RFC 3339 timestamp"

        end
        year  = tonumber ( year )
        month = tonumber ( month )
        end
        year  = tonumber ( year )
        month = tonumber ( month )

diff --git a/spec/parse_spec.lua b/spec/parse_spec.lua
index 37d37a08c25cc80839b314c41cc2950f152db06e..89c9a26c5a445137d482f359c2b2600e7777fbbc 100644 (file)
--- a/spec/parse_spec.lua
+++ b/spec/parse_spec.lua
@@ -10,5 +10,8 @@ describe ( "Time parsing library" , function ( )
 
                -- 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") )

+
+               -- Invalid
+               assert.same(nil, (parse.rfc_3339 "an invalid timestamp"))

        end )
 end )
        end )
 end )