monthly_planner 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4c824906739e5fe60be57015b323f02cf92987b
-  data.tar.gz: cd1fa7fc0e9339f05d1ca3dfddfd36e74db3cd34
+  metadata.gz: 580a1fea8fcf9d33782c3dd37d1bc511b8de8076
+  data.tar.gz: b7c207d482f9f2afd515fd3e0eac3e61d208b7f6
 SHA512:
-  metadata.gz: 74c1e5ac19935ed7521f7549e6ea4be0c137caef931e893bc098d50f3f6328aea964dc792685c65903b79697444a1068160ec5d462b59eb1c2529a38ac2a22e0
-  data.tar.gz: 6ab3909c86179ae7a8c584038e2efea871594f9c19515182c176892d5ba3f140e02251969cac48fc1e699f930d3ab7644ac5fcb71b2fb1c080112836bb187160
+  metadata.gz: 8eaf7dbf857eca23aad06f7967948db46504946f1e10902fa57665f8dfcd7752294b77aa05cc9105a20ae37f84c6364d3642cdf881937728694ef0db0c988c3f
+  data.tar.gz: 2db2bbfaa30344b5f8029d4d158e294d5a7c05591bc47588a99a9980ead84eac503b6a99bb8ea14590cc0325351c48b09432fc0c7adc1e842a4cef56144336c2

data/lib/monthly_planner.rb

@@ -4,13 +4,25 @@
 
 require 'date'
 require 'dynarex'
+require 'chronic'
 require 'fileutils'
+require 'fuzzy_match'
 
 
 # The MonthlyPlanner gem can:
 #
 #  * create a new monthly-planner.txt file
 #  * read an existing monthly-planner.txt file
+#  * archive and synchronise entries from the monthly-planner with the archive
+
+
+class RecordX
+  
+  def date
+    Chronic.parse(@date)
+  end
+  
+end
 
 class MonthlyPlanner
   
@@ -25,6 +37,7 @@ class MonthlyPlanner
     if File.exists?(fpath) then
 
       @dx = import_to_dx(File.read(fpath))    
+      sync_archive(@dx.all)
     else
       @dx = new_dx    
     end
@@ -49,13 +62,9 @@ class MonthlyPlanner
   private
   
   def dx_to_s(dx)
-
-    rows = dx.all.map do |x| 
-      %i(date time desc).map{|y| !x[y].empty? ? x[y] + ' ' : '' }.join
-    end
-    
+   
     title = File.basename(@filename)
-    title + "\n" + "=" * title.length + "\n\n%s\n\n" % [rows.join("\n")]
+    title + "\n" + "=" * title.length + "\n\n%s\n\n" % [dx.to_s(header: false)]
 
   end  
   
@@ -86,8 +95,7 @@ class MonthlyPlanner
   
   def new_dx()
     
-    dx = Dynarex.new 'month[title]/day(date, time, desc, uid)', 
-                      default_key: :uid
+    dx = Dynarex.new 'month[title]/day(date, time, desc)', default_key: :uid
 
     d = DateTime.now.to_date
     title = [d, d.next_month].map {|x| x.strftime("%b")}.join(' - ')
@@ -95,5 +103,59 @@ class MonthlyPlanner
 
     return dx
   end
+  
+  
+  def sync_archive(dxrows=@dx.all)  
+    
+    # group by month
+    a = dxrows.group_by {|x| x.date.strftime("%b").downcase}
+
+    # add the file to the archive.
+
+    a.each do |month, days|
+
+      d = days.first.date
+      
+      archive_path = File.join(@path, d.year.to_s, month)
+      FileUtils.mkdir_p archive_path
+      filepath = File.join archive_path, 'mp.xml'
+
+      if File.exists? filepath then
+
+        dx2 = Dynarex.new filepath
+
+        days.each do |day|
+
+          # determine if the entry already exists in the Dynarex doc
+
+          rows = dx2.to_s(header: false).lines.map(&:chomp)
+          fm = FuzzyMatch.new rows
+          found, score = fm.find_with_score %i(date time desc)\
+                                        .map {|y| day[y]}.join ' '      
+          if score < 0.7 then  
+            dx2.create(day)
+          else
+            i = rows.index found        
+            dx2.update(dx2.all[i].id, day)
+          end
+
+        end
+
+
+      else
+
+        # if the index.xml file doesn't exist just save them
+
+        dx2 = Dynarex.new dx.schema
+        dx2.title = "Monthly Planner #{month.capitalize}-#{d.year}"
+        dx2.import days
+
+      end
+
+      dx2.save filepath
+
+    end
+    
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monthly_planner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   La10JAgwh3I97hV0e0ftxKgM9wPTv/1NX1ejKg4fj4f68cTSVJZTNJFFM2ljPCK1
   94ClrbJHIurLOQ==
   -----END CERTIFICATE-----
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -42,7 +42,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.9
+        version: 1.7.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,47 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.9
+        version: 1.7.11
+- !ruby/object:Gem::Dependency
+  name: fuzzy_match
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 description: 
 email: james@r0bertson.co.uk
 executables: []