event_nlp 0.5.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f046c9ebbe0ea0e05075a6eaa38d6b5cf053d5072fc6a0ea7ec93d695f5ea449
-  data.tar.gz: 51912d0dee9bf7c638ddb4b10946ad0f5ce560ed95398ab12a27ea417ae79391
+  metadata.gz: 34bd0366a4fd2bc97bf23dfaa4811bbf7b1add8b682c4a12133bacad71fe1126
+  data.tar.gz: d55983a0b2b70f388d1e1d06b0bf884d38c907c80045afe79c5542f346ecf864
 SHA512:
-  metadata.gz: 5e093f418335b13bd36e811176d837caa7ad399d27f09f2d6f06cc057a08a91fd9c84bf19d6d7d8403b136f88ee37d99ee262c60df1285f96a3d205da83fc571
-  data.tar.gz: 1bae302d138066d0913dc3cc7e272d233421faf44a06846e39742c5f09d4fc3cbf0ebd128ac2c002d3e030f8a99ed8bcb94a740ff617cb2eae8697cc905afe49
+  metadata.gz: be80fc3036e3944e2dd50bfa4efa8d63ddd0bc09093b10fd8d8504f79da261d59a020b0277d679142c6bd185faa9f18e16bddd89da11c7123a649de73aad57dc
+  data.tar.gz: d050f6ab6363fe62b40240a821ab4a6aaa554b78fba9d2ed9126581dc705bcf799cbce42cc24c8bdd6a8778c07d40762c457a460090e5f661f5af1c9c47b3e79

data/lib/event_nlp.rb

@@ -7,12 +7,11 @@ require 'ostruct'
 require 'app-routes'
 
 
-
 module Ordinals
 
   refine Integer do
     def ordinal
