Made the insert recurs before into a regexp in a substitution, rather

than a "lame" method

Author: iainbeeston

lib/nickel/nlp_query.rb

@@ -41,7 +41,6 @@ def query_formatting
       Substitutions::Weekdays.apply(self)
       Substitutions::Months.apply(self)
       Substitutions::Numbers.apply(self)
-      insert_repeats_before_words_indicating_recurrence_lame
       query_str.concat(' ')
       @after_formatting = query_str.dup    # save current state
     end
@@ -79,16 +78,6 @@ def query_pre_processing
       standardize_input
     end
 
-    def insert_repeats_before_words_indicating_recurrence_lame
-      comps = query_str.split
-      (daily_index = comps.index('daily')) && comps[daily_index - 1] != 'repeats' && comps[daily_index] = 'repeats daily'
-      (weekly_index = comps.index('weekly')) && comps[weekly_index - 1] != 'repeats' && comps[weekly_index] = 'repeats weekly'
-      (monthly_index = comps.index('monthly')) && comps[monthly_index - 1] != 'repeats' && comps[monthly_index] = 'repeats monthly'
-      if (rejoin = comps.join(' ')) != query_str
-        nsub!(/.+/, rejoin)
-      end
-    end
-
     def to_s
       query_str
     end

lib/nickel/substitutions/repetition.rb

@@ -21,6 +21,9 @@ class Repetition < Substitutor
         [/fridays/, 'every fri'],
         [/saturdays/, 'every sat'],
         [/sundays/, 'every sun'],
+        [/(?<!repeats )daily/, 'repeats daily'],
+        [/(?<!repeats )weekly/, 'repeats weekly'],
+        [/(?<!repeats )monthly/, 'repeats monthly'],
       ]
     end
   end