nickel 0.0.6 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ba3e838fa5d6806f85eb03ddf6732481d5d09947
+  data.tar.gz: f1e5af3b3a1b16c2c9f5a67eedcdf479e37265c9
+SHA512:
+  metadata.gz: 77c82d90eab894ed70b59e586bb8dab299e43fe2999d4d5e015f33dc133a8614bae437e4fbdf2f7aa75caccc721612123bb67fe778f07cb6dfa9fe82cbe783e7
+  data.tar.gz: e95c789fd5d6c6ec167690a0e199b19411620faf0427bf4e302a10ed95a44ab00b8dafc1d74475c3ad3b074496ae1c647780f374bc511d3a0e2af1272d6849d7

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.swp
+*.swo
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+script: bin/run_specs.sh
+rvm:
+  - 2.1
+  - 2.0
+  - 1.9
+  - jruby
+  - rbx

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown --title "Nickel"

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+0.1.0
+-----
+
+* Deprecated ZTime#minute and ZTime#second in favor of ZDate#min and ZTime#sec
+* Added ZDate#to_date and ZTime#to_time (modsognir)
+* Now works on rubinius
+* Lots of refactoring and removal of legacy features

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/License.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2009-2011 Lou Zell, lzell11@gmail.com, http://hazelmade.com
+Copyright (c) 2008 Lou Zell, lzell11@gmail.com, http://hazelmade.com
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -0,0 +1,110 @@
+Nickel
+======
+
+Nickel extracts date, time, and message information from naturally worded text.
+
+[![Gem Version](http://img.shields.io/gem/v/nickel.svg)](http://rubygems.org/gems/nickel)
+[![Build Status](http://img.shields.io/travis/iainbeeston/nickel/master.svg)](https://travis-ci.org/iainbeeston/nickel)
+[![Coverage Status](http://img.shields.io/coveralls/iainbeeston/nickel/master.svg)](https://coveralls.io/r/iainbeeston/nickel)
+[![Code Climate](http://img.shields.io/codeclimate/github/iainbeeston/nickel.svg)](https://codeclimate.com/github/iainbeeston/nickel)
+
+Install
+-------
+
+If you use bundler add `gem "nickel"` to your gemfile, or if not run `gem install nickel` from the command line.
+
+Usage
+-----
+
+A single occurrence
+
+~~~ ruby
+n = Nickel.parse "use the force on july 1st at 9am"
+n.message                       #=> "use the force"
+n.occurrences.first.start_date  #=> "20110701"
+~~~
+
+A daily occurrence
+
+~~~ ruby
+n = Nickel.parse "wake up everyday at 11am"
+n.message                       # => wake up
+n.occurrences[0].type           # => daily
+n.occurrences[0].start_time     # => 11:00:00
+~~~
+
+A weekly occurrence
+
+~~~ ruby
+n = Nickel.parse "guitar lessons every tuesday at 5pm"
+n.message                       # => guitar lessons
+n.occurrences[0].type           # => weekly
+n.occurrences[0].day_of_week    # => 1
+n.occurrences[0].interval       # => 1
+n.occurrences[0].start_time     # => 17:00:00
+~~~
+
+A day monthly occurrence
+
+~~~ ruby
+n = Nickel.parse "drink specials on the second thursday of every month"
+n.message                       # => drink specials
+n.occurrences[0].type           # => daymonthly
+n.occurrences[0].day_of_week    # => 4
+n.occurrences[0].week_of_month  # => 2
+n.occurrences[0].interval       # => 1
+~~~
+
+A date monthly occurrence
+
+~~~ ruby
+n = Nickel.parse "pay credit card every month on the 22nd"
+n.message                       # => pay credit card
+n.occurrences[0].type           # => datemonthly
+n.occurrences[0].date_of_month  # => 22
+n.occurrences[0].interval       # => 1
+~~~
+
+Multiple occurrences
+
+~~~ ruby
+n = Nickel.parse "band meeting every monday and wednesday at 2pm"
+n.message                       # => band meeting
+n.occurrences[0].type           # => weekly
+n.occurrences[0].day_of_week    # => 0
+n.occurrences[0].start_time     # => 14:00:00
+n.occurrences[1].type           # => weekly
+n.occurrences[1].day_of_week    # => 2
+n.occurrences[1].start_time     # => 14:00:00
+~~~
+
+Occurrences without any message
+
+~~~ ruby
+n = Nickel.parse "a week from tomorrow"
+n.occurrences[0].start_date     # => 20140320
+~~~
+
+Setting current time
+
+~~~ ruby
+n = Nickel.parse "lunch 3 days from now", DateTime.new(2010,3,31)
+n.message                       # => lunch
+n.occurrences[0].start_date     # => 20100403
+~~~
+
+Extracting ruby date and time objects
+
+~~~ ruby
+n = Nickel.parse "dinner with friends at 8:00pm tonight"
+n.message                               # => dinner with friends
+n.occurrences[0].start_date.to_date     # => 2014-02-23
+n.occurrences[0].start_time.to_time     # => 2014-02-23 20:00:00 +0000
+~~~
+
+Credits
+-------
+
+Nickel was originally developed by [Lou Zell](https://github.com/lzell/nickel), but is now maintained by [Iain Beeston](https://github.com/iainbeeston/nickel).
+
+Copyright (c) 2008-2013 Lou Zell, lzell11@gmail.com, http://hazelmade.com

data/Rakefile

@@ -1,22 +1,14 @@
 require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'coveralls/rake/task'
+require 'yard'
 
-desc 'Default: run unit tests.'
-task :default => :test
+task default: :spec
 
-desc 'Test the nlp plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'Generate documentation for the nlp plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Nlp'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+YARD::Rake::YardocTask.new(:yard)
+
+Coveralls::RakeTask.new
+task test_with_coveralls: [:spec, 'coveralls:push']

data/bin/run_specs.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Run specs individually, to avoid interdependencies.
+# Based on scripts from github.com/rspec/rspec-expectations
+
+function run_specs_one_by_one {
+  for file in `find spec -iname '*_spec.rb'`; do
+    echo "rspec $file"
+    rspec --backtrace $file
+  done
+}
+
+run_specs_one_by_one
+
+COVERALLS=true rspec --warnings

data/lib/nickel.rb

@@ -1,30 +1,11 @@
-# Ruby Nickel Library 
-# Copyright (c) 2008-2011 Lou Zell, lzell11@gmail.com, http://hazelmade.com
-# MIT License [http://www.opensource.org/licenses/mit-license.php]
-#
 # Usage:
-# 
+#
 #   Nickel.parse "some query", Time.local(2011, 7, 1)
 #
 # The second term is optional.
 
-require 'logger'
-require 'date'
-
-path = File.expand_path(File.join(File.dirname(__FILE__), 'nickel'))
-
-require File.join(path, 'ruby_ext', 'to_s2.rb')
-require File.join(path, 'ruby_ext', 'calling_method.rb')
-require File.join(path, 'zdate.rb')
-require File.join(path, 'ztime.rb')
-require File.join(path, 'instance_from_hash')
-require File.join(path, 'query_constants')
-require File.join(path, 'query')
-require File.join(path, 'construct')
-require File.join(path, 'construct_finder')
-require File.join(path, 'construct_interpreter')
-require File.join(path, 'occurrence')
-require File.join(path, 'nlp.rb')
+require 'nickel/version'
+require 'nickel/nlp'
 
 module Nickel
   class << self
@@ -33,5 +14,5 @@ module Nickel
       n.parse
       n
     end
-  end 
+  end
 end

data/lib/nickel/construct.rb

@@ -1,18 +1,16 @@
-# Ruby Nickel Library 
-# Copyright (c) 2008-2011 Lou Zell, lzell11@gmail.com, http://hazelmade.com
-# MIT License [http://www.opensource.org/licenses/mit-license.php]
-
 module Nickel
 
   class Construct
-    include InstanceFromHash
     attr_accessor :comp_start, :comp_end, :found_in
+    def initialize(h)
+      h.each { |k,v| send("#{k}=", v) }
+    end
   end
 
   class DateConstruct < Construct
     attr_accessor :date
     def interpret
-      {:date => @date}
+      {:date => date}
     end
   end
 
@@ -23,7 +21,7 @@ module Nickel
   class TimeConstruct < Construct
     attr_accessor :time
     def interpret
-      {:time => @time}
+      {:time => time}
     end
   end
 
@@ -37,18 +35,17 @@ module Nickel
 
   class RecurrenceConstruct < Construct
     attr_accessor :repeats, :repeats_on
-    
+
     def interpret
       if    variant_of?(:daily)       then interpret_daily_variant
       elsif variant_of?(:weekly)      then interpret_weekly_variant
       elsif variant_of?(:daymonthly)  then interpret_daymonthly_variant
       elsif variant_of?(:datemonthly) then interpret_datemonthly_variant
       else
-        puts @repeats.inspect
-        raise StandardError.new("self is an invalid variant, check value of self.repeats or @repeats")
+        raise StandardError.new("self is an invalid variant, check value of self.repeats")
       end
     end
-    
+
     def get_interval
       if    has_interval_of?(1)  then 1
       elsif has_interval_of?(2)  then 2
@@ -61,18 +58,18 @@ module Nickel
     private
     def has_interval_of?(x)
       case x
-      when 1 then [:daily, :weekly, :daymonthly, :datemonthly].include?(@repeats)
-      when 2 then [:altdaily, :altweekly, :altdaymonthly, :altdatemonthly].include?(@repeats)
-      when 3 then [:threedaily, :threeweekly, :threedaymonthly, :threedatemonthly].include?(@repeats)
+      when 1 then [:daily, :weekly, :daymonthly, :datemonthly].include?(repeats)
+      when 2 then [:altdaily, :altweekly, :altdaymonthly, :altdatemonthly].include?(repeats)
+      when 3 then [:threedaily, :threeweekly, :threedaymonthly, :threedatemonthly].include?(repeats)
       end
     end
 
     def variant_of?(sym)
       case sym
-      when :daily       then [:daily, :altdaily, :threedaily].include?(@repeats)
-      when :weekly      then [:weekly, :altweekly, :threeweekly].include?(@repeats)
-      when :daymonthly  then [:daymonthly, :altdaymonthly, :threedaymonthly].include?(@repeats)
-      when :datemonthly then [:datemonthly, :altdatemonthly, :threedatemonthly].include?(@repeats)
+      when :daily       then [:daily, :altdaily, :threedaily].include?(repeats)
+      when :weekly      then [:weekly, :altweekly, :threeweekly].include?(repeats)
+      when :daymonthly  then [:daymonthly, :altdaymonthly, :threedaymonthly].include?(repeats)
+      when :datemonthly then [:datemonthly, :altdatemonthly, :threedatemonthly].include?(repeats)
       end
     end
 
@@ -81,37 +78,37 @@ module Nickel
       [hash_for_occ_base]
     end
 
-    # @repeats_on is an array of day indices. For example,
-    # "every monday and wed" will produce @repeats_on == [0,2].
+    # repeats_on is an array of day indices. For example,
+    # "every monday and wed" will produce repeats_on == [0,2].
     def interpret_weekly_variant
       hash_for_occ_base = {:type => :weekly, :interval => get_interval}
       array_of_occurrences = []
-      @repeats_on.each do |day_of_week|
+      repeats_on.each do |day_of_week|
         array_of_occurrences << hash_for_occ_base.merge({:day_of_week => day_of_week})
       end
       array_of_occurrences
     end
 
-    # @repeats_on is an array of arrays: Each sub array has the format
-    # [week_of_month, day_of_week].  For example, 
+    # repeats_on is an array of arrays: Each sub array has the format
+    # [week_of_month, day_of_week].  For example,
     # "the first and second sat of every month" will produce
-    # @repeats_on == [[1,5], [2,5]]
+    # repeats_on == [[1,5], [2,5]]
     def interpret_daymonthly_variant
       hash_for_occ_base = {:type => :daymonthly, :interval => get_interval}
       array_of_occurrences = []
-      @repeats_on.each do |on|
+      repeats_on.each do |on|
         h = {:week_of_month => on[0], :day_of_week => on[1]}
         array_of_occurrences << hash_for_occ_base.merge(h)
       end
       array_of_occurrences
     end
 
-    # @repeats_on is an array of datemonthly indices.  For example, 
-    # "the 21st and 22nd of every monthy" will produce @repeats_on == [21, 22]
+    # repeats_on is an array of datemonthly indices.  For example,
+    # "the 21st and 22nd of every monthy" will produce repeats_on == [21, 22]
     def interpret_datemonthly_variant
       hash_for_occ_base = {:type => :datemonthly, :interval => get_interval}
       array_of_occurrences = []
-      @repeats_on.each do |date_of_month|
+      repeats_on.each do |date_of_month|
         h = {:date_of_month => date_of_month}
         array_of_occurrences << hash_for_occ_base.merge(h)
       end

data/lib/nickel/construct_finder.rb

@@ -1,29 +1,27 @@
-# Ruby Nickel Library 
-# Copyright (c) 2008-2011 Lou Zell, lzell11@gmail.com, http://hazelmade.com
-# MIT License [http://www.opensource.org/licenses/mit-license.php]
+require_relative 'construct'
+require_relative 'zdate'
+require_relative 'ztime'
 
 module Nickel
 
   class ConstructFinder
     attr_reader :constructs, :components
-    
+
     def initialize(query, curdate, curtime)
-      # If query is a string (for debug), use it to initialize NLPQuery.
-      query.class == String && query = NLPQuery.new(query)    
       @curdate = curdate
       @curtime = curtime
       @components = query.split
       @pos = 0    # iterator
       @constructs = []
     end
-    
+
     def run
       while @pos < @components.size
         big_if_on_current_word
         @pos += 1
       end
     end
-          
+
     def reset_instance_vars
       @day_index = nil
       @month_index = nil
@@ -35,174 +33,174 @@ module Nickel
       @date1 = nil
       @date2 = nil
     end
-    
+
     def big_if_on_current_word
       reset_instance_vars
-      
+
       if match_every
           if match_every_dayname                          then  found_every_dayname                           # every tue
           elsif match_every_day                           then  found_every_day                               # every day
-          elsif match_every_other                                                                             
+          elsif match_every_other
             if    match_every_other_dayname               then  found_every_other_dayname                     # every other fri
             elsif match_every_other_day                   then  found_every_other_day                         # every other day
-            end                                                                                               
-          elsif match_every_3rd                                                                               
+            end
+          elsif match_every_3rd
             if    match_every_3rd_dayname                 then  found_every_3rd_dayname                       # every third fri
             elsif match_every_3rd_day                     then  found_every_3rd_day                           # every third day
-            end                                                                                               
-          end                                                                                                 
-                                                                                                              
-      elsif match_repeats                                                                                     
+            end
+          end
+
+      elsif match_repeats
           if match_repeats_daily                          then  found_repeats_daily                           # repeats daily
           elsif match_repeats_altdaily                    then  found_repeats_altdaily                        # repeats altdaily
           elsif match_repeats_weekly_vague                then  found_repeats_weekly_vague                    # repeats weekly
           elsif match_repeats_altweekly_vague             then  found_repeats_altweekly_vague                 # repeats altweekly
-          elsif match_repeats_monthly                                                                         
+          elsif match_repeats_monthly
             if match_repeats_daymonthly                   then  found_repeats_daymonthly                      # repeats monthly 1st fri
             elsif match_repeats_datemonthly               then  found_repeats_datemonthly                     # repeats monthly 22nd
-            end                                                                                               
-          elsif match_repeats_altmonthly                                                                      
+            end
+          elsif match_repeats_altmonthly
             if match_repeats_altmonthly_daymonthly        then  found_repeats_altmonthly_daymonthly           # repeats altmonthly 1st fri
             elsif match_repeats_altmonthly_datemonthly    then  found_repeats_altmonthly_datemonthly          # repeats altmonthly 22nd
-            end                                                                                               
-          elsif match_repeats_threemonthly                                                                    
+            end
+          elsif match_repeats_threemonthly
             if match_repeats_threemonthly_daymonthly      then  found_repeats_threemonthly_daymonthly         # repeats threemonthly 1st fri
             elsif match_repeats_threemonthly_datemonthly  then  found_repeats_threemonthly_datemonthly        # repeats threemonthly 22nd
-            end                                                                                               
-          end                                                                                                 
-                                                                                                              
-      elsif match_for_x                                                                                       
+            end
+          end
+
+      elsif match_for_x
           if match_for_x_days                             then  found_for_x_days                              # for 10 days
           elsif match_for_x_weeks                         then  found_for_x_weeks                             # for 10 weeks
           elsif match_for_x_months                        then  found_for_x_months                            # for 10 months
-          end                                                                                                 
-                                                                                                              
-      elsif match_this                                                                                        
+          end
+
+      elsif match_this
           if match_this_dayname                           then  found_this_dayname                            # this fri
           elsif match_this_week                           then  found_this_week                               # this week
           elsif match_this_month                          then  found_this_month                              # this month (implies 9/1 to 9/30)
-          end                                                                                                 # SHOULDN'T "this" HAVE "this weekend" ??? 
-                                                                                                              
-      elsif match_next                                                                                        
+          end                                                                                                 # SHOULDN'T "this" HAVE "this weekend" ???
+
+      elsif match_next
           if match_next_weekend                           then  found_next_weekend                            # next weekend --- never hit?
           elsif match_next_dayname                        then  found_next_dayname                            # next tuesday
-          elsif match_next_x                                                                                  
+          elsif match_next_x
             if    match_next_x_days                       then  found_next_x_days                             # next 5 days   --- shouldn't this be a wrapper?
             elsif match_next_x_weeks                      then  found_next_x_weeks                            # next 5 weeks  --- shouldn't this be a wrapper?
             elsif match_next_x_months                     then  found_next_x_months                           # next 5 months --- shouldn't this be a wrapper?
             elsif match_next_x_years                      then  found_next_x_years                            # next 5 years  --- shouldn't this be a wrapper?
-            end                                                                                               
+            end
           elsif match_next_week                           then  found_next_week
           elsif match_next_month                          then  found_next_month                              # next month (implies 10/1 to 10/31)
-          end                                                                                                 
-      
+          end
+
       elsif match_week
           if match_week_of_date                           then  found_week_of_date                            # week of 1/2
           elsif match_week_through_date                   then  found_week_through_date                       # week through 1/2  (as in, week ending 1/2)
           end
-                                                                                                              
-      elsif match_x_weeks_from                                                                                
+
+      elsif match_x_weeks_from
           if match_x_weeks_from_dayname                   then  found_x_weeks_from_dayname                    # 5 weeks from tuesday
           elsif match_x_weeks_from_this_dayname           then  found_x_weeks_from_this_dayname               # 5 weeks from this tuesday
           elsif match_x_weeks_from_next_dayname           then  found_x_weeks_from_next_dayname               # 5 weeks from next tuesday
           elsif match_x_weeks_from_tomorrow               then  found_x_weeks_from_tomorrow                   # 5 weeks from tomorrow
           elsif match_x_weeks_from_now                    then  found_x_weeks_from_now                        # 5 weeks from now
           elsif match_x_weeks_from_yesterday              then  found_x_weeks_from_yesterday                  # 5 weeks from yesterday
-          end                                                                                                 
-                                                                                                              
-      elsif match_x_months_from                                                                               
+          end
+
+      elsif match_x_months_from
           if match_x_months_from_dayname                  then  found_x_months_from_dayname                   # 2 months from wed
           elsif match_x_months_from_this_dayname          then  found_x_months_from_this_dayname              # 2 months from this wed
           elsif match_x_months_from_next_dayname          then  found_x_months_from_next_dayname              # 2 months from next wed
           elsif match_x_months_from_tomorrow              then  found_x_months_from_tomorrow                  # 2 months from tomorrow
           elsif match_x_months_from_now                   then  found_x_months_from_now                       # 2 months from now
           elsif match_x_months_from_yesterday             then  found_x_months_from_yesterday                 # 2 months from yesterday
-          end                                                                                                 
-                                                                                                              
-      elsif match_x_days_from                                                                                 
+          end
+
+      elsif match_x_days_from
           if match_x_days_from_now                        then  found_x_days_from_now                         # 5 days from now
           elsif match_x_days_from_dayname                 then  found_x_days_from_dayname                     # 5 days from monday
-          end                                                                                                 
-                                                                                                              
-      elsif match_x_dayname_from                                                                              
+          end
+
+      elsif match_x_dayname_from
           if match_x_dayname_from_now                     then  found_x_dayname_from_now                      # 2 fridays from now
           elsif match_x_dayname_from_tomorrow             then  found_x_dayname_from_tomorrow                 # 2 fridays from tomorrow
           elsif match_x_dayname_from_yesterday            then  found_x_dayname_from_yesterday                # 2 fridays from yesterday
           elsif match_x_dayname_from_this                 then  found_x_dayname_from_this                     # 2 fridays from this one
           elsif match_x_dayname_from_next                 then  found_x_dayname_from_next                     # 2 fridays from next friday
-          end                                                                                                 
+          end
 
       elsif match_x_minutes_from_now                      then  found_x_minutes_from_now                      # 5 minutes from now
       elsif match_x_hours_from_now                        then  found_x_hours_from_now                        # 5 hours from now
 
-      elsif match_ordinal_dayname                                                                             
+      elsif match_ordinal_dayname
           if match_ordinal_dayname_this_month             then  found_ordinal_dayname_this_month              # 2nd friday this month
           elsif match_ordinal_dayname_next_month          then  found_ordinal_dayname_next_month              # 2nd friday next month
           elsif match_ordinal_dayname_monthname           then  found_ordinal_dayname_monthname               # 2nd friday december
-          end                                                                                                 
-                                                                                                              
+          end
+
       elsif match_ordinal_this_month                      then  found_ordinal_this_month                      # 28th this month
       elsif match_ordinal_next_month                      then  found_ordinal_next_month                      # 28th next month
-      
-      elsif match_first_day                                                                                   
+
+      elsif match_first_day
           if match_first_day_this_month                   then  found_first_day_this_month                    # first day this month
           elsif match_first_day_next_month                then  found_first_day_next_month                    # first day next month
           elsif match_first_day_monthname                 then  found_first_day_monthname                     # first day january (well this is stupid, "first day of january" gets preprocessed into "1/1", so what is the point of this?)
-          end                                                                                                 
-                                                                                                              
-      elsif match_last_day                                                                                    
+          end
+
+      elsif match_last_day
           if match_last_day_this_month                    then  found_last_day_this_month                     # last day this month
           elsif match_last_day_next_month                 then  found_last_day_next_month                     # last day next month
           elsif match_last_day_monthname                  then  found_last_day_monthname                      # last day november
-          end                                                                                                 
-                                                                                                              
-      elsif match_at                                                                                          
-          if match_at_time                                                                                    
+          end
+
+      elsif match_at
+          if match_at_time
             if match_at_time_through_time                 then  found_at_time_through_time                    # at 2 through 5pm
             else                                                found_at_time                                 # at 2
-            end                                                                                               
-          end                                                                                                 
-                                                                                                              
+            end
+          end
+
       elsif match_all_day                                 then  found_all_day                                 # all day
-                                                                                                              
-      elsif match_tomorrow                                                                                    
-          if match_tomorrow_through                                                                           
+
+      elsif match_tomorrow
+          if match_tomorrow_through
             if match_tomorrow_through_dayname             then  found_tomorrow_through_dayname                # tomorrow through friday
             elsif match_tomorrow_through_date             then  found_tomorrow_through_date                   # tomorrow through august 20th
-            end                                                                                               
+            end
           else                                                  found_tomorrow                                # tomorrow
-          end                                                                                                 
-                                                                                                              
-      elsif match_now                                                                                         
-          if match_now_through                                                                                
+          end
+
+      elsif match_now
+          if match_now_through
             if match_now_through_dayname                  then  found_now_through_dayname                     # today through friday
             elsif match_now_through_following_dayname     then  found_now_through_following_dayname           # REDUNDANT, PREPROCESS THIS OUT
             elsif match_now_through_date                  then  found_now_through_date                        # today through 10/1
             elsif match_now_through_tomorrow              then  found_now_through_tomorrow                    # today through tomorrow
             elsif match_now_through_next_dayname          then  found_now_through_next_dayname                # today through next friday
-            end                                                                                               
+            end
           else                                                  found_now                                     # today
-          end                                                   
-                                                                
-      elsif match_dayname                                                                                     
+          end
+
+      elsif match_dayname
           if match_dayname_the_ordinal                    then  found_dayname_the_ordinal                     # monday the 21st
           elsif match_dayname_x_weeks_from_next           then  found_dayname_x_weeks_from_next               # monday 2 weeks from next
           elsif match_dayname_x_weeks_from_this           then  found_dayname_x_weeks_from_this               # monday 2 weeks from this
           else                                                  found_dayname                                 # monday (also monday tuesday wed...)
-          end 
-      
+          end
+
       elsif match_through_monthname                       then  found_through_monthname                       # through december (implies through 11/30)
       elsif match_monthname                               then  found_monthname                               # december (implies 12/1 to 12/31)
-                                                                
-      # 5th constructor                                         
+
+      # 5th constructor
       elsif match_start                                   then  found_start
       elsif match_through                                 then  found_through
-                                                        
+
       elsif match_time                                    # match time second to last
           if match_time_through_time                      then  found_time_through_time                       # 10 to 4
           else                                                  found_time                                    # 10
           end
-          
+
       elsif match_date                                    # match date last
           if match_date_through_date                      then  found_date_through_date                       # 5th through the 16th
           else                                                  found_date                                    # 5th
@@ -213,11 +211,11 @@ module Nickel
     def match_every
       @components[@pos]=="every"
     end
-    
+
     def match_every_dayname
       @day_index = ZDate.days_of_week.index(@components[@pos+1])     # if "every [day]"
     end
-    
+
     def found_every_dayname
       day_array=[@day_index]
       j = 2
@@ -225,25 +223,25 @@ module Nickel
         day_array << ZDate.days_of_week.index(@components[@pos+j])
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :weekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :weekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
-    
+
     def match_every_day
       @components[@pos+1] == "day"
     end
-    
+
     def found_every_day
-      @constructs << RecurrenceConstruct.new(:repeats => :daily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :daily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_every_other
       @components[@pos+1] =~ /other|2nd/
     end
-    
+
     def match_every_other_dayname
       @day_index = ZDate.days_of_week.index(@components[@pos+2])      # if "every other mon"
     end
-    
+
     def found_every_other_dayname
       day_array = [@day_index]
       j = 3
@@ -251,25 +249,25 @@ module Nickel
         day_array << ZDate.days_of_week.index(@components[@pos+j])
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :altweekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altweekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
-    
+
     def match_every_other_day
       @components[@pos+2] == "day"       ##  if "every other day"
     end
-    
+
     def found_every_other_day
-      @constructs << RecurrenceConstruct.new(:repeats => :altdaily, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altdaily, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_every_3rd
       @components[@pos+1] == "3rd"
     end
-    
+
     def match_every_3rd_dayname
       @day_index = ZDate.days_of_week.index(@components[@pos+2])      # if "every 3rd tue"
     end
-    
+
     def found_every_3rd_dayname
       day_array = [@day_index]
       j = 3
@@ -277,27 +275,27 @@ module Nickel
         day_array << ZDate.days_of_week.index(@components[@pos+j])
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :threeweekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :threeweekly, :repeats_on => day_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
-    
+
     def match_every_3rd_day
       @components[@pos+2] == "day"       ##  if "every 3rd day"
     end
-    
+
     def found_every_3rd_day
-      @constructs << RecurrenceConstruct.new(:repeats => :threedaily, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :threedaily, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_repeats
       @components[@pos] == "repeats"
     end
-    
+
     def match_repeats_daily
-      @components[@pos+1] == "daily"        
+      @components[@pos+1] == "daily"
     end
 
     def found_repeats_daily
-      @constructs << RecurrenceConstruct.new(:repeats => :daily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :daily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_repeats_altdaily
@@ -305,7 +303,7 @@ module Nickel
     end
 
     def found_repeats_altdaily
-      @constructs << RecurrenceConstruct.new(:repeats => :altdaily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altdaily, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_repeats_weekly_vague
@@ -313,7 +311,7 @@ module Nickel
     end
 
     def found_repeats_weekly_vague
-      @constructs << RecurrenceConstruct.new(:repeats => :weekly, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :weekly, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_repeats_altweekly_vague
@@ -321,7 +319,7 @@ module Nickel
     end
 
     def found_repeats_altweekly_vague
-      @constructs << RecurrenceConstruct.new(:repeats => :altweekly, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altweekly, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_repeats_monthly
@@ -339,22 +337,22 @@ module Nickel
         rep_array << [@week_num, @day_index]
         j += 2
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :daymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :daymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
 
     def match_repeats_datemonthly
-      @components[@pos+2] && @components[@pos+2].valid_dd? && @date_array = [@components[@pos+2].to_i]   # repeats monthly 22nd  
+      @components[@pos+2] && ConstructFinder.ordinal_only?(@components[@pos+2]) && @date_array = [@components[@pos+2].to_i]   # repeats monthly 22nd
     end
 
     def found_repeats_datemonthly
       j = 3
-      while @components[@pos+j] && @components[@pos+j].valid_dd?
+      while @components[@pos+j] && ConstructFinder.ordinal_only?(@components[@pos+j])
         @date_array << @components[@pos+j].to_i
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :datemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :datemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
-    
+
     def match_repeats_altmonthly
       @components[@pos+1] == "altmonthly"
     end
@@ -370,22 +368,22 @@ module Nickel
         rep_array << [@week_num, @day_index]
         j += 2
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :altdaymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altdaymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
 
     def match_repeats_altmonthly_datemonthly
-      @components[@pos+2] && @components[@pos+2].valid_dd? && @date_array = [@components[@pos+2].to_i]   # repeats altmonthly 22nd
+      @components[@pos+2] && ConstructFinder.ordinal_only?(@components[@pos+2]) && @date_array = [@components[@pos+2].to_i]   # repeats altmonthly 22nd
     end
 
     def found_repeats_altmonthly_datemonthly
       j = 3
-      while @components[@pos+j] && @components[@pos+j].valid_dd?
+      while @components[@pos+j] && ConstructFinder.ordinal_only?(@components[@pos+j])
         @date_array << @components[@pos+j].to_i
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :altdatemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :altdatemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
-    
+
     def match_repeats_threemonthly
       @components[@pos+1] == "threemonthly"
     end
@@ -401,32 +399,32 @@ module Nickel
         rep_array << [@week_num, @day_index]
         j += 2
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :threedaymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :threedaymonthly, :repeats_on => rep_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
 
     def match_repeats_threemonthly_datemonthly
-      @components[@pos+2] && @components[@pos+2].valid_dd? && @date_array = [@components[@pos+2].to_i]   # repeats threemonthly 22nd
-    end  
+      @components[@pos+2] && ConstructFinder.ordinal_only?(@components[@pos+2]) && @date_array = [@components[@pos+2].to_i]   # repeats threemonthly 22nd
+    end
 
     def found_repeats_threemonthly_datemonthly
       j = 3
-      while @components[@pos+j] && @components[@pos+j].valid_dd?
+      while @components[@pos+j] && ConstructFinder.ordinal_only?(@components[@pos+j])
         @date_array << @components[@pos+j].to_i
         j += 1
       end
-      @constructs << RecurrenceConstruct.new(:repeats => :threedatemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => method_name)
+      @constructs << RecurrenceConstruct.new(:repeats => :threedatemonthly, :repeats_on => @date_array, :comp_start => @pos, :comp_end => @pos += (j - 1), :found_in => __method__)
     end
 
     def match_for_x
-      @components[@pos]=="for" && @components[@pos+1].digits_only? && @length = @components[@pos+1].to_i
-    end  
+      @components[@pos]=="for" && ConstructFinder.digits_only?(@components[@pos+1]) && @length = @components[@pos+1].to_i
+    end
 
     def match_for_x_days
       @components[@pos+2] =~ /days?/
     end
 
     def found_for_x_days
-      @constructs << WrapperConstruct.new(:wrapper_type => 2, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 2, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_for_x_weeks
@@ -434,7 +432,7 @@ module Nickel
     end
 
     def found_for_x_weeks
-      @constructs << WrapperConstruct.new(:wrapper_type => 3, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 3, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_for_x_months
@@ -442,9 +440,9 @@ module Nickel
     end
 
     def found_for_x_months
-      @constructs << WrapperConstruct.new(:wrapper_type => 4, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 4, :wrapper_length => @length, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
+
     def match_this
       @components[@pos]=="this"
     end
@@ -455,10 +453,10 @@ module Nickel
 
     def found_this_dayname
       day_to_add = @curdate.this(@day_index)
-      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
       while @components[@pos+1] && @day_index = ZDate.days_of_week.index(@components[@pos+1])
         # note @pos gets incremented on each pass
-        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => method_name)
+        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => __method__)
       end
     end
 
@@ -467,7 +465,7 @@ module Nickel
     end
 
     def found_this_week
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(7), :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(7), :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_this_month
@@ -475,10 +473,9 @@ module Nickel
     end
 
     def found_this_month
-      date = NLP::use_date_correction ? @curdate : @curdate.beginning_of_month
-      @constructs << DateSpanConstruct.new(:start_date => date, :end_date => @curdate.end_of_month, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.end_of_month, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
-    
+
 
     def match_next
       @components[@pos]=="next"
@@ -489,7 +486,7 @@ module Nickel
     end
 
     def found_next_weekend
-      dsc = DateSpanConstruct.new(:start_date => @curdate.next(5), :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      dsc = DateSpanConstruct.new(:start_date => @curdate.next(5), :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
       dsc.end_date = dsc.start_date.add_days(1)
       @constructs << dsc
     end
@@ -500,15 +497,15 @@ module Nickel
 
     def found_next_dayname
       day_to_add = @curdate.next(@day_index)
-      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
       while @components[@pos+1] && @day_index = ZDate.days_of_week.index(@components[@pos+1])
         # note @pos gets incremented on each pass
-        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => method_name)
+        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => __method__)
       end
     end
 
     def match_next_x
-      @components[@pos+1] && @components[@pos+1].digits_only? && @length = @components[@pos+1].to_i
+      @components[@pos+1] && ConstructFinder.digits_only?(@components[@pos+1]) && @length = @components[@pos+1].to_i
     end
 
     def match_next_x_days
@@ -516,7 +513,7 @@ module Nickel
     end
 
     def found_next_x_days
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_next_x_weeks
@@ -524,7 +521,7 @@ module Nickel
     end
 
     def found_next_x_weeks
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_next_x_months
@@ -532,7 +529,7 @@ module Nickel
     end
 
     def found_next_x_months
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_months(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_months(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_next_x_years
@@ -540,7 +537,7 @@ module Nickel
     end
 
     def found_next_x_years
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_years(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_years(@length), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_next_week
@@ -550,7 +547,7 @@ module Nickel
     def found_next_week
       sd = @curdate.add_days(7)
       ed = sd.add_days(7)
-      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_next_month
@@ -561,31 +558,31 @@ module Nickel
     def found_next_month
       sd = @curdate.add_months(1).beginning_of_month
       ed = sd.end_of_month
-      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
-    
+
     def match_week
       @components[@pos] == "week"
     end
-    
+
     def match_week_of_date
-      @components[@pos+1] == "of" && @date1 = @components[@pos+2].interpret_date(@curdate)
+      @components[@pos+1] == "of" && @date1 = ZDate.interpret(@components[@pos+2], @curdate)
     end
 
     def found_week_of_date
-      @constructs << DateSpanConstruct.new(:start_date => @date1, :end_date => @date1.add_days(7), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @date1, :end_date => @date1.add_days(7), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
+
     def match_week_through_date
-      @components[@pos+1] == "through" && @date1 = @components[@pos+2].interpret_date(@curdate)
+      @components[@pos+1] == "through" && @date1 = ZDate.interpret(@components[@pos+2], @curdate)
     end
 
     def found_week_through_date
-      @constructs << DateSpanConstruct.new(:start_date => @date1.sub_days(7), :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @date1.sub_days(7), :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
+
     def match_x_weeks_from
-      @components[@pos].digits_only? && @components[@pos+1] =~ /^weeks?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i      # if "x weeks from"
+      ConstructFinder.digits_only?(@components[@pos]) && @components[@pos+1] =~ /^weeks?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i      # if "x weeks from"
     end
 
     def match_x_weeks_from_dayname
@@ -593,18 +590,18 @@ module Nickel
     end
 
     def found_x_weeks_from_dayname
-      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     # Reduntant, preprocess out!
     def match_x_weeks_from_this_dayname
       @components[@pos+3] == "this" && @day_index = ZDate.days_of_week.index(@components[@pos+4])           # if "x weeks from this monday"
     end
-    
+
     # Reduntant, preprocess out!
     def found_x_weeks_from_this_dayname
       # this is the exact some construct as found_x_weeks_from_dayname, just position and comp_end has to increment by 1 more; pretty stupid, this should be caught in preprocessing
-      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @day_index), :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @day_index), :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
 
     def match_x_weeks_from_next_dayname
@@ -612,7 +609,7 @@ module Nickel
     end
 
     def found_x_weeks_from_next_dayname
-      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length + 1, @day_index), :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length + 1, @day_index), :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
 
     def match_x_weeks_from_tomorrow
@@ -620,7 +617,7 @@ module Nickel
     end
 
     def found_x_weeks_from_tomorrow
-      @constructs << DateConstruct.new(:date => @curdate.add_days(1).add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_days(1).add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_weeks_from_now
@@ -628,7 +625,7 @@ module Nickel
     end
 
     def found_x_weeks_from_now
-      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @curdate.dayindex), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.x_weeks_from_day(@length, @curdate.dayindex), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_weeks_from_yesterday
@@ -636,11 +633,11 @@ module Nickel
     end
 
     def found_x_weeks_from_yesterday
-      @constructs << DateConstruct.new(:date => @curdate.sub_days(1).add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.sub_days(1).add_weeks(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
-    
+
     def match_x_months_from
-      @components[@pos].digits_only? && @components[@pos+1] =~ /^months?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i       # if "x months from"
+      ConstructFinder.digits_only?(@components[@pos]) && @components[@pos+1] =~ /^months?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i       # if "x months from"
     end
 
     def match_x_months_from_dayname
@@ -648,7 +645,7 @@ module Nickel
     end
 
     def found_x_months_from_dayname
-      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_months_from_this_dayname
@@ -656,7 +653,7 @@ module Nickel
     end
 
     def found_x_months_from_this_dayname
-      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
 
     def match_x_months_from_next_dayname
@@ -664,7 +661,7 @@ module Nickel
     end
 
     def found_x_months_from_next_dayname
-      @constructs << DateConstruct.new(:date => @curdate.next(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.next(@day_index).add_months(@length), :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
 
     def match_x_months_from_tomorrow
@@ -672,7 +669,7 @@ module Nickel
     end
 
     def found_x_months_from_tomorrow
-      @constructs << DateConstruct.new(:date => @curdate.add_days(1).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_days(1).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_months_from_now
@@ -680,7 +677,7 @@ module Nickel
     end
 
     def found_x_months_from_now
-      @constructs << DateConstruct.new(:date => @curdate.add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_months_from_yesterday
@@ -688,11 +685,11 @@ module Nickel
     end
 
     def found_x_months_from_yesterday
-      @constructs << DateConstruct.new(:date => @curdate.sub_days(1).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.sub_days(1).add_months(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
-    
+
     def match_x_days_from
-      @components[@pos].digits_only? && @components[@pos+1] =~ /^days?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i     # 3 days from    
+      ConstructFinder.digits_only?(@components[@pos]) && @components[@pos+1] =~ /^days?$/ && @components[@pos+2] == "from" && @length = @components[@pos].to_i     # 3 days from
     end
 
     def match_x_days_from_now
@@ -700,7 +697,7 @@ module Nickel
     end
 
     def found_x_days_from_now
-      @constructs << DateConstruct.new(:date => @curdate.add_days(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_days(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_days_from_dayname
@@ -708,11 +705,11 @@ module Nickel
     end
 
     def found_x_days_from_dayname
-      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_days(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.this(@day_index).add_days(@length), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
-    
+
     def match_x_dayname_from
-      @components[@pos].digits_only? && (@day_index = ZDate.days_of_week.index(@components[@pos+1])) && @components[@pos+2] == "from" && @length = @components[@pos].to_i    # "2 tuesdays from"
+      ConstructFinder.digits_only?(@components[@pos]) && (@day_index = ZDate.days_of_week.index(@components[@pos+1])) && @components[@pos+2] == "from" && @length = @components[@pos].to_i    # "2 tuesdays from"
     end
 
     def match_x_dayname_from_now
@@ -722,7 +719,7 @@ module Nickel
     def found_x_dayname_from_now
       # this isn't exactly intuitive.  If someone says "two tuesday from now" and it is tuesday, they mean "in two weeks."  If it is not tuesday, they mean "next tuesday"
       d = (@days_index == @curdate.dayindex) ? @curdate.add_weeks(@length) : @curdate.x_weeks_from_day(@length - 1, @day_index)
-      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_dayname_from_tomorrow
@@ -733,7 +730,7 @@ module Nickel
       # If someone says "two tuesday from tomorrow" and tomorrow is tuesday, they mean "two weeks from tomorrow."  If it is not tuesday, this person does not make sense, but we can interpet it as "next tuesday"
       tomorrow_index = (@curdate.dayindex + 1) % 7
       d = (@days_index == tomorrow_index) ? @curdate.add_days(1).add_weeks(@length) : @curdate.x_weeks_from_day(@length - 1, @day_index)
-      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_dayname_from_yesterday
@@ -744,7 +741,7 @@ module Nickel
       # If someone says "two tuesday from yesterday" and yesterday was tuesday, they mean "two weeks from yesterday."  If it is not tuesday, this person does not make sense, but we can interpet it as "next tuesday"
       yesterday_index = (@curdate.dayindex == 0 ? 6 : @curdate.dayindex - 1)
       d = (@days_index == yesterday_index) ? @curdate.sub_days(1).add_weeks(@length) : @curdate.x_weeks_from_day(@length - 1, @day_index)
-      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => d, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_x_dayname_from_this
@@ -752,7 +749,7 @@ module Nickel
     end
 
     def found_x_dayname_from_this
-      dc = DateConstruct.new(:date => @curdate.this(@day_index).add_weeks(@length), :comp_start => @pos, :found_in => method_name)
+      dc = DateConstruct.new(:date => @curdate.this(@day_index).add_weeks(@length), :comp_start => @pos, :found_in => __method__)
       if @components[@post+4] == "one" || ZDate.days_of_week.index(@components[@pos+4])    # talk about redundant (2 tuesdays from this one, 2 tuesdays from this tuesday)
         dc.comp_end = @pos += 4
       else
@@ -766,7 +763,7 @@ module Nickel
     end
 
     def found_x_dayname_from_next
-      dc = DateConstruct.new(:date => @curdate.next(@day_index).add_weeks(@length), :comp_start => @pos, :found_in => method_name)
+      dc = DateConstruct.new(:date => @curdate.next(@day_index).add_weeks(@length), :comp_start => @pos, :found_in => __method__)
       if @components[@post+4] == "one" || ZDate.days_of_week.index(@components[@pos+4])    # talk about redundant (2 tuesdays from next one, 2 tuesdays from next tuesday)
         dc.comp_end = @pos += 4
       else
@@ -774,29 +771,29 @@ module Nickel
       end
       @constructs << dc
     end
-    
+
     def match_x_minutes_from_now
-      @components[@pos].digits_only? && @components[@pos+1] =~ /minutes?/ && @components[@pos+2] == "from" && @components[@pos+3] =~ /^(today|now)$/ && @length = @components[@pos].to_i
+      ConstructFinder.digits_only?(@components[@pos]) && @components[@pos+1] =~ /minutes?/ && @components[@pos+2] == "from" && @components[@pos+3] =~ /^(today|now)$/ && @length = @components[@pos].to_i
     end
 
     def found_x_minutes_from_now
       date = nil  # define out of scope of block
       time = @curtime.add_minutes(@length) {|days_to_increment| date = @curdate.add_days(days_to_increment)}
-      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos + 4, :found_in => method_name)
-      @constructs << TimeConstruct.new(:time => time, :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos + 4, :found_in => __method__)
+      @constructs << TimeConstruct.new(:time => time, :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
 
     def match_x_hours_from_now
-      @components[@pos].digits_only? && @components[@pos+1] =~ /hours?/ && @components[@pos+2] == "from" && @components[@pos+3] =~ /^(today|now)$/ && @length = @components[@pos].to_i
+      ConstructFinder.digits_only?(@components[@pos]) && @components[@pos+1] =~ /hours?/ && @components[@pos+2] == "from" && @components[@pos+3] =~ /^(today|now)$/ && @length = @components[@pos].to_i
     end
 
     def found_x_hours_from_now
       date = nil
       time = @curtime.add_hours(@length) {|days_to_increment| date = @curdate.add_days(days_to_increment)}
-      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos + 4, :found_in => method_name)
-      @constructs << TimeConstruct.new(:time => time, :comp_start => @pos, :comp_end => @pos += 4, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos + 4, :found_in => __method__)
+      @constructs << TimeConstruct.new(:time => time, :comp_start => @pos, :comp_end => @pos += 4, :found_in => __method__)
     end
-    
+
     def match_ordinal_dayname
       @components[@pos]=~/(1st|2nd|3rd|4th|5th)/ && (@day_index = ZDate.days_of_week.index(@components[@pos+1])) && @week_num = @components[@pos].to_i     # last saturday
     end
@@ -806,7 +803,7 @@ module Nickel
     end
 
     def found_ordinal_dayname_this_month
-      @constructs << DateConstruct.new(:date => @curdate.ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_ordinal_dayname_next_month
@@ -814,7 +811,7 @@ module Nickel
     end
 
     def found_ordinal_dayname_next_month
-      @constructs << DateConstruct.new(:date => @curdate.add_months(1).ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_months(1).ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_ordinal_dayname_monthname
@@ -822,9 +819,9 @@ module Nickel
     end
 
     def found_ordinal_dayname_monthname
-      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).ordinal_dayindex(@week_num, @day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
+
 
     def match_ordinal_this_month
       @components[@pos]=~/(0?[1-9]|[12][0-9]|3[01])(st|nd|rd|th)/ && @components[@pos+1] == 'this' && @components[@pos+2] = 'month' && @length = @components[@pos].to_i      # 28th this month
@@ -835,20 +832,20 @@ module Nickel
     end
 
     def found_ordinal_this_month
-      if NLP::use_date_correction && @curdate.day > @length
+      if @curdate.day > @length
         # e.g. it is the 30th of the month and a user types "1st of the month", they mean "first of next month"
         date = @curdate.add_months(1).beginning_of_month.add_days(@length - 1)
       else
         date = @curdate.beginning_of_month.add_days(@length - 1)
       end
-      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => date, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def found_ordinal_next_month
-      @constructs << DateConstruct.new(:date => @curdate.add_months(1).beginning_of_month.add_days(@length - 1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_months(1).beginning_of_month.add_days(@length - 1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
-    
+
+
     def match_first_day
       @components[@pos] == "1st" && @components[@pos+1] == "day"     # 1st day
     end
@@ -858,7 +855,7 @@ module Nickel
     end
 
     def found_first_day_this_month
-      @constructs << DateConstruct.new(:date => @curdate.beginning_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.beginning_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_first_day_next_month
@@ -866,7 +863,7 @@ module Nickel
     end
 
     def found_first_day_next_month
-      @constructs << DateConstruct.new(:date => @curdate.add_months(1).beginning_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_months(1).beginning_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_first_day_monthname
@@ -874,7 +871,7 @@ module Nickel
     end
 
     def found_first_day_monthname
-      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_last_day
@@ -886,7 +883,7 @@ module Nickel
     end
 
     def found_last_day_this_month
-      @constructs << DateConstruct.new(:date => @curdate.end_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.end_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_last_day_next_month
@@ -894,7 +891,7 @@ module Nickel
     end
 
     def found_last_day_next_month
-      @constructs << DateConstruct.new(:date => @curdate.add_months(1).end_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_months(1).end_of_month, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_last_day_monthname
@@ -902,27 +899,27 @@ module Nickel
     end
 
     def found_last_day_monthname
-      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).end_of_month, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).end_of_month, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
-    
+
     def match_at
       @components[@pos]=="at"
     end
 
     def match_at_time
-      @components[@pos+1] && @time1 = @components[@pos+1].interpret_time
+      @components[@pos+1] && @time1 = ZTime.interpret(@components[@pos+1])
     end
 
     def match_at_time_through_time
-      @components[@pos+2] =~ /^(to|until|through)$/ && @components[@pos+3] && @time2 = @components[@pos+3].interpret_time
+      @components[@pos+2] =~ /^(to|until|through)$/ && @components[@pos+3] && @time2 = ZTime.interpret(@components[@pos+3])
     end
 
     def found_at_time_through_time
-      @constructs << TimeSpanConstruct.new(:start_time => @time1, :end_time => @time2, :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << TimeSpanConstruct.new(:start_time => @time1, :end_time => @time2, :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def found_at_time
-      @constructs << TimeConstruct.new(:time => @time1, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << TimeConstruct.new(:time => @time1, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_all_day
@@ -930,9 +927,9 @@ module Nickel
     end
 
     def found_all_day
-      @constructs << TimeConstruct.new(:time => nil, :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << TimeConstruct.new(:time => nil, :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
-    
+
     def match_tomorrow
       @components[@pos]=="tomorrow"
     end
@@ -946,21 +943,21 @@ module Nickel
     end
 
     def found_tomorrow_through_dayname
-      @constructs << DateSpanConstruct.new(:start_date => @curdate.add_days(1), :end_date => @curdate.add_days(1).this(@day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate.add_days(1), :end_date => @curdate.add_days(1).this(@day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_tomorrow_through_date
-      @date1 = @components[@pos+2].interpret_date(@curdate)       # tomorrow until 9/21
+      @date1 = ZDate.interpret(@components[@pos+2], @curdate)       # tomorrow until 9/21
     end
 
     def found_tomorrow_through_date
-      @constructs << DateSpanConstruct.new(:start_date => @curdate.add_days(1), :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate.add_days(1), :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def found_tomorrow
-      @constructs << DateConstruct.new(:date => @curdate.add_days(1), :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate.add_days(1), :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
-    
+
     def match_now
       @components[@pos]=="today" || @components[@pos]=="now"
     end
@@ -974,7 +971,7 @@ module Nickel
     end
 
     def found_now_through_dayname
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.this(@day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.this(@day_index), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     # redundant!! preprocess this out of here!
@@ -984,15 +981,15 @@ module Nickel
 
     # redundant!! preprocess this out of here!
     def found_now_through_following_dayname
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.this(@day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.this(@day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def match_now_through_date
-      @date1 = @components[@pos+2].interpret_date(@curdate)       # now until 9/21
+      @date1 = ZDate.interpret(@components[@pos+2], @curdate)       # now until 9/21
     end
 
     def found_now_through_date
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_now_through_tomorrow
@@ -1000,7 +997,7 @@ module Nickel
     end
 
     def found_now_through_tomorrow
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.add_days(1), :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def match_now_through_next_dayname
@@ -1008,36 +1005,36 @@ module Nickel
     end
 
     def found_now_through_next_dayname
-      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.next(@day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @curdate, :end_date => @curdate.next(@day_index), :comp_start => @pos, :comp_end => @pos += 3, :found_in => __method__)
     end
 
     def found_now
-      @constructs << DateConstruct.new(:date => @curdate, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @curdate, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
-    
+
     def match_dayname
       @day_index = ZDate.days_of_week.index(@components[@pos])
     end
 
     def match_dayname_the_ordinal
-      @components[@pos+1] == "the" && @date1 = @components[@pos+2].interpret_date(@curdate)    # if "tue the 23rd"
+      @components[@pos+1] == "the" && @date1 = ZDate.interpret(@components[@pos+2], @curdate)    # if "tue the 23rd"
     end
 
     def found_dayname_the_ordinal
       # user may have specified "monday the 2nd" while in the previous month, so first check if dayname matches date.dayname, if it doesn't increment by a month and check again
       if @date1.dayname == @components[@pos] || ((tmp = @date1.add_months(1)) && tmp.dayname == @components[@pos] && @date1 = tmp)
-        @constructs << DateConstruct.new(:date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+        @constructs << DateConstruct.new(:date => @date1, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
       end
     end
 
     def match_dayname_x_weeks_from_this
-      @components[@pos+1] && @components[@pos+1].digits_only? && @components[@pos+2] =~ /\bweeks?\b/ && @components[@pos+3] =~ /\b(from)|(after)/ && @components[@pos+4] == "this" && @length = @components[@pos+1]           # "monday two weeks from this
+      @components[@pos+1] && ConstructFinder.digits_only?(@components[@pos+1]) && @components[@pos+2] =~ /\bweeks?\b/ && @components[@pos+3] =~ /\b(from)|(after)/ && @components[@pos+4] == "this" && @length = @components[@pos+1]           # "monday two weeks from this
     end
 
     def found_dayname_x_weeks_from_this
-      dc = DateConstruct.new(:date => @curdate.this(@dayindex).add_weeks(@length), :comp_start => @pos, :found_in => method_name)
+      dc = DateConstruct.new(:date => @curdate.this(@dayindex).add_weeks(@length), :comp_start => @pos, :found_in => __method__)
       if ZDate.days_of_week.include?(@components[@pos+5])  #redundant
-        dc.comp_end = @pos += 5 
+        dc.comp_end = @pos += 5
       else
         dc.comp_end = @pos += 4
       end
@@ -1045,13 +1042,13 @@ module Nickel
     end
 
     def match_dayname_x_weeks_from_next
-      @components[@pos+1] && @components[@pos+1].digits_only? && @components[@pos+2] =~ /\bweeks?\b/ && @components[@pos+3] =~ /\b(from)|(after)/ && @components[@pos+4] == "next" && @length = @components[@pos+1]           # "monday two weeks from this
+      @components[@pos+1] && ConstructFinder.digits_only?(@components[@pos+1]) && @components[@pos+2] =~ /\bweeks?\b/ && @components[@pos+3] =~ /\b(from)|(after)/ && @components[@pos+4] == "next" && @length = @components[@pos+1]           # "monday two weeks from this
     end
 
     def found_dayname_x_weeks_from_next
-      dc = DateConstruct.new(:date => @curdate.next(@dayindex).add_weeks(@length), :comp_start => @pos, :found_in => method_name)
+      dc = DateConstruct.new(:date => @curdate.next(@dayindex).add_weeks(@length), :comp_start => @pos, :found_in => __method__)
       if ZDate.days_of_week.include?(@components[@pos+5])  #redundant
-        dc.comp_end = @pos += 5 
+        dc.comp_end = @pos += 5
       else
         dc.comp_end = @pos += 4
       end
@@ -1061,10 +1058,10 @@ module Nickel
     # redundant, same as found_this_dayname
     def found_dayname
       day_to_add = @curdate.this(@day_index)
-      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => day_to_add, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
       while @components[@pos+1] && @day_index = ZDate.days_of_week.index(@components[@pos+1])
         # note @pos gets incremented here:
-        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => method_name)
+        @constructs << DateConstruct.new(:date => day_to_add = day_to_add.this(@day_index), :comp_start => @pos + 1, :comp_end => @pos += 1, :found_in => __method__)
       end
     end
 
@@ -1074,8 +1071,8 @@ module Nickel
 
     def found_through_monthname
       # this is really a wrapper, we don't know when the start date is, so make sure @constructs gets wrapper first, as date constructs always have to appear after wrapper
-      @constructs << WrapperConstruct.new(:wrapper_type => 1, :comp_start => @pos, :comp_end => @pos + 1, :found_in => method_name)
-      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).sub_days(1), :comp_start => @pos, :comp_end => @pos += 1, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 1, :comp_start => @pos, :comp_end => @pos + 1, :found_in => __method__)
+      @constructs << DateConstruct.new(:date => @curdate.jump_to_month(@month_index + 1).sub_days(1), :comp_start => @pos, :comp_end => @pos += 1, :found_in => __method__)
     end
 
     def match_monthname
@@ -1086,7 +1083,7 @@ module Nickel
     def found_monthname
       sd = @curdate.jump_to_month(@month_index + 1)
       ed = sd.end_of_month
-      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => sd, :end_date => ed, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
 
 
@@ -1096,7 +1093,7 @@ module Nickel
 
     def found_start
       #wrapper_type 0 is a start wrapper
-      @constructs << WrapperConstruct.new(:wrapper_type => 0, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 0, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
 
     def match_through
@@ -1105,40 +1102,50 @@ module Nickel
 
     def found_through
       #wrapper_type 1 is an end wrapper
-      @constructs << WrapperConstruct.new(:wrapper_type => 1, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << WrapperConstruct.new(:wrapper_type => 1, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
 
     def match_time
-      @time1 = @components[@pos].interpret_time
+      @time1 = ZTime.interpret(@components[@pos])
     end
 
     def match_time_through_time
-      @components[@pos+1] =~ /^(to|through)$/ && @time2 = @components[@pos+2].interpret_time
+      @components[@pos+1] =~ /^(to|through)$/ && @time2 = ZTime.interpret(@components[@pos+2])
     end
 
     def found_time_through_time
-      @constructs << TimeSpanConstruct.new(:start_time => @time1, :end_time => @time2, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << TimeSpanConstruct.new(:start_time => @time1, :end_time => @time2, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def found_time
-      @constructs << TimeConstruct.new(:time => @time1, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
-      match = true
+      @constructs << TimeConstruct.new(:time => @time1, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
     end
 
     def match_date
-      @date1 = @components[@pos].interpret_date(@curdate)
+      @date1 = ZDate.interpret(@components[@pos], @curdate)
     end
 
     def match_date_through_date
-      @components[@pos+1] =~ /^(through|to|until)$/ && @date2 = @components[@pos+2].interpret_date(@curdate)
+      @components[@pos+1] =~ /^(through|to|until)$/ && @date2 = ZDate.interpret(@components[@pos+2], @curdate)
     end
 
     def found_date_through_date
-      @constructs << DateSpanConstruct.new(:start_date => @date1, :end_date => @date2, :comp_start => @pos, :comp_end => @pos += 2, :found_in => method_name)
+      @constructs << DateSpanConstruct.new(:start_date => @date1, :end_date => @date2, :comp_start => @pos, :comp_end => @pos += 2, :found_in => __method__)
     end
 
     def found_date
-      @constructs << DateConstruct.new(:date => @date1, :comp_start => @pos, :comp_end => @pos, :found_in => method_name)
+      @constructs << DateConstruct.new(:date => @date1, :comp_start => @pos, :comp_end => @pos, :found_in => __method__)
+    end
+
+    class << self
+      def digits_only?(str)
+        str =~ /^\d+$/ #no characters other than digits
+      end
+
+      # valid hour, 24hour, and minute could use some cleaning
+      def ordinal_only?(str)
+        str =~ %r{^(0?[1-9]|[12][0-9]|3[01])(?:st|nd|rd|th)?$}
+      end
     end
   end # END class ConstructFinder
 end