event_nlp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e08647b8e240d081ace6865f4cd49ff1195cc6
-  data.tar.gz: 765a6dddc50561c1b6533c422a9f5ec0ba83dd1f
+  metadata.gz: 54ba784176824a213dcdbd4ca421b388687fba9f
+  data.tar.gz: ed2a521afa3726671c01ecb62977c0b9b48ce203
 SHA512:
-  metadata.gz: e95368e97d7c8ffdfaf13384b9da4e6b3bfa0aac91d119ad41379a124bb3537ac1a6e50d9b3163182fad1825763dfec06bb5f46ea814becefc247c913db9864c
-  data.tar.gz: 56901f3d50338cb0b5a93198aff0c04b6eb94d55fd4675a978ebabee677b3fb42ec4b967ae80803e9495fbe613c161f0627f529b4cc9ab12a49fc291a182eaef
+  metadata.gz: d6b8bbe02b6a14f5a5b8f918995bae07aac3a867721570706a08572989a1bd6bb5014a965c8efd5b386046ac06292f24610c1d08c5a76409ed9e996e8351f083
+  data.tar.gz: b735297f5f76c702e6c9c177fc5a486926457dc2c33c288c452de2672a167517afa1d5769b6b31058d71bc4dabd836264c334dff7bd365ad574b42c25b3dc834

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-
-�^���#ZK��7��A�C`U�&�R���e`�U��v"S�DX�e�YP�w��P��|1��<�I��c4�1B�ʽ�*�n��o��X�r�_w�E�$h\q�r�v�?�vF�Bz��a���+�
+�̖�9|�W�`�Be$����e��=�
�ӭ�Nz>e,���&T���c

data/lib/event_nlp.rb

@@ -233,8 +233,36 @@ class EventNlp
        
     end
         
+    # Group meeting Red Hall 2pm-4pm on Monday (4th Dec 2017)
+    get /^(.*)\s+(#{times2})(?: on) +(#{weekdays})(?: \(([^\)]+)\))?/i do |title, xtimes, raw_day, actual_date|
+      
+      puts 'actual_date: ' + actual_date.inspect if @debug
+      puts 'raw_day: ' + raw_day.inspect if @debug
+      puts 'xtimes: ' + xtimes.inspect if @debug
+      
+      input = params[:input].clone
+      
+      if actual_date then
+        d = Chronic.parse actual_date
+      else
+        d = Chronic.parse(raw_day)        
+        input.sub!(/#{weekdays}/i,%Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
+      end
+
+      t1, t2 = xtimes.split(/-/,2)
+      
+      puts 'd: ' + d.inspect if @debug
+
+      d1, d2 = [t1, t2].map {|t| Chronic.parse([d.to_date.to_s, t].join(' ')) }
+            
+      puts [4.65, input, title, raw_day, d1, d2].inspect if @debug
+      
+      {input: input, title: title, date: d1, end_date: d2 }
+      
+    end          
     
     # hall 2 friday at 11am
+
     get /^(.*)\s+(#{weekdays})(?: \(([^\)]+)\))?(#{times})?/i do |title, raw_day, actual_date, time|
       
       puts 'actual_date: ' + actual_date.inspect if @debug
@@ -250,7 +278,7 @@ class EventNlp
         input.sub!(/#{weekdays}/i,%Q(#{raw_day} (#{d.strftime("#{d.day.ordinal} %b %Y")})))        
       end
         
-      puts 'foo' + d.inspect
+      puts 'd: ' + d.inspect if @debug
 
       
       puts [1.7, input, title, raw_day].inspect if @debug

metadata

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

metadata.gz.sig

@@ -1,4 +1 @@
-�9W�r�e�|�t®@%s�$��0�
-e�������P>�'��nS/s��Զ�`��Ӷ������ua�P'렏��0��IA���gZ�-����
-U'��W���)�����C@�s�6GL.�ɜ%��U��kK�U8�e��e��=vF�ԛ�b�g��?2g:��"�S�����
-����ɋ�<Ω�R�^�k��
++��iq-nɼUɶ�����y�U