reminders_txt 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d43b528dbfbaf1fe0db1f39201ee83b132df59d915c130fc6fb743994cc02d
-  data.tar.gz: 6d7081ca6905ab0acb4149e7b65e632f5047b9cc1ce62750749c5b7222179fac
+  metadata.gz: 47aef7833540b8091c405532ea18f2c7e5f21907a4cc2bc5dd44c027858fcf2b
+  data.tar.gz: 772c3421c3521bc8ef5de3db1fe8742c1f8dc8dfed435b7416ff33252137629b
 SHA512:
-  metadata.gz: f6a26f7f3fb6e13f543923ea85ccb33b6ba1e4198c50942db1a9280d5a615b7d80704bb73ae5578b0658c43805f74317c60967f951b1754ab80c6b64261c95cf
-  data.tar.gz: 894912a616fa45da1bc71bff611be87ff4543f2f0686b28e38bd20e768c77d16a3a57731f7d377fa0f2a7d1f45201df6e56309b71a7a8c199e3ef0bf207226ea
+  metadata.gz: 7f8437caf5ed5917341837189ac3c437602e629bac78404376ba2d2af5a495b823577dceac1ff4f1929d2bd8fd51839b8860535e19f33732d624cf35b3e1a4b9
+  data.tar.gz: fe18da158fae800b99d3cc9c92bef68048cc2f3c61649cfbd9f36aedbabd135c198f125000d86271489669c1d8826ff450f6c2ab67cf596117bc6cac456e91ff

data/lib/reminders_txt.rb

@@ -6,22 +6,11 @@
 require 'dynarex'
 require 'event_nlp'
 require 'digest/md5'
-
-
-module Ordinal
-  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
+require 'human_speakable'
 
 
 class RemindersTxtException < Exception
-  
+
 
 end
 
@@ -29,132 +18,147 @@ end
 class RemindersTxt
   using ColouredText
   include RXFHelperModule
-  
+
   attr_reader :reminders, :dx
-  
+
   def initialize(raw_s='reminders.txt', now: Time.now, debug: false)
 
     super()
 
     @now, @debug = now, debug
-    
+
     puts ('@now: ' + @now.inspect).debug if @debug
 
-    
+
     @filepath = raw_s
-    
+
     if raw_s.lines.length > 1 then
 
       if raw_s.lstrip[0] == '<' then
 
         @filepath = 'reminders.xml'
         @dx = Dynarex.new raw_s
-        
+
       else
 
         @filepath = File.join(Dir.pwd, 'reminders.txt')
-        @dxfilepath = @filepath.sub(/.txt$/,'.xml')              
+        @dxfilepath = @filepath.sub(/.txt$/,'.xml')
 
         @dx = Dynarex.new
-        import_txt(raw_s)       
-        
+        import_txt(raw_s)
+
       end
-      
+
     elsif File.extname(@filepath) == '.txt'
 
       s = FileX.read @filepath
       @filename =  File.basename(@filepath)
-      @dxfilepath = @filepath.sub(/.txt$/,'.xml')      
-      
+      @dxfilepath = @filepath.sub(/.txt$/,'.xml')
+
       import_txt(s)
-      
+
     else
-      
+
       @dx = Dynarex.new @filepath
-      
+
     end
   end
-  
+
   def add(s)
 
     s.strip!
     r = EventNlp.new(@now, params: {input: s}).parse(s)
     return if r.nil?
-    
+
     @reminders << r
-    refresh()        
+    refresh()
+
+  end
+
+  def after(d)
+
+    date = d.is_a?(String) ? Chronic.parse(d).to_datetime : d
+    @dx.filter {|x| DateTime.parse(x.date) > date}
 
   end
-  
+
   def before(d)
-    
+
     future_date = d.is_a?(String) ? Chronic.parse(d).to_datetime : d
     @dx.filter {|x| DateTime.parse(x.date) < future_date}
-    
+
   end
