event_nlp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9b15778895f2a01d0c3b972ba1436f9073fd6c
-  data.tar.gz: 95eeb58ca3736fa353d0e961ce2f8d67b575d231
+  metadata.gz: f2747c0b8190818a48c2ecf2f046d36f149daac9
+  data.tar.gz: d4ac520028d38d04557bfe7b52ad114c633f26ea
 SHA512:
-  metadata.gz: d284092bbd265392a53d4f137b89bb0b414589fe35f0e29a8ca61e1b895eafbb85207f81fd817ce94debe6a6a75bb2a59567e1ccd84f78301b4bddfc386ce6e4
-  data.tar.gz: 7d2f3f486ff172b0704d474a15f5d3a94128958505f9c1573783d35fd4a20328c75a20b692fb81cdcf3d33d83ae3a337c485ae6749a9029f437e2c040bd3f33f
+  metadata.gz: 93b7a5cbcabea78ca1b64750de89fa7c59f537a0912d9bf29b84e53a7648f242429330a2de4ad27ca8830dd594ec48f945e8d5e5e4dcc911a37cdae1fffda93c
+  data.tar.gz: 8a397c27ed941cb479b2845fe19723b37f6ac9c4cd30b60b41314f7745482fc799e0bce1a1189441c8906ce1e65508745c5158bced0e5b2f985c7c7d0aadb0a4

data/lib/event_nlp.rb

@@ -3,26 +3,50 @@
 # file: event_nlp.rb
 
 require 'chronic'
+require 'ostruct'
 require 'app-routes'
 
 
 
+module Ordinals
+
+  refine Integer do
+    def ordinal
+      self.to_s + ( (10...20).include?(self) ? 'th' : 
+                    %w{ th st nd rd th th th th th th }[self % 10] )
+    end
+  end
+end
+
+
 class EventNlp
   include AppRoutes
+  using Ordinals
   
+  attr_accessor :params
   
-  def initialize()
-
+  def initialize(now=Time.now, params: {})
+    
     super()
-    @params = {}    
+    
+    @now = now
+    @params = params
     expressions(@params)    
 
   end
+  
+  def parse(s)
+    
+    r = run_route(s)
+    return unless r.is_a? Hash
+    
+    OpenStruct.new({input: s}.merge r)
+    
+  end  
 
   private
 
   def expressions(params) 
-
     
     # some event every 2 weeks
     # some event every 2 weeks at 6am starting from 14th Jan
@@ -31,7 +55,7 @@ class EventNlp
     # some event every 2nd Monday (starting 7th Nov until 3rd Dec)
 
 
-    starting = /(?:\(?\s*starting (\d+\w2} \w+\s*\w*)(?: until (.*))?\s*\))?/
+    starting = /(?:\(?\s*starting (\d+\w{2} \w+\s*\w*)(?: until (.*))?\s*\))?/
     weekday = Date::DAYNAMES.join('|').downcase
     months = (Date::MONTHNAMES[1..-1] + Date::ABBR_MONTHNAMES[1..-1])
       .join('|').downcase
@@ -39,16 +63,15 @@ class EventNlp
 
     get /^(.*)(every \w+ \w+(?: at (\d+am) )?)\s*#{starting}/ do \
                                    |title, recurring, time, raw_date, end_date|
-      
+
       input = params[:input]
-      
+
       d = Chronic.parse(raw_date)
       
       if recurring =~ /day|week/ then
-                
-        
+
         if d < @now then
-          
+
           new_date = CronFormat.new(ChronicCron.new(recurring)\
                                     .to_expression, d).to_time
           input.gsub!(raw_date, new_date\
@@ -58,9 +81,9 @@ class EventNlp
         end
       end
       
-
       #puts [0, title, recurring, time, raw_date, end_date].inspect
-      {title: title, recurring: recurring, date: d, end_date: end_date}
+      {input: input, title: title, recurring: recurring, date: d, 
+       end_date: end_date}
       
     end
     
@@ -139,19 +162,12 @@ class EventNlp
       { title: title, date: d, recurring: recurring }
     end    
     
-
-        
-    
     # e.g. 04-Aug@12:34
     get '*' do |s|
       puts 's: ' + s.inspect
       'pattern unrecognised'
     end
 
-
   end
   
-  alias parse run_route
-  
-
-end
+end

metadata

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