event_nlp 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9765f56a2cdca51484e63883fe5b1999074570b8
-  data.tar.gz: d9c5b776cdeaa3aa6ad915b4de05366073f16572
+  metadata.gz: a0b3289870f21858812ccdaf45ab5ec26736eee9
+  data.tar.gz: 51f33ba988ee15567cf8bf28dfcfcd0ea200012e
 SHA512:
-  metadata.gz: eb3dbed493d2946b933fa16d2bd8a94698bc4744ff6b094d01c5801d5aed720f391cb4f9b1fc4eb44e9df0a226035e515638e787eaed83b0941b9d0265ff84fc
-  data.tar.gz: 208d2d5aee1a109e1e2e546b29ccd10aa7ab931e307ec30720c366e16b204d013daf84951cadf833771ac5145eab3c6d0a0a70caf5a078fa3a543353d6ee326e
+  metadata.gz: 6834d3422ac16b5af9552dcea6be8543fa5572a20520fc2629d25fa5eac80f48d3b2fc1dd2da7d38a32c872ab7a122d996098964e629b5a74fcd325f3fef6c9e
+  data.tar.gz: fa1cdf7c2cca71723979d82efc8576e2cc22d01c9f4e2b9be106eff0f707e444d40aaa7a5f8004924173c4c71d2729a3216ee5548b9019157b1f6ecf6a224517

data/lib/event_nlp.rb

@@ -49,16 +49,13 @@ class EventNlp
 
   private
 
-  def expressions(params) 
-    
-
-
+  def expressions(params)     
 
     starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
     weekdays = Date::DAYNAMES.join('|').downcase
     months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])\
                                                             .join('|').downcase
-    times = /(?: *(?:at |@ |from )?(\d+(?::\d+)?[ap]m) *)/
+    times = /(?: *(?:at |@ |from )?(\d+(?::\d+)?(?:[ap]m|\b)) *)/
     times2 = /\d+(?::\d+)?[ap]m-\d+(?::\d+)?[ap]m|\d+(?::\d+)?-\d+(?::\d+)?/
     days = /\d+(?:st|nd|rd|th)/
     periods = /day|week|month/
@@ -214,15 +211,51 @@ class EventNlp
       { title: title, date: d }
       
     end    
+
+    # some event Wednesday
+    # some event Wednesday 11am
     
+    relative_day = '|today|tomorrow|tonight'
+    get /^(.*)\s+(#{weekdays+relative_day})(?: \(([^\)]+)\)) (at \d{1,2}(?::\d{2})?(?:[ap]m)?)/i \
+                                                           do |title, raw_date, date2, time2|
+      puts 'time2: ' + time2.inspect if @debug
+      puts 'date2: ' + date2 if @debug
+      puts 'raw_date: ' + raw_date if @debug
+      
+      d = if date2 then
+        Chronic.parse(date2 + ' '+ time2.to_s)
+      else
+        Chronic.parse(raw_date + ' '+ time2)
+      end
+      
+      puts [4, title, raw_date, date2, time2].inspect if @debug
+      {title: title, date: d }
+       
+    end
+        
     
     # hall 2 friday at 11am
-    get /(.*)\s+(#{weekdays})\s+at\s+(.*)/i do |title, raw_day, time|
+    get /^(.*)\s+(#{weekdays})(?: \(([^\)]+)\))?(#{times})?/i do |title, raw_day, actual_date, time|
       
-      d = Chronic.parse(raw_day + ' ' + time)
+      puts 'actual_date: ' + actual_date.inspect if @debug
+      puts 'raw_day: ' + raw_day.inspect if @debug
+      puts 'time: ' + time.inspect if @debug
       
-      puts [1.7, title, raw_day].inspect if @debug
-      { title: title, date: d }
+      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)        
+        input.sub!(/#{weekdays}/i,%Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+      end
+        
+      puts 'foo' + d.inspect
+
+      
+      puts [1.7, input, title, raw_day].inspect if @debug
+      
+      {input: input, title: title, date: d }
       
     end        
     
@@ -278,26 +311,12 @@ class EventNlp
           d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
         end
       end
-      
-      
+            
       puts [3, title, raw_date, time].inspect if @debug
       { title: title, date: d, recurring: recurring }
     end
 
-    # some event Wednesday
-    # some event Wednesday 11am
-    
-    relative_day = '|today|tomorrow|tonight'
-    get /^(.*)\s+((?:#{weekdays+relative_day})(?: \d{1,2}(?::\d{2})?[ap]m)?)/i \
-                                                           do |title, raw_date|
-      
-      d = Chronic.parse(raw_date)
-      
-      puts [4, title, raw_date].inspect if @debug
-      {title: title, date: d }
-       
-    end
-    
+
     
     # Some event (10 Woodhouse Lane) 30th Nov from 9:15-17:00
 
@@ -323,6 +342,7 @@ class EventNlp
           nil, nil, nil, false
 
       s2 = s.sub(/#{times}/i) {|x| time1 = x; ''}
+      puts 's2: ' + s2.inspect if @debug
       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; ''}

metadata

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