-  
+
   def find(s)
     @dx.filter {|x| x.title =~ /#{s}/i}
   end
 
   def upcoming(ndays=5, days: ndays, months: nil)
-    
+
     next_date = if months then
       @now.to_datetime >> months.to_i
     else
-      @now.to_datetime + days.to_i
+      ((@now.to_date + days.to_i + 1).to_time - 1).to_datetime
     end
-    
+
     @dx.filter {|x| DateTime.parse(x.date) <= next_date}
   end
-    
+
   def updated?()
     @updated
-  end  
-  
+  end
+
   def today()
     upcoming 0
   end
-  
+
   def tomorrow()
     upcoming days: 1
   end
-  
+
   def this_week()
     upcoming days: 6
   end
-  
+
   alias weekahead this_week
-  
+
+  def this_month()
+    upcoming months: 1
+  end
+
   def this_year()
     upcoming months: 12
   end
-  
+
   def to_s()
 
     filename = File.basename(@filepath).sub(/\.xml$/, '.txt')
     [filename,  '=' * filename.length, '', *@dx.all.map(&:input)].join("\n")
 
   end
-  
+
   def to_xml()
     @dx.to_xml pretty: true
-  end   
-  
+  end
+
   private
-  
+
   def import_txt(s)
 
+    puts 'inside import_txt' if @debug
     @file_contents = s
     buffer = s.lines[2..-1]
 
     @reminders = buffer.inject([]) do |r, x|
-      
+
+      puts 'x: ' + x.inspect if @debug
       x.strip!
 
       if (x.length > 1) then
 
-        rx = EventNlp.new(@now, params: {input: x}).parse(x)
+        puts '@now:' + @now.inspect if @debug
+
+        rx = EventNlp.new(@now, params: {input: x}, debug: @debug).parse(x)
         puts ('rx: ' + rx.inspect).debug if @debug
         r << rx if rx
       end
@@ -165,13 +169,15 @@ class RemindersTxt
     @updated = false
 
     refresh()
-    
+
   end
-  
+
   # synchronise with the XML file and remove any expired dates
   #
   def refresh()
 
+    puts 'inside refresh()' if @debug
+
     reminders = @reminders.clone
     # if XML file doesn't exist, create it
 
@@ -180,16 +186,18 @@ class RemindersTxt
       @dx = Dynarex.new @dxfilepath
 
       @reminders.each do |reminder|
+
         s = reminder.input
+        puts ('refresh() checking s: ' + s).debug if @debug
         r = @dx.find_by_input s
-        
+
         # it is on file and it's not a recurring or annual event?
         # use the date from file if the record exists
 
         if (r and r.recurring.empty? and not s[/\*$/]) then
           DateTime.parse(r.date)
-        else          
-          
+        else
+
           if reminder.date then
             reminder.date.to_datetime
           else
@@ -197,68 +205,74 @@ class RemindersTxt
                 + reminder.inspect
           end
         end
-        
+
       end
-      
+
     else
 
       save_dx()
-            
+
     end
 
     # delete expired non-recurring reminders
     @reminders.reject! do |x|
-      
+
       if @debug then
         puts 'rejects filter: '
         puts '  x.input: ' + x.input.inspect
-        puts '  x.date.to_time: '  + x.date.to_time.inspect 
+        puts '  x.date.to_time: '  + x.date.to_time.inspect
       end
-      
+
       x.date.to_time < @now if not x.recurring
-      
+
     end
-    
+
     @reminders.sort_by!(&:date)
 
     # did the reminders change?
-    
+    puts 'self.to_s: ' + self.to_s if @debug
+
     h1 = (Digest::MD5.new << self.to_s).to_s
     h2 = (Digest::MD5.new << @file_contents).to_s
 
     b = h1 != h2
 
+    if @debug then
+      puts 'reminders: ' + reminders.inspect
+      puts '@reminders: ' + @reminders.inspect
+    end
+
     if b or @reminders != reminders then
 
-      save_dx()      
-      FileX.write File.join(File.dirname(@filepath), 'reminders.txt'), self.to_s 
+      save_dx()
+      FileX.write File.join(File.dirname(@filepath), 'reminders.txt'), self.to_s
       @updated = true
     else
       puts 'no update'
     end
-    
+
     [:refresh, b]
-        
+
   end
 
   def save_detail()
-    
+
     # fetch the notes file if it exists
     filepath = File.dirname @dxfilepath
-        
+
     notesfile = File.join(filepath, 'reminder_notes.xml')
     return unless File.exists? notesfile
-    
-    dx = Dynarex.new notesfile    
 
-    h = dx.all.inject({}) do |r,x| 
+    dx = Dynarex.new notesfile
+
+    h = dx.all.inject({}) do |r,x|
 
       a = x.info.lines
       tag = a.shift[/\w+/]
       body = a.join.strip
-      
+
       r.merge(tag.to_sym => body)
-      
+
     end
 
     rows = @dx.all.map do |x|
@@ -266,48 +280,46 @@ class RemindersTxt
       hashtag ? x.to_h.merge(info: h[hashtag.to_sym]) : x.to_h
     end
 
-    dx2 = Dynarex.new 'reminders/reminder(input, title, recurring, ' + 
+    dx2 = Dynarex.new 'reminders/reminder(input, title, recurring, ' +
         'date, end_date, venue, info)'
     dx2.import rows
     dx2.save File.join(filepath, 'reminder_details.xml')
 
   end
-  
+
   def save_dx()
-    
+
     @dx = Dynarex.new(
       'reminders/reminder(input, title, recurring, date, end_date, venue)')
     @reminders.each {|x| @dx.create x.to_h}
     @dx.save @dxfilepath
-    
+
     save_detail()
-    
+
   end
-  
-  
+
+
 end
 
 class RemindersTxtVoice < RemindersTxt
-  using Ordinal
-  
-  def weekahead()
-    
-    s = super.all.map do |x|
+  using HumanSpeakable
+
+  def weekahead() plain_talk(super) end
+  def today()     plain_talk(super) end
+  def tomorrow()  plain_talk(super) end
+
+  private
+
+  def plain_talk(entries)
+
+    s = entries.all.map do |x|
       date = DateTime.parse(x.date)
-      "you are at %s, on %s, at %s." % [(x.venue.empty? ? x.title : x.venue), \
-                                    format_date(date), date.strftime("%-I:%M%P")
-    ]
+      "you are at %s, %s at %s." % [(x.venue.empty? ? x.title : x.venue), \
+                                    date.humanize, date.to_time.humanize]
     end.join(" Then ")
 
-    s.sub!(/^./){|x| x.upcase}    
-    
+    s.sub!(/^./){|x| x.upcase}
+
   end
-  
-  private
-  
-  def format_date(date)
-    [Date::DAYNAMES[date.wday], 'the', date.day.ordinal, 'of', 
-     Date::MONTHNAMES[date.month]].join(' ')    
-  end  
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwODI3MTQyNzQ1WhcN
-  MTkwODI3MTQyNzQ1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDXSeGl
-  jA7t0dTfrt5uPzHbjshY0b5E/xow3ABWmT8DUEP18xBtnEUrilHRh9GEGvMN0Fsq
-  O/kpqQAqTAqQQOVxyGhbbOQXOY86+SnZtBurNgcJ0QsiDnum4zqjbJT0lscpPdPK
-  t+mXcVcAOdhQndEYIBILiISRfcwxHgjxThAl4dzuS1ifFGCuIpFGJJ49DkigCFdL
-  oTKnImrLw5mSW1/BTY0JEhY4OhpGlaF6B6UOktj6M9tpSgezMcmovR2LGsmcUjjl
-  rgspsBjQ23/h3dwimCDbXDrJEHBKaWgBwoxt6Hya+ybB9IjMPTmnFeAT06bNGyIf
-  bSPcT2UrdvxbU73eEZdcnSQgRnDYQ3TFzQjQGiukgJVkm82v+WCHIpcjBgw0bS6s
-  rR+Hhtf7cZsCxJMRPJxqYonG+yin/mPJfKB2ou9MJggkuny2QZfWtfw+Gun/svVl
-  Ly9Hsq6gTvHWdcmQlPhn7Gx+OZ8CR0M2SOqV5Mvlrhv6/O2tfoC3us3Q45kCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUpxsXwGY1
-  MQV4+OxT3LFEi4/T6OYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAyMTQzOTIyWhcN
+  MjMwMjAyMTQzOTIyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDyuWp6
+  R95hbPIOVhI9BxGT17x1oAVsTc/BP9VeNAk4MKejK3S+YFv+6M7vXJY5rfW1uNVi
+  NzbEt3akUkYVqUZ8XfNxG2CcUEeMmkk/YiJA9zyXW6hb4txcc1b0ekmRvFCwVqpB
+  ofbQd3JpYZJ7CsH5NkvkZdwUm5KnxqoxxFD9w2u63z3/JAAaJBGOwrYryH0XrX+O
+  2jfw5nxJX8JAPdzR7VfOQV+2i7+0SUSOECtHE4/k+WTu/WnFAzAtqRNE93QB3YF3
+  TA6ospSIyVDQPYqq0tpeUxbYmJQ7kmFF0Kc6ZEXN54tsDhg8aOtsvRtzwcVfZuhc
+  RJQdEbsN195Q4hDFMAIqxBueSuSEujlnVVkXkmvT7ZA6imbb5MPSORKJCAh6uB4c
+  II16+wzXfWikj2OPCdegZKr00kG9LuC0qPfRKJWSVVIlhPsswamiKGj4vMYSPnc/
+  juKrlC7/kmovp6ySjXRA6t03uJjUeMeuvj6eihuxiZdT8r0HeqrMAXltD+ECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUX8XM4mRu
+  OpjWNvRPYrT2LntRDG4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAR12sqgiO9IWN25TPvwTnZX4DIFBa4TQ2pOODG7wI
-  uTWKnkWiAeiY/3dJ+sRp5+zf5VyOKt3gXmLhxdA4cfPvAmNNwZV2RbjELQvgfgHh
-  gP+jIlDpx5Xy2WBpx1a9sQ1Yb8kWDG2988n44HVSJD6e5ngZn4PFLmoY3mIk1m5l
-  dI4Z0AGFjiN2WeQp2aMtWsseoS7LvTm17xOtKNwLfWze9h9DRTNeICu7Dg69eswQ
-  Dd7K/ZLzHn/7xBCbybx3oUlx/w5m102wxNiUSjvlvlDbbheyFjyVGQcudIlWJkKm
-  rNRRoNfNjxaFhKsMdiyrfGmWhOBIsfPlGyhR7WMQYiz5ACjrlmnVnc8Aab1ipiUG
-  almSkip+iLRS55rdH4mSncK3iQurf6Jny9x2JD+U6cRXz/UPpNqFb/bU1mxXiU1a
-  U6f6HfP/6K9f602IeJGEDybVHYFQ7Ssl+AeclLBiMqy5HYuL7kRoD9C2D166GI42
-  M4blonk3dgx08AvXnjoMsgqh
+  BgkqhkiG9w0BAQsFAAOCAYEAfEfGdQvb787MqUj3pRstbdt9ycVqXr7Ctqz1xv72
+  G2lvakKPZOhPuk3HEVcWT3qAxz0m0CqTrP5SBls6Daq0FvOX3CRWsLvlYcenHuqB
+  4tmdC9YPz5Ddqrsc3UHITZQWtBHrhMgO6bU5sUweY3QdinRUVAz+JkS1HnvGdks7
+  noiqQ2iIy8lEiCi2LL5Ov8G0OmOpomOU7jIK6iQIdZB4g6d25iv3um0OzwX8EXDo
+  OaR5OH2c7TKOf9p3FfNmJ7zp0WJDchjqa7MIaJNkMCc3RKrB2ixO5AptuTT2XQ70
+  eSaeDAWlb4pmbBQbCRejl71KOFz3pldcGoVuANq33c3cfTu4C6tbXxRbs2fiNjrn
+  eYgIEbYn1n+EJ9AqQ9jau+5jkpip5X+ix/vHl3oLWLB0rQ20HP/Ftq8zkjMZLuDD
+  tYyvieamfpSjWJEZi7K760qv2dWJ9kwfaJ7Q3TVP4Jjt0Iwep7Gutk7GV3uY35DA
+  iHcajrfKduh5CsLsvkXRjR4E
   -----END CERTIFICATE-----
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -43,62 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.17
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.17
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: event_nlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: chronic_cron
+  name: human_speakable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,7 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Reads and updates diary reminders from a plain text file