weekly_planner 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c449a1287de09f9dc3a8eeac9bea5320af286845
-  data.tar.gz: 570e60554cb6693fc0e7fd85540f2bf6a2e8c671
+  metadata.gz: b57d541f09b80f9d9e95cf409605e7d50885af13
+  data.tar.gz: 3a62786aa9785aab297dee4fe0268ba9dd94d7a3
 SHA512:
-  metadata.gz: 7257b020f03bac607a410c6b990bca34d875b239feeaf92a24e67019840c915f260cb6c99c2435be1943577194ef796eb8123fbb2842d7f92d8b1735c24b0775
-  data.tar.gz: 537d4104dbe2edb2b7878cf63cb08fede7a7915ced7636a942be68eb987c9217524fb8be4bc62c992629ee1c57034afc5bfa71269d7ce8b192d828f184ec6f5a
+  metadata.gz: b2867a08a2201062a6912fec53090e29b40e15970bf3c07817edada0b9b97a044efa6793740270dee29b242c13ee6eab236d9e4b531571341d8921bf78f20b99
+  data.tar.gz: 828639a10f95f3b4aae7929c8378a4f8a1675354df0f1d3eaecf1ab5d6a196091ba8f9b808867a99c038bca06050f0be6d9ce13297468e774fc721cbb169f366

data/lib/weekly_planner.rb

@@ -7,6 +7,14 @@ require 'dynarex'
 require 'fileutils'
 
 
+class RecordX
+  
+  def last_modified
+    v = @last_modified
+    v.empty? ? nil : Date.parse(v)
+  end
+  
+end
 
 class WeeklyPlanner
   
@@ -19,10 +27,10 @@ class WeeklyPlanner
     fpath = File.join(path, filename)
     
     if File.exists?(fpath) then
-      
-      s = File.read(fpath)
-      @dx = import_to_dx(s)
-      archive()         
+
+      dx = import_to_dx(File.read(fpath))
+      @dx = refresh File.join(path, filename.sub(/\.txt$/,'.xml')), dx
+      sync_archive()         
       
       # purge any past dates
       while Date.parse(@dx.all.first.id, "%Y%m%d") != DateTime.now.to_date \
@@ -43,6 +51,8 @@ class WeeklyPlanner
                                              id: (date + i).strftime("%Y%m%d"))
         end
         
+        sync_archive @dx.all[-(len)..-1]
+        
       end
     
     else      
@@ -59,8 +69,9 @@ class WeeklyPlanner
     
     s = File.basename(filename) + "\n" + dx_to_s(@dx).lines[1..-1].join
     File.write File.join(@path, filename), s
+    @dx.save File.join(@path, filename.sub(/\.txt$/,'.xml'))
     
-    archive()
+    sync_archive()
     
   end
   
@@ -70,15 +81,15 @@ class WeeklyPlanner
 
   private
   
-  def archive()
+  def sync_archive(dxrows=@dx.all)
     
     # archive the weekly planner
     # e.g. weeklyplanner/2015/wp50.xml
-    d = Date.strptime(@dx.all.first.id, "%Y%m%d")
+    d = Date.strptime(dxrows.first.id, "%Y%m%d")
     archive_path = File.join(@path, d.year.to_s)
     FileUtils.mkdir_p archive_path
     
-    a = @dx.all.partition {|x| Date.strptime(x.id, "%Y%m%d").cweek == d.cweek }
+    a = dxrows.partition {|x| Date.strptime(x.id, "%Y%m%d").cweek == d.cweek }
 
     a.each do |rows|
       
@@ -94,7 +105,20 @@ class WeeklyPlanner
           record = dx.find_by_id row.id
           
           if record then
-            record.x = row.x unless record.x == row.x
+            
+            if record.x != row.x then
+              
+              if record.last_modified.nil? then
+                record.x = row.x
+              elsif row.last_modified.nil?
+                row.x = record.x
+              elsif row.last_modified > record.last_modified
+                record.x = row.x
+              else
+                row.x = record.x
+              end
+            end
+            
           else
             dx.create row
           end
@@ -184,5 +208,17 @@ class WeeklyPlanner
 
     return dx
   end
+  
+  def refresh(dxfilepath, latest_dx)
+
+    dx = Dynarex.new File.read(dxfilepath)
+    
+    dx.all.each.with_index do |row, i|      
+      row.x = latest_dx.all[i].x if row.x != latest_dx.all[i].x
+    end
+    
+    dx
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weekly_planner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   z7gNRJqGU+m6WOC+EaEcNkm4WwRqy2Il3J8DydaFl+h20aqjFe1k7KgLU8qy8jyU
   FlTqE0DQzwY5Dg==
   -----END CERTIFICATE-----
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex