event_nlp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b00491e5b6a95498e2903246480cb7ad704637
-  data.tar.gz: a9967a18b98136821653d8b37083f3863ce3516c
+  metadata.gz: '09eb07c8e3c86c47ee94c8f312aec6c40f5e210e'
+  data.tar.gz: 0ac1428ab93322c9d6780a9511c710d28daac91e
 SHA512:
-  metadata.gz: cc88647d4e65b87a1633f7f2d95d8cf01809ba98f091c2f85b81aee5167b1c2f76ae541c23cb0c1222c848ec0a388c121313a055d84e10c20adf291b94ce51fc
-  data.tar.gz: d16d34117a77cedd448307027b52efbc5d57c0abef1c83ddea86b314dd3f20a773ba27fdb35bd7f5d393ba7b3a9402fb41f939225ca873a5d2497f50b23fefa1
+  metadata.gz: aed1b7df145bc991641835ca102b71c4ab528a0697a3bf806c0637cd19426345ba4b2ccda9837cdbf7ebf455c4482c24ac53fe9447f86e13f06a76dfbd02a2ae
+  data.tar.gz: 1384916d35e6915e86f692ba2b1c714c7a2acaeaf734e7d91dd621a37e39f29ba4396dc9a20b78af74db1f29351fd5e2060d7713182a996146ffcd93d4abcf8d

data/lib/event_nlp.rb

@@ -25,13 +25,14 @@ class EventNlp
   
   attr_accessor :params
   
-  def initialize(now=Time.now, params: {})
+  def initialize(now=Time.now, params: {}, debug: false)
     
     super()
     
     @now = now
     @params = params
-    expressions(@params)    
+    expressions(@params)
+    @debug = debug
 
   end
   
@@ -82,12 +83,41 @@ class EventNlp
         end
       end
       
-      #puts [0, title, recurring, time, raw_date, end_date].inspect
+      puts [0, title, recurring, time, raw_date, end_date].inspect if @debug
       {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 \
+                                   |title, recurring, time, raw_date, end_date|
+
+      input = params[:input]
+
+      d = Chronic.parse(raw_date)
+      
+      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"))        
+          d = new_date
+        else
+          d = ChronicCron.new(recurring, d.to_date.to_time).to_time
+        end
+      end
+      
+      puts [0.3, title, recurring, time, raw_date, end_date].inspect if @debug
+      {input: input, title: title, recurring: recurring, date: d, 
+       end_date: end_date}
+      
+    end    
+    
     get /^(.*)(every .*)/ do |title, recurring|
 
       input = params[:input]
@@ -95,7 +125,7 @@ class EventNlp
 
       d = CronFormat.new(exp).to_time
       
-      #puts [0.5, title, recurring, time, raw_date, end_date].inspect
+      puts [0.5, title, recurring, d].inspect if @debug
       {input: input, title: title, recurring: recurring, date: d }
       
     end    
@@ -105,7 +135,7 @@ class EventNlp
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do 
                                                              |title, recurring|
 
-      #puts [1, title, recurring].inspect      
+      puts [1, title, recurring].inspect if @debug
       { title: title, recurring: recurring }
 
     end
@@ -115,7 +145,7 @@ class EventNlp
       
       d = Chronic.parse(raw_day + ' ' + time)
       
-      #puts [1.5, title, raw_day].inspect
+      puts [1.5, title, raw_day].inspect if @debug
       { title: title, date: d }
       
     end    
@@ -128,7 +158,7 @@ class EventNlp
                         raw_time, :endian_precedence => :little)
       recurring = nil            
       
-      #puts [3, title, raw_date].inspect
+      puts [3, title, raw_date].inspect if @debug
       { title: title, date: d }
     end        
     
@@ -137,7 +167,7 @@ class EventNlp
       
       d = Chronic.parse(raw_day + ' ' + time)
       
-      #puts [1.44, title, raw_day].inspect
+      puts [1.44, title, raw_day].inspect if @debug
       { title: title, date: d }
       
     end    
@@ -148,7 +178,7 @@ class EventNlp
       
       d = Chronic.parse(time)
       
-      #puts [1.45, title].inspect
+      puts [1.45, title].inspect if @debug
       { title: title, date: d }
       
     end        
@@ -173,7 +203,7 @@ class EventNlp
         end
       end
       
-      #puts [2, title, raw_date].inspect
+      puts [2, title, raw_date].inspect if @debug
       { title: title, date: d, recurring: recurring }
     end
     
@@ -192,13 +222,13 @@ class EventNlp
       end
       
       
-      #puts [3, title, raw_date].inspect
+      puts [3, title, raw_date].inspect if @debug
       { title: title, date: d, recurring: recurring }
     end    
     
     # e.g. 04-Aug@12:34
     get '*' do |s|
-      puts 's: ' + s.inspect
+      puts 's: ' + s.inspect if @debug
       'pattern unrecognised'
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
   kbRihMTezaC+4A==
   -----END CERTIFICATE-----
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_cron