lib/ruote/util/time.rb in ruote-2.3.0.1 vs lib/ruote/util/time.rb in ruote-2.3.0.2

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, [e-mail]
+# Copyright (c) 2005-2013, John Mettraux, [e-mail]
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -67,11 +67,11 @@
 
     at = if s.index(' ')
       #
       # date
 
-      Rufus.to_ruby_time(s)# rescue nil
+      DateTime.parse(s)
 
     else
       #
       # duration
 
@@ -85,10 +85,10 @@
     end
   end
 
   # Waiting for a better implementation of it in rufus-scheduler 2.0.4
   #
-  def self.is_cron_string(s)
+  def self.cron_string?(s)
 
     ss = s.split(' ')
 
     return false if ss.size < 5 || ss.size > 6
     return false if s.match(/\d{4}/)