event_nlp 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7bd2a0880cb2646bfd8241934a3f295f2790d1c8a6912058bf26dbd12c2f5e4
-  data.tar.gz: 1e62175f0137981d910a8e177f2f2ba6026e54e8f8306f17037f6f8d19d800aa
+  metadata.gz: e3cc81afc327dd3a3d2015b561a327fd7c0bd590690be494ae689effb6aa4958
+  data.tar.gz: 01ac801f9a5df6ac4e80fdaf21b9de3120873271fd2adc770a96a28f131ed569
 SHA512:
-  metadata.gz: 803ba376567fd1693bbc3618bda094d46608ba293ca1d43dd93df305d017ce2403190fb8b33df128ef260e9210f33a530a4aa1fb1a62923d9f35c9bd77bed026
-  data.tar.gz: 26385ac01d68d9162d57e822ec271c1993f214b2e5960198f5a13d30fbb2368e34d6db5ee6e13422a76cadeda6c06cc6f6072aac70f3733162cb0aada7aa3b8c
+  metadata.gz: '0026970aa8352d0ec613de80baf723400cdb79ed173989e632d48329985b69405c4f56d5448c8998d867c2c059ac402bd119b1faa216bfa9aa3d2367bba852b3'
+  data.tar.gz: d91e0d5d9ef57826fee3e24a6a9cc969e8a8206144c0adf2c6fda6e4bea339283f54092e13730f4f7aa164c0b64a8802401e9ce1234eecbdb42ea00abee6c11c

data/lib/event_nlp.rb

@@ -24,8 +24,8 @@ class EventNlp
   using ColouredText
   
   attr_accessor :params
-  
-  def initialize(now=Time.now, params: {}, debug: false)
+    
+  def initialize(now=Time.now, params: {leap: :back}, debug: false)
     
     super()
     
@@ -45,6 +45,7 @@ class EventNlp
     #-----------------------------------------------------------
 
     @params[:input] = s
+    puts 'parse: about to execute run_route' if @debug
     r = run_route(s)
 
     return unless r.is_a? Hash
@@ -67,6 +68,7 @@ class EventNlp
     end_date = if raw_end_date then
       EventNlp.new().parse(raw_end_date).date    
     else
+      puts 'before date parse' if @debug
       (Date.parse('1 Jan ' + (year+1).to_s) - 1).to_time
     end
     
@@ -93,6 +95,7 @@ class EventNlp
 
     while r.date <= end_date do
 
+      puts 'project/r.date: ' + r.date.inspect if @debug
       dates << r.date
       @now = if r.recurring == 'month' then
        (r.date.to_date >> 1).to_time
@@ -190,10 +193,29 @@ class EventNlp
    get /(.*) on the #{days} of every (month)/i do |title, day, recurring|
 
 
+      puts 'inside route 0.1' if @debug
       puts 'day: ' + day.inspect if @debug
-      raw_d = Chronic.parse(day + ' ' + Date::MONTHNAMES[@now.month], now: @now)
+      
+      month = @now.month
+      
+      if @now.month == 2 then
+        
+        if (!Date.leap?(@now.year) and day.to_i == 29) or day.to_i == 30 then
+          if params[:leap] == :back then
+            day = '28th'
+          else
+            day = '1st'
+            month += 1
+          end
+        end
+        
+      end
+      
+      raw_d = Chronic.parse(day + ' ' + Date::MONTHNAMES[month], now: @now)
+      puts 'raw_d: ' + raw_d.inspect if @debug
       
       # if the date is less than now then increment it by a month
+      puts '@now: ' + @now.inspect if @debug
       d = raw_d < @now ? (raw_d.to_date >> 1).to_time : raw_d
       
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - James Robertson