reminders_txt 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115c753ddcc43b6b7c771d7bba580b2986518730
-  data.tar.gz: 422b8921269476bede0a4e574a7f7b9c8e5b8806
+  metadata.gz: cbb33480f37472a926eafe65ff3ce3422a83c2be
+  data.tar.gz: 257b8dc0ce77dca22753f2901ae496721d2d1e36
 SHA512:
-  metadata.gz: cd9c3409bd1aab401ea58e5df1aa07b43f023a17893d32f804ae5c2c62b42c3ecf244be143635f1640b276e28f0d4cdf03c78e4709438a9a003754a6b84f57ec
-  data.tar.gz: 00dfe4f3f0022213f7f4663007647500f987fcef276820f79c7a33f5743dae45bca54a7cbd455ac801e3b2d1737a230c475c7b6e7b031018934024ff35afb495
+  metadata.gz: abe605a67c520962a4e02f4b2a3a460498959e668ba2a87ea37c62950db9349b3ec14e2f5ad38874a362d7ed4f39a057a800458bb576979db9c02b7630fe33b1
+  data.tar.gz: baa9b238c153f46623f31aa6c5a8f09a1085f7a1800a0ad2023bb9f38e922a89e915bd85903c4ec9aa521a7ced60393144715761a1d057d22ef0e2c5caa171f2

data/lib/reminders_txt.rb

@@ -25,7 +25,7 @@ class RemindersTxt
   include AppRoutes
   using Ordinals
   
-  attr_reader :reminders
+  attr_reader :reminders, :dx
   
   def initialize(raw_s='reminders.txt', now: Time.now)
 
@@ -35,14 +35,34 @@ class RemindersTxt
     @filepath = raw_s
     
     if raw_s.lines.length > 1 then
-      @filepath = 'reminders.xml'
-      @dx = Dynarex.new raw_s
+
+      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')              
+
+        @dx = Dynarex.new
+        import_txt(raw_s)       
+        
+      end
+      
     elsif File.extname(@filepath) == '.txt'
 
-      import_txt(@filepath)
-      refresh()
+      s = File.read @filepath
+      @filename =  File.basename(@filepath)
+      @dxfilepath = @filepath.sub(/.txt$/,'.xml')      
+      
+      import_txt(s)
+      
     else
+      
       @dx = Dynarex.new @filepath
+      
     end
   end
 
@@ -129,7 +149,7 @@ class RemindersTxt
  
     # hall 2 friday at 11am
     # some important day 24th Mar
-    get /(.*)\s+(\d+[^\*]+)(\*)?/ do |title, raw_date, annualar|
+    get /([^\d]+)\s+(\d+[^\*]+)(\*)?/ do |title, raw_date, annualar|
 
       d = Chronic.parse(raw_date)
       
@@ -181,16 +201,9 @@ class RemindersTxt
   
   private
   
-  def import_txt(filepath)
-
-    s = File.read filepath
-    @file_contents, @filename = s, File.basename(filepath)
-    
-    #Dir.chdir File.dirname(filename)
-    
-    @dxfilepath = filepath.sub(/.txt$/,'.xml')
-    
+  def import_txt(s)
 
+    @file_contents = s
     @params = {}
     expressions(@params)
     buffer = s.lines[2..-1]
@@ -214,10 +227,9 @@ class RemindersTxt
   #
   def refresh()
 
-
     reminders = @reminders.clone
     # if XML file doesn't exist, create it
-    
+
     if File.exists? @dxfilepath then
 
       @dx = Dynarex.new @dxfilepath
@@ -233,6 +245,10 @@ class RemindersTxt
                                                     reminder.date.to_date
         
       end
+      
+    else
+
+      save_dx()
             
     end
 
@@ -247,7 +263,7 @@ class RemindersTxt
     h2 = (Digest::MD5.new << @file_contents).to_s
 
     b = h1 != h2
-    
+
     if b or @reminders != reminders then
       
       save_dx()      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reminders_txt
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - James Robertson