reminders_txt 0.3.14 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917ca91a5de6794a7b57b13f44dea851eafc03b5
-  data.tar.gz: 41d7a19a41e0ae8d32e418d2def6f4bc55e329a6
+  metadata.gz: 95e7b3c960ba713562c321978ec7569bb61eb03e
+  data.tar.gz: '09fa5e4699bcc944149c5e8e1d12961c0640fcc7'
 SHA512:
-  metadata.gz: 1031d7a36f643df92f9bfc7858faaad7e7135873303a4e5878456e191ec22d791da02a1e6d377fb8d18f6829abf575adb7275d8f83a85b93f82a9345e891dc2a
-  data.tar.gz: 775d899e265f0c0aecbbb45b6637a118ea128eab67618b8232bb38b46cef64b7c409d9d7911415d22fb4e67a211e87d13cfa810283b9c4752587d12888df4ee3
+  metadata.gz: 9bcb76b37bc86a523553672e89d75fa46f106b5bbe3461085bad9fd926e786e53b54d71e7512cb8d06b47560ad677067c96285daeaaf233c1a5041022b84dec5
+  data.tar.gz: cd8823318b716e71f75e15080c90386a1b84584dc87214d5c031ad35292ec4e7076cc940968e0b4735462d739896be84016d7431f01568eaa036b373ef4b2fb6

data/lib/reminders_txt.rb

@@ -4,40 +4,28 @@
 
 
 require 'dynarex'
-require 'app-routes'
+require 'event_nlp'
 require 'digest/md5'
-require 'chronic_cron'
-
-
-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 RemindersTxt
-  include AppRoutes
-  using Ordinals
+
   
   attr_reader :reminders, :dx
   
   def initialize(raw_s='reminders.txt', now: Time.now)
 
     super()
-    
+
     @now = now    
+
+    
     @filepath = raw_s
     
     if raw_s.lines.length > 1 then
 
       if raw_s.lstrip[0] == '<' then
-        
+
         @filepath = 'reminders.xml'
         @dx = Dynarex.new raw_s
         
@@ -68,12 +56,11 @@ class RemindersTxt
   
   def add(s)
 
-    @params = {}    
-    expressions(@params)
-    @params[:input] = s
-
-    @reminders << find_expression(s) 
-
+    s.strip!
+    r = EventNlp.new(@now, params: {input: s}).parse(s)
+    return if r.nil?
+    
+    @reminders << r
     refresh()        
 
   end
@@ -95,160 +82,25 @@ class RemindersTxt
   
   def to_xml()
     @dx.to_xml pretty: true
-  end
-    
-  protected
-
-  def expressions(params) 
-
-    
-    # some event every 2 weeks
-    # some event every 2 weeks at 6am starting from 14th Jan
-    # some event every 2 weeks at 6am starting from 18th Feb until 28th Oct
-    # some event every 2nd Monday (starting 7th Nov 2016)
-    # some event every 2nd Monday (starting 7th Nov until 3rd Dec)
-
-
-    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
-
-
-    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\
-                      .strftime("#{new_date.day.ordinal} %b %Y"))        
-          d = new_date
-          
-        end
-      end
-      
-
-      #puts [0, title, recurring, time, raw_date, end_date].inspect
-      OpenStruct.new input: input, title: title, recurring: recurring, 
-                                                date: d, end_date: end_date
-      
-    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 
-                                                             |title, recurring|
-
-      #puts [1, title, recurring].inspect      
-      OpenStruct.new input: params[:input], title: title, recurring: recurring
-
-    end
-    
-    # hall 2 friday at 11am
-    get /(.*)\s+(#{weekday})\s+at\s+(.*)/i do |title, raw_day, time|
-      
-      d = Chronic.parse(raw_day + ' ' + time)
-      
-      #puts [1.5, title, raw_day].inspect
-      OpenStruct.new input: params[:input], title: title, date: d
-      
-    end
-    
-    # e.g. 21/05/2017 Forum meetup at Roundpeg from 2pm
-    get /^(\d+\/\d+\/\d+)\s+(.*)(?: from|at)\s+(\d+[ap]m)/ do 
-                                                    |raw_date, title, raw_time|
-      
-      d = Chronic.parse(raw_date + ' ' + 
-                        raw_time, :endian_precedence => :little)
-      recurring = nil            
-      
-      #puts [3, title, raw_date].inspect
-      OpenStruct.new input: params[:input], title: title, date: d
-    end        
- 
-    # hall 2 friday at 11am
-    # some important day 24th Mar
-    
-    with_date = "(.*)\\s+(\\d\+\s*(?:st|nd|rd|th)?\\s+(?:#{months}))"
-    alt_pattern = '([^\d]+)\s+(\d+[^\*]+)(\*)?'
-    
-    get /#{with_date}|#{alt_pattern}\s*(\*)$/i do |title, raw_date, annualar|
-
-      d = Chronic.parse(raw_date)
-
-      recurring = nil
-      
-      if annualar then
-        
-        recurring = 'yearly'
-        if d < @now then
-          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
-        end
-      end
-      
-      #puts [2, title, raw_date].inspect
-      OpenStruct.new input: params[:input], title: title, date: d, 
-                                                        recurring: recurring      
-    end
-    
-    # 27-Mar@1436 some important day
-    get /(\d[^\s]+)\s+([^\*]+)(\*)?/ do |raw_date, title, annualar|
-
-      d = Chronic.parse(raw_date, :endian_precedence => :little)
-      recurring = nil
-      
-      if annualar then
-        
-        recurring = 'yearly'
-        if d < @now then
-          d = Chronic.parse(raw_date, now: Time.local(@now.year + 1, 1, 1)) 
-        end
-      end
-      
-      
-      #puts [3, title, raw_date].inspect
-      OpenStruct.new input: params[:input], 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 find_expression run_route
+  end   
   
   private
   
   def import_txt(s)
 
     @file_contents = s
-    @params = {}
-    expressions(@params)
     buffer = s.lines[2..-1]
 
-    @reminders = buffer.inject([]) do |r, x|  
+    @reminders = buffer.inject([]) do |r, x|
+      
+      x.strip!
+
       if (x.length > 1) then
-        @params[:input] = x.strip
-        rx = find_expression(x) 
-        r << rx
+
+        rx = EventNlp.new(@now, params: {input: x}).parse(x)
+        r << rx if rx
       end
+
       r
     end
     
@@ -268,7 +120,7 @@ class RemindersTxt
     if File.exists? @dxfilepath then
 
       @dx = Dynarex.new @dxfilepath
-      
+
       @reminders.each do |reminder|
         s = reminder.input
         r = @dx.find_by_input s
@@ -317,7 +169,6 @@ class RemindersTxt
     @reminders.each {|x| @dx.create x.to_h}
     @dx.save @dxfilepath
     
-  end
-  
+  end  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
   seDxJNsJgamAKg==
   -----END CERTIFICATE-----
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -42,7 +42,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.15
+        version: 1.7.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,9 +52,9 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.15
+        version: 1.7.21
 - !ruby/object:Gem::Dependency
-  name: app-routes
+  name: event_nlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -62,7 +62,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 description: 
 email: james@jamesrobertson.eu
 executables: []