-      self.to_s + ( (10...20).include?(self) ? 'th' : 
+      self.to_s + ( self.between?(10,20) ? 'th' :
                     %w{ th st nd rd th th th th th th }[self % 10] )
     end
   end
@@ -23,99 +22,153 @@ class EventNlp
   include AppRoutes
   using Ordinals
   using ColouredText
-  
+
   attr_accessor :params
-  
+
   def initialize(now=Time.now, params: {}, debug: false)
-    
+
     super()
-    
+
     @now = now
     @params = params
     expressions(@params)
     @debug = debug
 
   end
-  
-  def parse(s)
+
+  def parse(raws)
+
+    # catch irregular expressions and interpret them in advance
+    #
+    # e.g. Cafe meeting Thursday every 2 weeks =>
+    #                       Cafe meeting every 2nd Thursday
+    #
+    weekdays2 = (Date::DAYNAMES + Date::ABBR_DAYNAMES).join('|').downcase
+    pattern = /(?<day>#{weekdays2}) every (?<n>\d) weeks/i
+    found = raws.match(pattern)
+
+    s = if found then
+      s2 = "every %s %s" % [found[:n].to_i.ordinal, found[:day]]
+      raws.sub(pattern, s2)
+    else
+      raws
+    end
+
+    #-----------------------------------------------------------
 
     @params[:input] = s
     r = run_route(s)
 
     return unless r.is_a? Hash
-    
+
     OpenStruct.new({input: s}.merge r)
-    
-  end  
+
+  end
+
+  # returns an Array object of dates, projected from a recurring event
+  #
+  def project(s, year: Time.now.year)
+
+    r = parse s
+    dates = []
+    now = @now
+
+    while r.date.year == year.to_i do
+
+      dates << r.date
+      @now = r.date + 1
+      r = parse(r.input)
+
+    end
+
+    @now = now
+    return dates
+
+  end
 
   private
 
-  def expressions(params)     
+  def expressions(params)
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
-    weekdays2 = (Date::DAYNAMES + Date::ABBR_DAYNAMES).join('|').downcase    
+    weekdays2 = (Date::DAYNAMES + Date::ABBR_DAYNAMES).join('|').downcase
     weekdays = "(%s)" % weekdays2
     months = "(%s)" % (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
                                                         .join('|').downcase
     times = /(?: *(?:at |@ |from )?(\d+(?::\d+)?(?:[ap]m|\b)) *)/
     times2 = /\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?/
-    times3 = /(\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?)/    
+    times3 = /(\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?)/
     days = /(\d+(?:st|nd|rd|th))/
     periods = /day|week|month/
-    
+
     #weekdays = Date::DAYNAMES.join('|').downcase
     #
-    
+
     #times = /(?: *at )?\d[ap]m/
 
-   # e.g. electricity bill on the 28th of every month    
+   # e.g. electricity bill on the 28th of every month
 
    get /(.*) on the (#{days}) of every (#{periods})/ do |title, day, recurring|
 
 
       raw_d = Chronic.parse(day)
-      
+
       # if the date is less than now then increment it by a month
       d = raw_d < @now ? (raw_d.to_date >> 1).to_time : raw_d
-      
-      
+
+
       if @debug then
         puts [0.1, title, recurring, d].inspect.debug
       end
-      
-      {title: title, recurring: recurring, date: d}      
-      
+
+      {title: title, recurring: recurring, date: d}
+
     end
-    
 
-    get /^(.*)\s+(every \d\w+ \w+#{times})\s*#{starting}/ do \
+
+    get /^(.*)\s+(every \d\w+ \w+#{times}\s*#{starting})/ do \
                                    |title, recurring, time, raw_date, end_date|
 
-      input = params[:input].clone            
+      input = params[:input].clone
       d = Chronic.parse(raw_date + ' ' + time.to_s)
-      
+
+      if @debug then
+        puts 'e300'
+        puts 'd: ' + d.inspect
+        puts 'recurring: ' + recurring.inspect
+      end
+
       if recurring =~ /day|week/ then
 
         if d < @now then
 
-          new_date = CronFormat.new(ChronicCron.new(recurring)\
-                                    .to_expression, d).to_time
+          cc = ChronicCron.new(recurring, d)
+          exp = cc.to_expression
+          puts 'exp: ' + exp.inspect if @debug
+
+          cf = CronFormat.new(exp, d)
+          cf.next until cf.to_time > @now
+
+          new_date = cf.to_time
+          puts 'new_date: ' + new_date.inspect if @debug
+
           input.gsub!(raw_date, new_date\
-                      .strftime("#{new_date.day.ordinal} %b %Y"))             
+                      .strftime("#{new_date.day.ordinal} %b %Y"))
           d = new_date
-          
+
         end
       end
-      
+
       if @debug then
-        puts ["0.2".highlight, input, title, recurring, time, raw_date, end_date].inspect.debug
+        puts 'd: ' + d.inspect
+        puts ["0.2", input, title, recurring, time, raw_date, end_date].inspect.debug
       end
-      
-      {input: input, title: title, recurring: recurring, date: d, 
-       end_date: end_date}      
-      
+
+      {input: input, title: title, recurring: recurring, date: d,
+       end_date: end_date}
+
     end
-    
+
     # e.g. some event 1st Monday of every month (starting 3rd Jul 2017)
 
     get /^(.*)\s+(\d(?:st|nd|rd|th) \w+ of every \w+(?: at (\d+[ap]m) )?)\s*#{starting}/ do \
@@ -123,55 +176,56 @@ class EventNlp
 
       input = params[:input].clone
       d = Chronic.parse(raw_date)
-      
-      if recurring =~ /day|week|month/ then        
-        
+
+      if recurring =~ /day|week|month/ then
+
         if d < @now then
 
           new_date = CronFormat.new(ChronicCron.new(recurring)\
                                     .to_expression, d).to_time
           input.gsub!(raw_date, new_date\
-                      .strftime("#{new_date.day.ordinal} %b %Y"))        
+                      .strftime("#{new_date.day.ordinal} %b %Y"))
           d = new_date
         else
           d = ChronicCron.new(recurring, d.to_date.to_time).to_time
         end
       end
-      
+
       puts ['0.3'.highlight, title, recurring, time, raw_date, end_date].inspect.debug if @debug
-      {input: input, title: title, recurring: recurring, date: d, end_date: 
+      {input: input, title: title, recurring: recurring, date: d, end_date:
                                                                       end_date}
-      
-    end    
+
+    end
 
     # some event every 2 weeks
     # some event every 2 weeks at 6am starting from 14th Jan
     # some event every 2 weeks at 6am starting from 18th Feb until 28th Oct
     # some event every 2nd Monday (starting 7th Nov 2016)
-    # some event every 2nd Monday (starting 7th Nov until 3rd Dec)    
+    # some event every 2nd Monday (starting 7th Nov until 3rd Dec)
     # some event every 2 weeks (starting 02/11/17)
     # some event every Wednesday 1pm-4pm
     #
     get /^(.*)(every .*)/ do |title, recurring|
 
       input = params[:input].clone
+      puts 'recurring: ' + recurring.inspect if @debug
       raw_start_date = recurring[/(?<=starting )[^\)]+/]
-      
+
       d = if raw_start_date then
-        start_date = Chronic.parse(raw_start_date, now: @now - 1, 
+        start_date = Chronic.parse(raw_start_date, now: @now - 1,
                                    :endian_precedence => :little)
 
         puts ('recurring: ' + recurring.inspect).debug if @debug
         puts ('start_date: ' + start_date.inspect).debug if @debug
-        
+
         if @now > start_date then
           exp = ChronicCron.new(recurring, start_date, debug: @debug).to_expression
           puts 'exp: ' + exp.inspect if @debug
-          
+
           cf = CronFormat.new(exp, start_date, debug: @debug)
           puts ('cf.to_time: '  + cf.to_time.inspect).debug if @debug
           cf.next until cf.to_time > start_date
-          
+
           new_date = cf.to_time
           input.gsub!(/(?<=starting )[^\)]+/, new_date\
                       .strftime("#{new_date.day.ordinal} %b %Y"))
@@ -180,208 +234,208 @@ class EventNlp
         else
           start_date
         end
-        
+
       else
         exp = ChronicCron.new(recurring).to_expression
         cf = CronFormat.new(exp, @now)
         cf.to_time
       end
-      
 
-      
+
+
       if recurring =~ /-/ then
-        end_date = Chronic.parse d.to_date.to_s + ' ' + 
-            recurring[/(?<=-)\d+(?::\d+)?(?:[ap]m)?/] 
+        end_date = Chronic.parse d.to_date.to_s + ' ' +
+            recurring[/(?<=-)\d+(?::\d+)?(?:[ap]m)?/]
       end
-          
+
       puts ['0.5'.highlight, title, recurring, d].join("\n").debug if @debug
-      {input: input, title: title.rstrip, recurring: recurring, 
+      {input: input, title: title.rstrip, recurring: recurring,
        date: d, end_date: end_date }
-      
-    end    
-    
+
+    end
+
     # some meeting 3rd thursday of the month at 7:30pm
     # some meeting First thursday of the month at 7:30pm
-    get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do 
+    get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do
                                                              |title, recurring|
 
       puts ['1'.highlight, title, recurring].inspect.debug if @debug
       { title: title, recurring: recurring }
 
     end
-    
-    
+
+
     # 7th Oct Euston Station (meet at Timothy's house at 7pm)
     get /^(\d(?:st|nd|rd|th) \w+) *(.*)\s+at\s+(\w+)/i do \
         |raw_day, title, time|
-      
+
       d = Chronic.parse(raw_day + ' ' + time)
-      
+
       puts ['1.5'.highlight, title, raw_day, time].inspect.debug if @debug
       { title: title, date: d }
-      
-    end    
+
+    end
 
     # some event Wednesday
     # some event Wednesday 11am
-    
+
     relative_day = '|today|tomorrow|tonight'
     get /^(.*)\s+(#{weekdays2+relative_day}\b)(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
                                                            do |title, raw_date, date2, time2|
       puts ('time2: ' + time2.inspect).debug if @debug
       puts ('date2: ' + date2).debug if @debug
       puts ('raw_date: ' + raw_date).debug if @debug
-      
+
       d = if date2 then
         Chronic.parse(date2 + ' '+ time2.to_s)
       else
         Chronic.parse(raw_date + ' '+ time2)
       end
-      
+
       puts ['4'.highlight, title, raw_date, date2, time2].inspect.debug if @debug
       {title: title, date: d }
-       
+
     end
-        
+
     # Group meeting Red Hall 2pm-4pm on Monday (4th Dec 2017)
     get /^(.*)\s+(#{times2})(?: on) +#{weekdays}\b(?: \(([^\)]+)\))?/i \
         do |title, xtimes, raw_day, actual_date|
-      
+
       if @debug then
         puts ('actual_date: ' + actual_date.inspect).debug
         puts ('raw_day: ' + raw_day.inspect).debug
         puts ('xtimes: ' + xtimes.inspect).debug
       end
-      
+
       input = params[:input].clone
-      
+
       if actual_date then
         d = Chronic.parse actual_date
       else
-        d = Chronic.parse(raw_day)        
+        d = Chronic.parse(raw_day)
         input.sub!(/#{weekdays}\b/i,
-                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))
       end
 
       t1, t2 = xtimes.split(/-/,2)
-      
+
       puts ('d: ' + d.inspect).debug if @debug
 
       d1, d2 = [t1, t2].map {|t| Chronic.parse([d.to_date.to_s, t].join(' ')) }
-            
+
       puts ['4.65'.highlight, input, title, raw_day, d1, d2].inspect.debug if @debug
-      
+
       {input: input, title: title, date: d1, end_date: d2 }
-      
-    end          
-    
+
+    end
+
     # hall 2 friday at 11am
 
     get /^(.*)\s+#{weekdays}\b(?: \(([^\)]+)\))?(#{times})?/i \
         do |title, raw_day, actual_date, time|
-      
+
       if @debug then
         puts ('actual_date: ' + actual_date.inspect).debug
         puts ('raw_day: ' + raw_day.inspect).debug
         puts ('time: ' + time.inspect).debug
       end
-      
+
       input = params[:input].clone
-      
+
       if actual_date then
         d = Chronic.parse(raw_day + ' ' + time.to_s)
       else
-        d = Chronic.parse(raw_day + ' ' + time.to_s)        
+        d = Chronic.parse(raw_day + ' ' + time.to_s)
         input.sub!(/#{weekdays}/i,
-                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+                   %Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))
       end
-        
+
       puts ('d: ' + d.inspect).debug if @debug
-      
+
       puts [1.7, input, title, raw_day].inspect.debug if @debug
-      
+
       {input: input, title: title, date: d }
-      
-    end        
-    
-    
+
+    end
+
+
     # e.g. 21/05/2017 Forum meetup at Roundpeg from 2pm
-    get /^(\d+\/\d+\/\d+)\s+(.*)(?: from|at)\s+(\d+[ap]m)/ do 
+    get /^(\d+\/\d+\/\d+)\s+(.*)(?: from|at)\s+(\d+[ap]m)/ do
                                                     |raw_date, title, raw_time|
-      
-      d = Chronic.parse(raw_date + ' ' + 
+
+      d = Chronic.parse(raw_date + ' ' +
                         raw_time, :endian_precedence => :little)
-      recurring = nil            
-      
+      recurring = nil
+
       puts [3, title, raw_date].inspect.debug if @debug
       { title: title, date: d }
-    end        
-    
+    end
+
     # friday hall 2 11am until 12am
     get /^#{weekdays}\s+(.*)\s+#{times} until #{times}$/i do \
         |raw_day, title, start_time, end_time|
-      
+
       venue = title[/^at +(.*)/,1]
       d = Chronic.parse(raw_day + ' ' + start_time)
       d2 = Chronic.parse(raw_day + ' ' + end_time)
-      
+
       puts ['1.44.3', title, raw_day].inspect.debug if @debug
       { title: title, date: d, end_date: d2, venue: venue }
-      
-    end       
-    
+
+    end
+
     # friday hall 2 11am
     get /^#{weekdays}\b\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do \
         |raw_day, title, time|
-      
+
       puts [raw_day, title, time].inspect if @debug
       venue = title[/^at +(.*)/,1]
       d = Chronic.parse(raw_day + ' ' + time)
-      
+
       puts [1.44, title, raw_day].inspect.debug if @debug
       { title: title, date: d, venue: venue }
-      
-    end    
+
+    end
 
     # Tuesday 10th July hall 2 at 11am
     get /#{weekdays}\b\s+#{days}\s+#{months}\s+(?:at )?(.*)\s+at\s+(#{times})/i \
         do |wday, day, month, title,  time|
-      
+
       d = Chronic.parse([day, month, time].join(' '))
-      
+
       puts ['1.44.5', day, month, title].inspect.debug if @debug
       { title: title, date: d }
-      
-    end       
-    
-   
- 
-    
+
+    end
+
+
+
+
     # 27-Mar@1436 some important day
     # 25/07/2017 11pm some important day
     #
     get /^(\d+\/\d+\/\d+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ \
         do |raw_date, time, title, annualar|
 
-      d = Chronic.parse(raw_date + ' ' + time.to_s, 
+      d = Chronic.parse(raw_date + ' ' + time.to_s,
                         :endian_precedence => :little)
       recurring = nil
-      
+
       if annualar then
-        
+
         recurring = 'yearly'
         if d < @now then
-          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1))
         end
       end
-      
-      
+
+
       puts [3, title, raw_date, time].inspect.debug if @debug
       { title: title, date: d, recurring: recurring }
     end
 
 
-    
+
     # Some event (10 Woodhouse Lane) 30th Nov from 9:15-17:00
 
     get /^(.*) #{days} #{months}(?: from)? (#{times2})/i do \
@@ -396,7 +450,7 @@ class EventNlp
 
       { title: title, date: d1, end_date: d2 }
     end
-    
+
     # Some event (10 Woodhouse Lane) 30th Nov from 9:15-17:00
 
     get /^#{weekdays}\b #{months} #{days} #{times3} (.*)/i do \
@@ -411,7 +465,7 @@ class EventNlp
       puts [4.55, title, d1, d2].inspect.debug if @debug
 
       { title: title, date: d1, end_date: d2 }
-    end    
+    end
 
     # e.g. Wednesday 30th Nov at 9:15 10 Woodhouse Lane
 
@@ -423,8 +477,8 @@ class EventNlp
       puts [4.6, title, d1].inspect.debug if @debug
 
       { title: title, date: d1 }
-    end    
-    
+    end
+
     # Some event (10 Woodhouse Lane) 30th Nov at 9:15-
 
     get /^(.*) #{days} #{months}(?: at)? (#{times})/i do \
@@ -441,73 +495,73 @@ class EventNlp
     # hall 2 at 11am
     #
     get /(.*)\s+at\s+(#{times})/i do |title,  time|
-      
+
       d = Chronic.parse(time)
-      
+
       puts [1.45, title].inspect.debug if @debug
       { title: title, date: d }
-      
-    end         
-    
-    
+
+    end
+
+
     # Council Tax on the last day of the month
     #
     get /^(.*) (?:o[nf] the)\s*last day of the month/i do |title|
-      
+
       td = @now.to_date
       d = Date.civil(td.year, td.month, -1).to_time
-      
+
       puts [5, title].inspect.debug if @debug
       { title: title, date: d }
-      
-    end        
-    
+
+    end
+
     # Council Tax last day of the month
     #
     get /^(.*) +last day of the month/i do |title|
-      
+
       td = @now.to_date
       d = Date.civil(td.year, td.month, -1).to_time
-      
+
       puts [5.1, title].inspect.debug if @debug
       { title: title, date: d }
-      
-    end        
-    
+
+    end
+
     # some important day 11 Oct *
     #
     get /^(.*) +(\d+) +#{months} *(\*)?/i \
         do |title, day, month, annualar|
-      
+
       raw_date = day + ' ' + month
 
-      d = Chronic.parse(raw_date, 
+      d = Chronic.parse(raw_date,
                         :endian_precedence => :little)
       recurring = nil
-      
+
       if annualar then
-        
+
         recurring = 'yearly'
         if d < @now then
-          d = Chronic.parse(raw_date, 
-                            now: Time.local(@now.year + 1, 1, 1)) 
+          d = Chronic.parse(raw_date,
+                            now: Time.local(@now.year + 1, 1, 1))
         end
       end
-      
-      
+
+
       puts [6, title, raw_date].inspect.debug if @debug
       { title: title, date: d, recurring: recurring }
     end
-    
-    
-    
+
+
+
     # Tuesday 3rd October gas service at Barbara's house morning 9am-1pm
     #
     get '*' do
-      
+
       s = params[:input]
-      
-      time1, time2, month, weekday, day, end_date, annualar  = nil, nil, nil, 
+
+      time1, time2, month, weekday, day, end_date, annualar  = nil, nil, nil,
           nil, nil, nil, false
 
       s2 = s.sub(/#{times}/i) {|x| time1 = x; ''}
@@ -522,29 +576,29 @@ class EventNlp
       raw_date = [day, month].compact.join(' ')
       raw_date = weekday if raw_date.empty?
 
-      d = Chronic.parse(raw_date + ' ' + time1.to_s, 
+      d = Chronic.parse(raw_date + ' ' + time1.to_s,
                         :endian_precedence => :little, now: @now)
-      
+
       if time2 then
-        end_date = Chronic.parse(raw_date + ' ' + time2.to_s, 
+        end_date = Chronic.parse(raw_date + ' ' + time2.to_s,
                         :endian_precedence => :little)
       end
-      
+
       recurring = nil
-      
+
       if annualar then
-        
+
         recurring = 'yearly'
         if d < @now then
-          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
+          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1))
         end
-      end      
-      
+      end
+
       puts [10, title, raw_date, time1].inspect.debug if @debug
       { title: title, date: d, end_date: end_date, recurring: recurring }
-    end    
-    
-    
+    end
+
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -11,52 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTEwMjE1ODM4WhcN
-  MjAwOTA5MjE1ODM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDIK9mI
-  2ehHbT3MWV/EVo9LjVfNUu90FCb3R2C80G73/zGCDQKg2QaV00GUEV3c6T9ylg87
-  p9k71VIoRrTzc4wkrwIKAQnJGWOd/6iDQIIoGd1VU2NYaE/ANfAiNTnktKyYu9U8
-  oWkC+jsuCFlgsf97LbV0a+SmMberl8G3dsL3kKAgwIEThpkIpkDLrJh/O+63lDBf
-  O5duzcH2jkpAOqyFSGaEaJU3qpE7PSX80mU5JErsfLwSI2YtHOvGtXBBmJ5X6j+T
-  4oGpsdYN1teC2w/KETuAbGiBCNmKY5mTMDSZTlfWkLLBWY1HHSQ20glc0e4iQKiF
-  T5BM4/1fI7N6DF1Aa9APKdF+ulyUchcpkxhUh8CAM/8pg3UYUgyf6deGkv+I/28f
-  IT9I9uFmRKAx/U12BCRaBdh5sZAMEuLt690IzGYD/BWK+ff/NB+t+hbZYSk9OMHC
-  3J0bfnuzR5CmlmZED5Sa0X9u5EjHQeYmfI6jMjxHRoIaD3jM3SPnyQvvjx8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUE1kZqX7n
-  oLNWhIHQ7SJAZcuZRvcwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAyMTQwNDQxWhcN
+  MjMwMjAyMTQwNDQxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDRlXO8
+  lKNDGq9FsP2ZGakZKcR2g8utQq4DCO4x2ZpGzdq2uRuvZl/TG1eUt4NrHi6CAoYZ
+  Q3Sf11JJCL4ZBEi6Qm4YVMQ06gdsWBeWcO9wnOv198eKqsWbVmzpvRWmKJvjpzEY
+  nilcadAm1CCadUvfOi25WNhz+4jbzP09rdrI64Rmp0GJv5DjmtmgznQEWWZPyRVw
+  5mbMIxAxepUus1KFkZSXsyqWsmcupJ0z4myicgD0GPNL47hO84DwG6KZ1dpVS/ar
+  E0KCPZPKIN7dnLsqgAnw41/VRQSDUdjyT7T8sv6Kb/wa6hXxaS/SFVlI8G5RI/la
+  tjGIHg84+JFySryZVGHpOepGxgILpeqNvXXIK59Az1/OiS70A3xQBFmHYUNngbJd
+  8Gk83TYzTksXvnVBEhJKZwZYuWHT32burAz7+RDBdXl2cdiwX5IjkUq0BqPaGeuu
+  ZpJl29gP1YlCImTGWEPx9y30G/kdNYuVOJbzk2UEdCSlYjAQVtrYLTGRW08CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUSXtv+Esp
+  k8epEo2XhtatYkQhLO0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAfOeR8ABSrmM8+Mvgm+urusqQukPUyHKf71qYBY9d
-  2RyOGJc+WY76E4Y9O5QAeUyP8ib6er/A3bQefuMrIFBnygR3Wz0GV0cmnLoMhVlO
-  TqeU1Yt9bdDDMkS3/fhDWMimrkupnhhtjxHO2B4yJ0+OB47HLzMY1NrvUJI1Xuox
-  4SfDeNtYn7Wxb1oIMviDDZqzNTSojyIPSdokR3lQHntTyUA+Q5gPZct0SAOGnWSA
-  gqYmIGDrOpj3p5yV+7ChQAMDOq0qofpisAWHjdTkk9EBG7G9xRcAjG38baeWB843
-  a12bAgeEqsysvhmtF1SD5uIhB+w659QB7fjrX227HhdgXYQ8JvtdhXAZIBcmgJX3
-  63fI7WqlDHr5cuY9XdepWpQcu0k0HVa67S1oalCyc8Gbv4iBH+mV5iSWmSKBHFX7
-  Hp/xNpvPRmTW2ospJ7tp4UsgtLogM+hwp9H5Hs7fJiJpGlVFW91zEk8bnoiDXV2w
-  9tntfqektbvPs/grQCPIucls
+  BgkqhkiG9w0BAQsFAAOCAYEACwZ89nT9aFdxhWGboWw+R5rAnTRqDQS2U1/n7Vs0
+  uAMg5MVU/jIEFCnynXZMmJwzN3r972rkjxj9mn6DGnVu1YI1IAohMwls5BVPm4/V
+  HgOsV5YFOzfJpThCqVzo3HwkqZWoO7LEgIIHJ/3UYnCfWM6uHmDuyOTLnCHL+lVD
+  1pi26mG34ViOfEQzgW6HwswixuUQ4LI2eYtzyKIS3qAYEVm7UwujdbKghEycFKdF
+  sBJVdzARYZGMbrKm8dWeBWrMhW+Fdy8HlN0D4XMYmCIYghZ5XiOICaTlv4rYOkr8
+  sThE7E1FNUonatzkBVmSDlJZ6K0nBZLy3RKC48BP8SnSM/LtQe9atiiJBPOAOck3
+  yjnIKndZd6EKQ2X55kjrO1J+/2tqfMOUjH8/pJLmeeR8xV5+oAz65qpFx8FZOFPC
+  w8lJ+I6Lqqr5GpsweOnEHW4w200sMRD40u8qmGHrqirihL2KrwTD6A9UObvA5AxZ
+  4Z4EPvKg+3jsK9Gv3GGSLdrD
   -----END CERTIFICATE-----
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.19
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: 'Parses a calendar event for date, time, and description e.g. hall 2 friday