event_nlp 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d909b18a0afd92c463fd1a920caa2592aa57f31b
-  data.tar.gz: 50a60edd2bba24f051a1cd36e4a275101accfed4
+  metadata.gz: d4b00491e5b6a95498e2903246480cb7ad704637
+  data.tar.gz: a9967a18b98136821653d8b37083f3863ce3516c
 SHA512:
-  metadata.gz: aa9bb156d3c4000c9576e8c0563e84ef9843cc0df6ae5cbe10b9ea6bb5150372bd120a3fa1f179c4c77e039cb71137904e746f5f0d1f3cb0a74eeb359442ad66
-  data.tar.gz: 0b9d2eff155f0d5504c8a4eda4780738bf6a88f69e45a4b1a7fe7a84fbed04bcdf8abfb4d9fd212733d06faf8859f89fdb4b1d75b4d1273fd93d4bffabd86e6b
+  metadata.gz: cc88647d4e65b87a1633f7f2d95d8cf01809ba98f091c2f85b81aee5167b1c2f76ae541c23cb0c1222c848ec0a388c121313a055d84e10c20adf291b94ce51fc
+  data.tar.gz: d16d34117a77cedd448307027b52efbc5d57c0abef1c83ddea86b314dd3f20a773ba27fdb35bd7f5d393ba7b3a9402fb41f939225ca873a5d2497f50b23fefa1

data/lib/event_nlp.rb

@@ -2,7 +2,7 @@
 
 # file: event_nlp.rb
 
-require 'chronic'
+require 'chronic_cron'
 require 'ostruct'
 require 'app-routes'
 
@@ -36,8 +36,9 @@ class EventNlp
   end
   
   def parse(s)
-    
+
     r = run_route(s)
+
     return unless r.is_a? Hash
     
     OpenStruct.new({input: s}.merge r)
@@ -61,7 +62,7 @@ class EventNlp
       .join('|').downcase
 
 
-    get /^(.*)(every \w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
+    get /^(.*)(every \d\w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
 
       input = params[:input]
@@ -87,6 +88,18 @@ class EventNlp
       
     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, time, raw_date, end_date].inspect
+      {input: input, title: title, recurring: recurring, date: d }
+      
+    end    
+    
     # some meeting 3rd thursday of the month at 7:30pm
     # some meeting First thursday of the month at 7:30pm
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_nlp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   /WtgKLMzCAKTHZ2OpN3OTs6j+vsUBIwCb/Ki17Z4YULtRaGg7I8nTjTrHIIJ0yNm
   kbRihMTezaC+4A==
   -----END CERTIFICATE-----
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1,4 +1,4 @@
-��|�"�%����i�vpW�BH�_Ԁ���:�F�	�%폃((�Ҟ(��Y�b;ڙD���H�
-|b�����[��]�|�Srz�,�z��b,�
-g�_�_�K�~ݬr��$�ߓ����һ��p�]8��Uf�A�X-,��O_󔻤�R+�G�h�Q�TVo�����=�vJ*�E��`���?@���j���<.�c�aC��@vUb{�z�����`���!��tfӵ���g9
-�x7N�C����L/tQ���q
+NyK�E#=��jd�3�j�CZw�!'-Vj��N����l�q
+�[y���<*�lM�6�<˧z�^m��ar�$q#��%�~�zAf��z�f�__$d��%��
+�R(����q�.D 5m,'�ڥ$�l�B�j�ݜ�V�O�錿��Pˋ(Ty�3;��(I�p:�|.�Nn�H��+S�6����'޹��W�hwꑒy
�
+���6tS�)S�P�����-