lib/attentive/entities/core/time.rb in attentive-0.3.5 vs lib/attentive/entities/core/time.rb in attentive-0.3.6

@@ -11,20 +11,21 @@
 
   minutes = 0
 
   if match.matched?("hours")
     hours = match["hours"].to_i
-    hours += 12 if match.matched?("pm")
+    hours += 12 if hours < 12 && match.matched?("pm")
+    hours = 0 if hours == 12 && !match.matched?("pm")
     minutes = match["minutes"].to_i if match.matched?("minutes")
   else
     case match.to_s
     when "noon" then hours = 12
     when "midnight" then hours = 0
     else nomatch!
     end
   end
 
-  nomatch! if hours < 0 || hours > 24
+  nomatch! if hours < 0 || hours > 23
   nomatch! if minutes < 0 || minutes > 60
 
   today = Date.today; Time.new(today.year, today.month, today.day, hours, minutes)
 end