chronic 0.6.0 → 0.6.1

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 0.6.1 / 2011-07-21
+
+* Ensure Handler definitions are executed in the correct order
+
 # 0.6.0 / 2011-07-19
 
 * Attempting to parse strings with days past the last day of a month will

data/lib/chronic.rb

@@ -28,7 +28,7 @@ require 'date'
 #
 # @author Tom Preston-Werner, Lee Jarvis
 module Chronic
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
   class << self
 

data/lib/chronic/chronic.rb

@@ -284,23 +284,30 @@ module Chronic
     def tokens_to_span(tokens, options)
       definitions = definitions(options)
 
-      definitions.each do |type, handlers|
-        handlers.each do |handler|
-          next unless handler.match(tokens, definitions)
-
-          good_tokens = case type
-          when :date, :endian, :anchor
-            tokens.reject { |o| o.get_tag Separator }
-          when :arrow
-            tokens.reject { |o| o.get_tag(SeparatorAt) || o.get_tag(SeparatorSlashOrDash) || o.get_tag(SeparatorComma) }
-          else
-            tokens
-          end
-
-          if handler.handler_method
-            return handler.invoke(type, good_tokens, options)
-          end
+      (definitions[:date] + definitions[:endian]).each do |handler|
+        if handler.match(tokens, definitions)
+          good_tokens = tokens.select { |o| !o.get_tag Separator }
+          return handler.invoke(:date, good_tokens, options)
+        end
+      end
+
+      definitions[:anchor].each do |handler|
+        if handler.match(tokens, definitions)
+          good_tokens = tokens.select { |o| !o.get_tag Separator }
+          return handler.invoke(:anchor, good_tokens, options)
+        end
+      end
+
+      definitions[:arrow].each do |handler|
+        if handler.match(tokens, definitions)
+          good_tokens = tokens.reject { |o| o.get_tag(SeparatorAt) || o.get_tag(SeparatorSlashOrDash) || o.get_tag(SeparatorComma) }
+          return handler.invoke(:arrow, good_tokens, options)
+        end
+      end
 
+      definitions[:narrow].each do |handler|
+        if handler.match(tokens, definitions)
+          return handler.invoke(:narrow, tokens, options)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-19 00:00:00.000000000 +01:00
+date: 2011-07-21 00:00:00.000000000 +01:00
 default_executable: 
 dependencies: []
 description: Chronic is a natural language date/time parser written in pure Ruby.