event_nlp 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c93ee0375545f7575bb9964ef18ab00d85acd57
-  data.tar.gz: 6fc42b1f54e3bdb3707ab249509ab2a6347e8347
+  metadata.gz: 0b9b45e77e53d8fb10a418d7a49797ca09779286
+  data.tar.gz: 64cc7e8b8aac9b1dad55cf0842b1b0058762bcc7
 SHA512:
-  metadata.gz: 8b8eaa9f79b809aecf758bfec2e1ef87e5f5a41e81e29ce3c0d75a17828e20f53d408f8074a6ed047efa6eef74158b01b8d4cbcbf1ebf4e314d2ff71d78ed501
-  data.tar.gz: 7bc79074a73a76bc21bddb55ebe65cb1756451bb95c873cc56ae8ec210ce29e40264232d7b11b69f313dab210dde20ead75d8f8f05de45e7ec0c2d066dcdadac
+  metadata.gz: c25e6b6dd98e1dc4eba2255e21774cc4a91205e60decfac70d7232da1e4f39664b32d66fff8a687b82e61d3f301c97c42d70417e2cf2fde63f90c55393a060ef
+  data.tar.gz: 542f480ab1ff23cf5c3642cfeb30a876e621ab72fe9797cd8dea2eadd143966f0df77cd559797a1e71d3eefb47991e82d25feefd63e9d9a27d0f6e436038ccba

checksums.yaml.gz.sig

@@ -1 +1 @@
-��SK����"�K��4�����a,<��_
�a&�s�_{�њǘO^������ ���X2�ٲBقߥ#�-3�����u8[/��;����Y�T��m�{�>Q��>Ep2�]�G���mx�,1�O!�������&n��HY{�O�WL�\�����1�ـd`�:�ֹ;�����>.}�X����i�����1��e�8��tB]�փq�*sc��~Tc�/�Z��R��C���rZ��a��=NZ�����
+c�Թ2�'����ޅ��jpl���`�x��O[D�o�1�h�:�z;V���٘e]C}f�U��S�u���R\Wf��D���r�ꨚ��t��ϰ����G"Z��⭝>�H�уfm�[��T���̎�Ɠ�+/��2�c�X��F��b�Os<@�i��;TE�I4\$q�JT�ߡR}��S~HQ���X�F�u,);9OVL�
��~���c^�"�����tgdb-��_��Tnd�!�"
���<�y��$r_��'wE�

data/lib/event_nlp.rb

@@ -38,6 +38,7 @@ class EventNlp
   
   def parse(s)
 
+    @params[:input] = s
     r = run_route(s)
 
     return unless r.is_a? Hash
@@ -67,6 +68,7 @@ class EventNlp
     get /^(.*)\s+(every \d\w+ \w+#{time})\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
 
+      input = params[:input].clone            
       d = Chronic.parse(raw_date + ' ' + time.to_s)
       
       if recurring =~ /day|week/ then
@@ -75,14 +77,19 @@ class EventNlp
 
           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
           
         end
       end
       
-      puts [0, title, recurring, time, raw_date, end_date].inspect if @debug
-      {title: title, recurring: recurring, date: d, 
-       end_date: end_date}
+      if @debug then
+        puts [0, input, title, recurring, time, raw_date, end_date].inspect 
+      end
+      
+      {input: input, title: title, recurring: recurring, date: d, 
+       end_date: end_date}      
       
     end
     
@@ -91,8 +98,7 @@ class EventNlp
     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]
-
+      input = params[:input].clone
       d = Chronic.parse(raw_date)
       
       if recurring =~ /day|week|month/ then        
@@ -110,20 +116,19 @@ class EventNlp
       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}
+      {input: input, title: title, recurring: recurring, date: d, end_date: 
+                                                                      end_date}
       
     end    
     
     get /^(.*)(every .*)/ do |title, recurring|
 
-      input = params[:input]
       exp = ChronicCron.new(recurring).to_expression
 
       d = CronFormat.new(exp).to_time
       
       puts [0.5, title, recurring, d].inspect if @debug
-      {input: input, title: title, recurring: recurring, date: d }
+      {title: title, recurring: recurring, date: d }
       
     end    
     
@@ -210,7 +215,8 @@ class EventNlp
     get /(\d[^\s]+)\s*(\d+(?:\:\d+)?[ap]m)?\s+([^\*]+)(\*)?/ do |raw_date,
         time, title, annualar|
 
-      d = Chronic.parse(raw_date + ' ' + time.to_s, :endian_precedence => :little)
+      d = Chronic.parse(raw_date + ' ' + time.to_s, 
+                        :endian_precedence => :little)
       recurring = nil
       
       if annualar then
@@ -230,7 +236,8 @@ class EventNlp
     # some event Wednesday 11am
     
     relative_day = '|today|tomorrow|tonight'
-    get /^(.*)\s+((?:#{weekday+relative_day})(?: \d{1,2}(?::\d{2})?[ap]m)?)/i do |title, raw_date|
+    get /^(.*)\s+((?:#{weekday+relative_day})(?: \d{1,2}(?::\d{2})?[ap]m)?)/i \
+                                                           do |title, raw_date|
       
       d = Chronic.parse(raw_date)
       

metadata

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