all_todo 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4a51e17ba0e8cf577d2a4a6284d2460b0bea29
-  data.tar.gz: f1dd42b11c02e74ecd70008cbc929c998c90a23d
+  metadata.gz: 6ae9fa558817270e13da79097c64869fdf0e8ce9
+  data.tar.gz: 1047951a506bc904e0c47b9c3f2404cf13e54895
 SHA512:
-  metadata.gz: a2918f0da7f1f273bcade231fef4a204e870384190c289d83f0a127a5de6f7678b41c29cfde014e5511ba547795e14d23ec988e1e7d2c26f8780db5a4f400e8d
-  data.tar.gz: 29575f7ebf7b2eb8be7871a9679e4e2e7301e86f8ba7eefb95c41a5c58da9fc82f7adc116f82a330ef85db81e3c0cd92eb25c2d95e315ffe6f8c5a2162ab5c87
+  metadata.gz: 54f9f728559e75e1067426e53917e0f0fa38baa6e6c949034cfffa060b573897275da6f240a3af9b560c02460f3d200451d36139ef8cba52c6b3ae324eca8c2b
+  data.tar.gz: e0f65ef5b8cfe3f32388f073d7cbaf7638b910f010a3e3ef90276edd88a20ff895bb2fdcbf0572fa873cd669ad3320eb3cb83f07239639af3688488b6d66cb27

data/lib/all_todo.rb

@@ -3,71 +3,22 @@
 # file: all_todo.rb
 
 
-require 'pxrowx'
-require 'polyrex-headings'
+require 'px_todo'
 
 
-class AllTodo
+class AllTodo < PxTodo
 
   def initialize(raw_s)
     
-    s, _ = RXFHelper.read(raw_s)
-
-    # remove the file heading     
-    lines = s.lines
-    lines.shift 3
-    
-    @fields = %w( title heading when duration priority status note tags)
-    declar = "<?ph schema='items[title]/todo[#{@fields.join(',')}]'" + 
-        " format_masks[0]='[!title]'?>"
-
-    # add a marker to identify the headings after parsing the records
-    
-    s2 = lines.join.gsub(/^#+\s+/,'\0:')
-    
-    @px = PolyrexHeadings.new(declar + "\n" + s2).to_polyrex
-    
-    @px.each_recursive do |x, parent, level|
-
+    super(raw_s) do |x|
+      
       todo = x.title
 
       # is the to-do item selected for action today?
-      today_item = todo.slice!(/^\*\s+/)
-      
+      today_item = todo.slice!(/^\*\s+/)      
       x.when = 'today' if today_item
-
-      raw_status = todo.slice!(/\[.*\]\s+/)
-      x.title = todo
-
-      status  = raw_status =~ /\[\s*x\s*\]/ ? 'done' : ''      
-
-      x.status = status
-            
-      # is there a note?
       
-      note = todo[/^note:\s+(.*)/i,1]
-      
-      if note and parent.is_a? PolyrexObjects::Todo then
-        
-        parent.note = note
-        x.delete
-          
-      end
-      
-      # is it a heading?
-      
-      heading = todo[/^:(.*)/,1]
-      
-      if heading then
-
-        # does the heading contain tags?
-        
-        raw_tags = heading.slice!(/\s+#.*$/)
-        x.tags = raw_tags[/#\s+(.*)/,1] if raw_tags
-        x.heading = heading
-        x.title = ''        
-        
-      end
+      x.title = todo
       
     end        
 
@@ -99,9 +50,6 @@ class AllTodo
 
   end
 
-  def to_px
-    @px
-  end
   
   def to_s()
     
@@ -180,11 +128,9 @@ class AllTodo
       [a, todo_lines.join("\n")]
     end
 
-    lines = []
-
-    raw_rows.group_by(&:first).each do |heading, items|
-      lines << heading.join("\n") << ''
-      lines << items.map{|x| x[1..-1]}.join("\n") << ''
+    lines = raw_rows.group_by(&:first).inject([]) do |r, pair|
+      heading, items = pair
+      r << heading.join("\n") << '' << items.map{|x| x[1..-1]}.join("\n") << ''
     end
 
     filename = 'todo_daily.txt'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_todo
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -34,7 +34,7 @@ cert_chain:
 date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pxrowx
+  name: all_todo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -42,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,27 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: polyrex-headings
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.0
 description: 
 email: james@r0bertson.co.uk
 executables: []