event_nlp 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9b45e77e53d8fb10a418d7a49797ca09779286
-  data.tar.gz: 64cc7e8b8aac9b1dad55cf0842b1b0058762bcc7
+  metadata.gz: e3cd4994fbaf38dc524a289a4d4bf77041d40770
+  data.tar.gz: 8ee5abd06c78d59c9c0a55162ade03d48483001a
 SHA512:
-  metadata.gz: c25e6b6dd98e1dc4eba2255e21774cc4a91205e60decfac70d7232da1e4f39664b32d66fff8a687b82e61d3f301c97c42d70417e2cf2fde63f90c55393a060ef
-  data.tar.gz: 542f480ab1ff23cf5c3642cfeb30a876e621ab72fe9797cd8dea2eadd143966f0df77cd559797a1e71d3eefb47991e82d25feefd63e9d9a27d0f6e436038ccba
+  metadata.gz: 93fcbafdc9a7667c642c7c093748f46b7fffb842e5442b3be6c4404f55faae8221f6eb6e6e9b63bed20b5e00fe72a2e90e65e29a0e12c2f8288ee799ead6f603
+  data.tar.gz: 62e4f05a211799d7e198909a6cb5ee8851b9d178ba1a42fdf79f5c0e420f60b4244d58699d5d4081982f4913e777d423ed0ceaaa75026fe7ac359932b62fe13f

data/lib/event_nlp.rb

@@ -59,13 +59,19 @@ class EventNlp
 
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
-    weekday = Date::DAYNAMES.join('|').downcase
-    months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])
-      .join('|').downcase
-    time = /(?: (?:at )?(\d+(?::\d+)?am) )?/
+    weekdays = Date::DAYNAMES.join('|').downcase
+    months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
+                                                            .join('|').downcase
+    times = /(?: *(?:at )?(\d+(?::\d+)?[ap]m) *)/
+    days = /\d+(?:st|nd|rd|th)/
+    
+    #weekdays = Date::DAYNAMES.join('|').downcase
+    #
+    #times = /(?: *at )?\d[ap]m/
+    
 
 
-    get /^(.*)\s+(every \d\w+ \w+#{time})\s*#{starting}/ do \
+    get /^(.*)\s+(every \d\w+ \w+#{times})\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
 
       input = params[:input].clone            
@@ -125,10 +131,21 @@ class EventNlp
 
       exp = ChronicCron.new(recurring).to_expression
 
-      d = CronFormat.new(exp).to_time
+      raw_start_date = recurring[/(?<=starting )[^\)]+/]
+
+      
+      if raw_start_date then
+        start_date = Chronic.parse(raw_start_date, now: @now - 1)
+
+        cf = CronFormat.new(exp, start_date - 1)
+        #cf.next until cf.to_time >= start_date
+      else
+        cf = CronFormat.new(exp, @now)
+      end
+      d = cf.to_time
       
       puts [0.5, title, recurring, d].inspect if @debug
-      {title: title, recurring: recurring, date: d }
+      {title: title.rstrip, recurring: recurring, date: d }
       
     end    
     
@@ -143,7 +160,7 @@ class EventNlp
     end
     
     # hall 2 friday at 11am
-    get /(.*)\s+(#{weekday})\s+at\s+(.*)/i do |title, raw_day, time|
+    get /(.*)\s+(#{weekdays})\s+at\s+(.*)/i do |title, raw_day, time|
       
       d = Chronic.parse(raw_day + ' ' + time)
       
@@ -165,7 +182,7 @@ class EventNlp
     end        
     
     # friday hall 2 11am
-    get /^(#{weekday})\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do |raw_day, title, time|
+    get /^(#{weekdays})\s+(.*)\s+(\d+(?::\d{2})?[ap]m)$/i do |raw_day, title, time|
       
       d = Chronic.parse(raw_day + ' ' + time)
       
@@ -176,7 +193,7 @@ class EventNlp
     
     
     # hall 2 at 11am
-    get /(.*)\s+at\s+(.*)/i do |title,  time|
+    get /(.*)\s+at\s+(#{times})/i do |title,  time|
       
       d = Chronic.parse(time)
       
@@ -185,34 +202,10 @@ class EventNlp
       
     end        
  
-    # hall 2 friday at 11am
-    # some important day 24th Mar
-    
-    with_date = "(.*)\\s+(\\d\+\s*(?:st|nd|rd|th)?\\s+(?:#{months}))"
-    alt_pattern = '([^\d]+)\s+(\d+[^\*]+)(\*)?'
-    
-    get /#{with_date}|#{alt_pattern}\s*(\*)$/i do |title, raw_date, annualar|
-
-      d = Chronic.parse(raw_date)
-
-      recurring = nil
-      
-      if annualar then
-        
-        recurring = 'yearly'
-        if d < @now then
-          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
-        end
-      end
-      
-      puts [2, title, raw_date].inspect if @debug
-      { title: title, date: d, recurring: recurring }
-    end
-    
     # 27-Mar@1436 some important day
     # 25/07/2017 11pm some important day
     #
-    get /(\d[^\s]+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
+    get /^(\d[^\s]+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
         time, title, annualar|
 
       d = Chronic.parse(raw_date + ' ' + time.to_s, 
@@ -236,7 +229,7 @@ class EventNlp
     # some event Wednesday 11am
     
     relative_day = '|today|tomorrow|tonight'
-    get /^(.*)\s+((?:#{weekday+relative_day})(?: \d{1,2}(?::\d{2})?[ap]m)?)/i \
+    get /^(.*)\s+((?:#{weekdays+relative_day})(?: \d{1,2}(?::\d{2})?[ap]m)?)/i \
                                                            do |title, raw_date|
       
       d = Chronic.parse(raw_date)
@@ -246,12 +239,49 @@ class EventNlp
        
     end
     
-    # e.g. 04-Aug@12:34
-    get '*' do |s|
-      puts 's: ' + s.inspect if @debug
-      'pattern unrecognised'
-    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, 
+          nil, nil, nil, false
+
+      s2 = s.sub(/#{times}/i) {|x| time1 = x; ''}
+      s3 = s2.sub(/-(?=\d)/,'').sub(/#{times}/i) {|x| time2 = x; ''}
+      s4 = s3.sub(/ *#{weekdays} */i) {|x| weekday = x; ''}
+      s5 = s4.sub(/ *#{months} */i) {|x| month = x; ''}
+      s6 = s5.sub(/ *#{days} */i) {|x| day = x; ''}
+      s7 = s6.sub(/\*$/) {|x| annualar = true; ''}
+      title = s6
+
+      raw_date = [day, month].compact.join(' ')
+      raw_date = weekday if raw_date.empty?
+
+      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, 
+                        :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)) 
+        end
+      end      
+      
+      puts [5, title, raw_date, time1].inspect if @debug
+      { title: title, date: d, end_date: end_date, recurring: recurring }
+    end    
+    
+    
   end
   
 end

metadata

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

metadata.gz.sig

@@ -1,3 +1,2 @@
-iݗ�_"
-���*r'�nأ���ɧ���� 
-�*d�s�FxOµ��\�c҆z$���Zs�c
eX�Z���l�+сN��l*ѷDܚDz�����f�Z�+�b᡾xve���S�:�c�
+��ji���+oK��P���f
Jr۳D$�&1��O�7+ڧ��@'�B�
p0F���@���	<�4��K M���TYW��)�y=H�}8��v�=<���ꉨgoH4Ag)����D5�y�k�HMy�6<��h�%;{*/�b5�����9h��WL"�p}c.��
+��GE��㴂�хn"