todo-txt 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6194a6c093149543776903fec449488ff35e12
-  data.tar.gz: 1ff563eca42c38f95a55eda4732f4c43005a2079
+  metadata.gz: c7d702d4739e83cb71e7663bf0feb86ab11b8d81
+  data.tar.gz: 107da665b03b10d335e16b582a31cfdee9ce6569
 SHA512:
-  metadata.gz: 0d614c4914dfc5e7e84addd6185f79c52270a4196003be1bef3f88452063e4d549062855d3229b92413dfe1f9b0f896ff6fe12cc7b64786767300aa9ff430a56
-  data.tar.gz: 0b8307a2946e632a5a68fb1b03b1df5d2fcbf56317087ebac52e7d3317b742ba8e9a5f7e31de9ff8723683e940a50d2d11bd39e58a4b806265a05180f6fa123e
+  metadata.gz: b1d76f95cee15a70800ecb80c96927ec5d9978e264f415c95170069b73d5388ba7b49ec6dbfe8d53252e9b7166496a5ff5a7b0e2f6c5223048ede4b757a13b22
+  data.tar.gz: 914f9766d4c6932d37f70f0be79e526a4487a70ffad95c377b6e461744c9d3fe7b0147f1633a9de8f6658f00ab1a7561e8d52fcc72b79e1531c859b6cb801fe4

data/lib/todo/syntax.rb

@@ -13,7 +13,9 @@ module Todo
     # The regex used to match creation date.
     CREATED_ON_PATTERN = /(?:^|-\d{2}\s|\)\s)(\d{4}-\d{2}-\d{2})\s/
 
-    # The regex used to match completion.
+    COMPLETED_FLAG_PATTERN = /^x\s+/
+
+    # The regex used to match completion date.
     COMPLETED_ON_PATTERN = /^x\s+(\d{4}-\d{2}-\d{2})\s+/
 
     # The regex used to match due date.
@@ -30,6 +32,7 @@ module Todo
     # @return [String] the text content of the item
     def extract_item_text(line)
       line.gsub(COMPLETED_ON_PATTERN, '')
+          .gsub(COMPLETED_FLAG_PATTERN, '')
           .gsub(PRIORITY_PATTERN, '')
           .gsub(CREATED_ON_PATTERN, '')
           .gsub(CONTEXTS_PATTERN, '')

data/lib/todo/task.rb

@@ -260,25 +260,6 @@ module Todo
       done? ? undo! : do!
     end
 
-    # Returns this task as a string.
-    #
-    # Example:
-    #
-    #   task = Todo::Task.new("(A) 2012-12-08 Task")
-    #   task.to_s
-    #   # => "(A) 2012-12-08 Task"
-    def to_s
-      [
-        done? && "x #{completed_on}",
-        priority && "(#{priority})",
-        created_on.to_s,
-        text,
-        contexts.join(' '),
-        projects.join(' '),
-        tags.map { |tag,val| "#{tag}:#{val}" }.join(' ')
-      ].grep(String).join(' ').strip
-    end
-
     # Compares the priorities of two tasks.
     #
     # Example:
@@ -305,5 +286,54 @@ module Todo
         other.priority <=> priority
       end
     end
+
+    # Returns this task as a string.
+    #
+    # Example:
+    #
+    #   task = Todo::Task.new("(A) 2012-12-08 Task")
+    #   task.to_s
+    #   # => "(A) 2012-12-08 Task"
+    def to_s
+      [
+        print_done_marker,
+        print_priority,
+        created_on.to_s,
+        text,
+        print_contexts,
+        print_projects,
+        print_tags
+      ].reject { |item| !item || item.nil? || item.empty? }.join(' ')
+    end
+
+    private
+
+    def print_done_marker
+      return unless done?
+
+      if completed_on.nil?
+        COMPLETED_FLAG
+      else
+        "#{COMPLETED_FLAG} #{completed_on}"
+      end
+    end
+
+    def print_priority
+      return unless priority
+
+      "(#{priority})"
+    end
+
+    def print_contexts
+      contexts.join(' ')
+    end
+
+    def print_projects
+      projects.join(' ')
+    end
+
+    def print_tags
+      tags.map { |tag, val| "#{tag}:#{val}" }.join(' ')
+    end
   end
 end

data/spec/todo-txt/syntax_spec.rb

@@ -153,5 +153,9 @@ describe Todo::Syntax do
     specify 'completed task with projects and context' do
       expect(extract_item_text('x 2016-03-30 2016-03-29 something to do +experiment @work')).to eq('something to do')
     end
+
+    specify 'completed task without completion date' do
+      expect(extract_item_text('x completed task')).to eq('completed task')
+    end
   end
 end

data/spec/todo-txt/task_spec.rb

@@ -302,6 +302,11 @@ describe Todo::Task do
         expect(task.done?).to be true
       end
 
+      it '#to_s should round-trip to identical #raw output' do
+        task = Todo::Task.new('x This is done!')
+        expect(task.to_s).to eq(task.raw)
+      end
+
       after do
         Todo.options.reset
       end

data/todo-txt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'todo-txt'
-  s.version = '0.10'
+  s.version = '0.11'
   s.authors = ['Sam Rose']
   s.email = 'samwho@lbak.co.uk'
   s.summary = 'A client library for parsing todo.txt files.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-txt
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Sam Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies: []
 description: Allows for simple parsing of todo.txt files, as per Gina Trapani's todo.txt
   project.