weekly_planner 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc9be272018ca4c1ed5f7acf006c877c1dbf9c4
-  data.tar.gz: e5805310a96ba8611a520bed7ca8cf20014b13ac
+  metadata.gz: c449a1287de09f9dc3a8eeac9bea5320af286845
+  data.tar.gz: 570e60554cb6693fc0e7fd85540f2bf6a2e8c671
 SHA512:
-  metadata.gz: abafb6f96d7d4f0f927cb82a9f1324e925fbc61b9e41da49083e3b578b31acee67a5c7a464544d4378f51bf06e703b5455b88c3f66ffbca81393b04fa6abaf02
-  data.tar.gz: b1590914a4e1d687bddfeb94d8e1f5abfc7ef0162dab1745de1d9b91765dcfb37eefa316b5ff1372b0282a0a22b23d9a0a94fc44d4ffa56234572310d7529fa0
+  metadata.gz: 7257b020f03bac607a410c6b990bca34d875b239feeaf92a24e67019840c915f260cb6c99c2435be1943577194ef796eb8123fbb2842d7f92d8b1735c24b0775
+  data.tar.gz: 537d4104dbe2edb2b7878cf63cb08fede7a7915ced7636a942be68eb987c9217524fb8be4bc62c992629ee1c57034afc5bfa71269d7ce8b192d828f184ec6f5a

data/lib/weekly_planner.rb

@@ -7,6 +7,7 @@ require 'dynarex'
 require 'fileutils'
 
 
+
 class WeeklyPlanner
   
   attr_reader :to_s
@@ -16,8 +17,37 @@ class WeeklyPlanner
     @filename, @path = filename, path
     
     fpath = File.join(path, filename)
-    @s = File.exists?(fpath) ? File.read(fpath) :  create()    
-    @dx = create_dx(@s)
+    
+    if File.exists?(fpath) then
+      
+      s = File.read(fpath)
+      @dx = import_to_dx(s)
+      archive()         
+      
+      # purge any past dates
+      while Date.parse(@dx.all.first.id, "%Y%m%d") != DateTime.now.to_date \
+                                                      and @dx.all.length > 0 do
+        @dx.all.first.delete
+        
+      end
+      
+      # new days to add?
+      len = 7 - @dx.all.length
+      
+      if len > 0 then
+        
+        date = Date.strptime(@dx.all.last.id, "%Y%m%d") + 1
+        
+        len.times.with_index do |row, i|
+          @dx.create({x: (date + i).strftime("# %d-%b-%Y\n\n")}, \
+                                             id: (date + i).strftime("%Y%m%d"))
+        end
+        
+      end
+    
+    else      
+      @dx = new_dx
+    end
     
   end
 
@@ -27,9 +57,21 @@ class WeeklyPlanner
   
   def save(filename=@filename)
     
-    s = File.basename(filename) + "\n" + @s.lines[1..-1].join
+    s = File.basename(filename) + "\n" + dx_to_s(@dx).lines[1..-1].join
     File.write File.join(@path, filename), s
     
+    archive()
+    
+  end
+  
+  def to_s()
+    dx_to_s @dx
+  end
+
+  private
+  
+  def archive()
+    
     # archive the weekly planner
     # e.g. weeklyplanner/2015/wp50.xml
     d = Date.strptime(@dx.all.first.id, "%Y%m%d")
@@ -58,6 +100,7 @@ class WeeklyPlanner
           end
         end
         
+        dx.sort_by! {|x| x.attributes[:id].to_i}
         dx.save filepath
         
       else
@@ -68,36 +111,10 @@ class WeeklyPlanner
          
       end
             
-    end
-    
-  end
-  
-  def to_s()
-    @s
+    end    
   end
-
-  private
   
-  def create()
-    
-    d = DateTime.now
-
-    def ordinal(n)
-      n.to_s + ( (10...20).include?(n) ? 'th' : \
-                      %w{ th st nd rd th th th th th th }[n % 10] )
-    end
-
-    a = []
-    a <<  "%s, %s %s" % [Date::DAYNAMES[d.wday], ordinal(d.day), 
-                                                Date::ABBR_MONTHNAMES[d.month]]
-    a += (d+1).upto(d+6).map {|date|  Date::ABBR_DAYNAMES[date.wday] }
-
-    a2 = a.map {|x| "%s\n%s" % [x, '-' * x.length]}
-    title = File.basename(@filename)
-    s = title + "\n" + "=" * title.length + "\n\n%s\n\n" % [a2.join("\n\n")]
-  end
-  
-  def create_dx(s)
+  def import_to_dx(s)
     
     rows = s.split(/.*(?=^[\w, ]+\n\-+)/)
 
@@ -123,6 +140,49 @@ class WeeklyPlanner
     
   end
   
-  def parse()
+  def dx_to_s(dx)
+
+    def format_row(heading, content)
+      content.prepend "\n\n" unless content.empty?
+      "%s\n%s%s" % [heading, '-' * heading.length, content]
+    end
+
+    def ordinal(n)
+      n.to_s + ( (10...20).include?(n) ? 'th' : \
+                      %w{ th st nd rd th th th th th th }[n % 10] )
+    end
+
+    row1 = dx.all.first
+    d = Date.strptime(row1.id, "%Y%m%d")
+    heading =  "%s, %s %s" % [Date::DAYNAMES[d.wday], ordinal(d.day), 
+                                                Date::ABBR_MONTHNAMES[d.month]]
+    rows = [format_row(heading, row1.x.lines[1..-1].join.strip)]
+
+    rows += dx.all[1..-1].map do |row|
+      date = Date.strptime(row.id, "%Y%m%d")    
+      dayname = Date::ABBR_DAYNAMES[date.wday]
+      format_row dayname, row.x.lines[1..-1].join.strip
+    end
+
+    title = File.basename(@filename)
+    title + "\n" + "=" * title.length + "\n\n%s\n\n" % [rows.join("\n\n")]
+
   end
+  
+  def new_dx()
+    
+    dx = Dynarex.new 'sections[title]/section(x)'
+
+    d = DateTime.now
+    dx.title = "Weekly Planner (%s)" % (d).strftime("%d-%b-%Y")
+
+    (d).upto(d+6) do |date|  
+      
+      dx.create({x: date.strftime("# %d-%b-%Y\n\n")}, \
+                                                   id: date.strftime("%Y%m%d"))
+    end
+
+    return dx
+  end
+
 end

metadata

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