reminders_txt 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7bd7ff0bd4b00009d86b9ddb970e9cf9467fa52c
-  data.tar.gz: e769f641f63a1f5dc0bd1188bea511270c08a221
+SHA256:
+  metadata.gz: 9513ff78ef31666123db5eafd6fd822eb4e6ca78968af6221a553732722769c5
+  data.tar.gz: 256e3164ddeb056dda7d0bc311e671e1452e651e777a0b857bbc26ad2b78f094
 SHA512:
-  metadata.gz: 75eb9508395b3993f1ec2ce32d36b697ef93d1cf37a23a006d637b6745f1e101ab0ecc7d51f72cfb732745b3dd1be708d8795c25716e19d7cea928a8c32c1ef8
-  data.tar.gz: 75889dda67ffca477fa51be70c45de40830c6cd8b70df9c4c0b397f1794fb5bc111e46d9d4751fe3f06a8cb47d0307c5d0dc00627ce47fa6c154477f9bb92a05
+  metadata.gz: e2c045a6a21042f716e794e6737a96725ce5f2a1b82007c10bd53d6dac00603a59b6fb2253ef0ed49fb4caf0e110a0d05932539f980ca2c54805ce8c1ec51be2
+  data.tar.gz: d557e5713f2060525148ee76de09a3599f84a42d5f4e1e6972c3d88e460d52068800bea24d6c294bca54bea9d87345ee59d800950ed982ae2a6be026f110f8da

data/lib/reminders_txt.rb

@@ -8,16 +8,23 @@ require 'event_nlp'
 require 'digest/md5'
 
 
+class RemindersTxtException < Exception
+  
+
+end
+
 class RemindersTxt
 
   
   attr_reader :reminders, :dx
   
-  def initialize(raw_s='reminders.txt', now: Time.now)
+  def initialize(raw_s='reminders.txt', now: Time.now, debug: false)
 
     super()
 
-    @now = now    
+    @now, @debug = now, debug
+    
+    puts '@now: ' + @now.inspect if @debug
 
     
     @filepath = raw_s
@@ -64,15 +71,51 @@ class RemindersTxt
     refresh()        
 
   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)
-    @dx.filter {|x| DateTime.parse(x.date) <= @now.to_datetime + days.to_i}
+  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
+    end
+    
+    @dx.filter {|x| DateTime.parse(x.date) <= next_date}
   end
     
   def updated?()
     @updated
   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_year()
+    upcoming months: 12
+  end
+  
   def to_s()
 
     filename = File.basename(@filepath).sub(/\.xml$/, '.txt')
@@ -103,7 +146,7 @@ class RemindersTxt
 
       r
     end
-    puts '@reminders: ' + @reminders.inspect
+
     @updated = false
 
     refresh()
@@ -130,8 +173,14 @@ class RemindersTxt
 
         if (r and r.recurring.empty? and not s[/\*$/]) then
           DateTime.parse(r.date)
-        else
-          reminder.date.to_datetime
+        else          
+          
+          if reminder.date then
+            reminder.date.to_datetime
+          else
+            raise RemindersTxtException, 'nil date  for reminder : ' \
+                + reminder.inspect
+          end
         end
         
       end
@@ -143,7 +192,17 @@ class RemindersTxt
     end
 
     # delete expired non-recurring reminders
-    @reminders.reject! {|x| x.date.to_time < @now if not x.recurring }
+    @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 
+      end
+      
+      x.date.to_time < @now if not x.recurring
+      
+    end
     
     @reminders.sort_by!(&:date)
 
@@ -155,10 +214,12 @@ class RemindersTxt
     b = h1 != h2
 
     if b or @reminders != reminders then
-      
+
       save_dx()      
       File.write File.join(File.dirname(@filepath), 'reminders.txt'), self.to_s 
       @updated = true
+    else
+      puts 'no update'
     end
     
     [:refresh, b]
@@ -207,5 +268,6 @@ class RemindersTxt
     save_detail()
     
   end
-    
-end
+  
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTExMDIwMjE0NVoXDTE3MTExMDIwMjE0NVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMjS2N7kUPBkBd/Xj/NvjMQzkY0KBKxXeAPcmzDpSNCjr8Yz4If7sDXSp68g
-  dJm0ywJHCZvZ/fDGPOZgCqh0VUoXDi5j51+0psxBjdPXfdBhA3PzY01s9ju1uDOH
-  1m+GZ5+DEmCetqrw0Ul4KJ5S2WbyYhgOl6s8uJIA4ZwJAfFIsX/BIEF4K+OrGANB
-  dmYLVQJgYvyxFZDFypHL57q1BEQl3Vn/sTUeMBjSV0bn6XLXjHw6rO0iN6VLet1k
-  p7lcuDy6A8OVmIWE1EF9Uri6PfVJoW5MmpRUbc/QIbkmZQK6PxaZNvRARakYcHO4
-  /pRI4LrIm/BEHdzs5DnbQItcN7cCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUom2NNLWXSNhcYiiudZ6VzKxMEz0wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAEWq63XTH
-  KjCQkfiRrHLonW8WIYzCIGVjDTwMn6m/kK0ZUEUVffe0Picc75e+XAUmrssx2UXe
-  fIm54sxpjy8d1iErCyckn+JX+VH4UbZpQMqWEyPosAp5YmK2BffBxPAKkdJ9tdhE
-  DA/kzIkB0UKr2j2gxXJlCU3zeF3fi2c/eg+PziIERT099XlfAzR9k3GOKNr+H0JZ
-  3bFPvyTwPPDowls7GzcFbUtnVuYuAI+L3EORTEvK3pEdNTxNNfjHksfKdMgMMKPy
-  n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
-  seDxJNsJgamAKg==
+  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
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAR12sqgiO9IWN25TPvwTnZX4DIFBa4TQ2pOODG7wI
+  uTWKnkWiAeiY/3dJ+sRp5+zf5VyOKt3gXmLhxdA4cfPvAmNNwZV2RbjELQvgfgHh
+  gP+jIlDpx5Xy2WBpx1a9sQ1Yb8kWDG2988n44HVSJD6e5ngZn4PFLmoY3mIk1m5l
+  dI4Z0AGFjiN2WeQp2aMtWsseoS7LvTm17xOtKNwLfWze9h9DRTNeICu7Dg69eswQ
+  Dd7K/ZLzHn/7xBCbybx3oUlx/w5m102wxNiUSjvlvlDbbheyFjyVGQcudIlWJkKm
+  rNRRoNfNjxaFhKsMdiyrfGmWhOBIsfPlGyhR7WMQYiz5ACjrlmnVnc8Aab1ipiUG
+  almSkip+iLRS55rdH4mSncK3iQurf6Jny9x2JD+U6cRXz/UPpNqFb/bU1mxXiU1a
+  U6f6HfP/6K9f602IeJGEDybVHYFQ7Ssl+AeclLBiMqy5HYuL7kRoD9C2D166GI42
+  M4blonk3dgx08AvXnjoMsgqh
   -----END CERTIFICATE-----
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,60 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: event_nlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -120,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reads and updates diary reminders from a plain text file