reminders_txt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db30e2862306c3ce60a7da9be8552c26636f37e
-  data.tar.gz: 6a534979be14feee419456c7df3d1e4ea4a63ad2
+  metadata.gz: 7833e42aea7e1c22ce822a700b512ce739bda483
+  data.tar.gz: 47908e11f918d4d85f429d24e58f3bd8ca3cb05e
 SHA512:
-  metadata.gz: 139ccb0e21842b3cd7c8cde973c3e4a33e5133fc283f374fcc1372bdbe7937ecec3a4245efdbb29e1bd340de3b5260b9d489a9ad484db38b09bedda78b426fc3
-  data.tar.gz: 0b8914d99ff25e82c1978dd8b4a056479d0b9a978b9192690c348ef6e80ec6ee5dc30cd5d5acc8e3b8646a10ac838c2639e54c1947332591c0ff6d669df03414
+  metadata.gz: ced8f17dd7096cfe9b7d92a1925ad3c9257f3c5f4a707242d1d7efbf0926abd0faf471ee30288104bc953ff994c267b2587896f8397fd55caba909958b680e0e
+  data.tar.gz: 329aba39a779adfa91c9eb0e98e9192023b9ec0452e73bfbfa5e6a2f2e3f555a7ce9368046a99b6d76c1180fa736b6ccb498104fedc6a5e1f98ace2e41f54c24

data/lib/reminders_txt.rb

@@ -3,7 +3,7 @@
 # file: reminders_txt.rb
 
 
-require 'recordx'
+require 'dynarex'
 require 'app-routes'
 require 'chronic_cron'
 
@@ -26,33 +26,80 @@ class RemindersTxt
   
   attr_reader :expressions
   
-  def initialize(s, now=Time.now)
+  def initialize(s, now: Time.now, dxfilepath: 'reminders.xml')
     
     @raw_input = s
+    @now = now
+    
+    Dir.chdir File.dirname(dxfilepath) if dxfilepath
+    
+    @dxfilepath = dxfilepath
+    
     super()
     @params = {input: s}
     expressions(@params)
     buffer = s[2..-1]
 
-    @expressions = buffer.inject([]) do |r, x|  
+    @reminders = buffer.inject([]) do |r, x|  
       if (x.length > 1) then
-        @params[:input] = x
+        @params[:input] = x.strip
         rx = find_expression(x) 
-        rx.input = x
+        rx.input = x.strip
         r << rx
       end
       r
     end
+    
+    update()
+  end
+  
+  def create_dx()
+    
+    dx = Dynarex.new('reminders/reminder(input, title, recurring, date, end_date)')
+    @reminders.each {|x| dx.create x.to_h}
+    dx.save @dxfilepath
+    
   end
   
   def refresh()
     
-    a = @expressions.sort_by do |x| 
-      x.date.is_a?(Time) ? x.date : Chronic.parse(x.date)
+    @reminders.map! do |x|
+       x.date = x.date.is_a?(Time) ? x.date : Chronic.parse(x.date)
+       x
     end
+     
+    # synchronise with the XML file
+    # if XML file doesn't exist, create it
     
-    @raw_input[0..2].join + a.map(&:input).join()
+    if File.exists? @dxfilepath then
+      
+      dx = Dynarex.new @dxfilepath
+      
+      @reminders.map do |reminder|
+        
+        r = dx.find_by_input reminder.input
+        reminder.date = Date.parse r.date
+        
+        reminder
+      end
+      
+    else
+      create_dx()
+    end
+    
+
+    # delete expired non-recurring reminders
+    @reminders.reject! {|x|  x.date.to_time < @now }
+    
+    @reminders.sort_by!(&:date)
+    
+  end
+  
+  def to_s()
+    @raw_input[0..2].join + @reminders.map(&:input).join("\n")
   end
+  
+  alias update refresh
     
   protected
 
@@ -82,7 +129,7 @@ class RemindersTxt
       end
       
 
-      RecordX.new input: input, title: title, recurring: recurring, date: date, end_date: end_date
+      OpenStruct.new input: input, title: title, recurring: recurring, date: date, end_date: end_date
       #[0, title, recurring, time, date, end_date].inspect
     end
     
@@ -90,21 +137,21 @@ class RemindersTxt
     # some meeting First thursday of the month at 7:30pm
     get /(.*)\s+(\w+ \w+day of (?:the|every) month at .*)/ do |title, recurring|
       
-      RecordX.new input: '', title: title, recurring: recurring
+      OpenStruct.new input: '', title: title, recurring: recurring
       #[1, title, recurring].inspect
     end        
  
     # some important day 24th Mar
     get /(.*)\s+(\d+.*)/ do |title, date|
       
-      RecordX.new input: '', title: title, date: date
+      OpenStruct.new input: '', title: title, date: date
       #[2, title, date].inspect
     end
     
     # 27-Mar@1436 some important day
     get /(\d[^\s]+)\s+(.*)/ do |date, title|
 
-      RecordX.new input: '', title: title, date: date
+      OpenStruct.new input: '', title: title, date: date
       #[3, title, date].inspect
     end    
     
@@ -120,4 +167,3 @@ class RemindersTxt
   alias find_expression run_route
   
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   n+SSd9dm8JjhZ2pqHtX+bgMZ18hrN06xfR+UPtk5BKC8v1PC0FWxaVR4lom39rFU
   seDxJNsJgamAKg==
   -----END CERTIFICATE-----
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: recordx
+  name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.7.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.7.15
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement