refactor utility functions; code cleanup

alexduryee · Dec 30, 2015 · f2dcc54 · f2dcc54
1 parent 152aa65
commit f2dcc54
Show file tree

Hide file tree

Showing 5 changed files with 334 additions and 306 deletions.
diff --git a/lib/timetwister.rb b/lib/timetwister.rb
@@ -1,5 +1,6 @@
 require "timetwister/version"
 require "timetwister/parser"
+require "timetwister/utilities"
 
 module Timetwister
 
@@ -13,7 +14,7 @@ def self.parse(str, options={})
 
    				# check for dates of form "Month Day(-Day), Year" before splitting on commas
    				# (removes certainty markers as to not jam the regex)
-   				if Parser.replace_ordinals(conj).gsub(/[\?\[\]]/, '').match(/[a-z]*\.?\s[0-9]{1,2}(\s?-[0-9]{1,2})?\,\s[0-9]{4}/i)
+   				if Utilities.replace_ordinals(conj).gsub(/[\?\[\]]/, '').match(/[a-z]*\.?\s[0-9]{1,2}(\s?-[0-9]{1,2})?\,\s[0-9]{4}/i)
    					out << Parser.string_to_dates(conj, options)
    				else
    					conj.split(',').each do |comma|