todo.txt 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f380f0bbf643c036cf4ef84663069874fb4579
-  data.tar.gz: 3d2b2e24ce45db1c1b8903f568df1d80da57f8b3
+  metadata.gz: d5b63b055ac551315b984024f1ef75a955c0df45
+  data.tar.gz: 63fd44c8d49144d1938333b42d53d7a2e8d03fed
 SHA512:
-  metadata.gz: 5daa5c8e2d9f422b33fd5bd8383e36420b10c57f9bd87627071bb2e1e172485fe4f350d604d1f5e1642213affd7153dfac7d5d1329416f9a6f097b42faf01f98
-  data.tar.gz: 14a3cc5e56495dc4d4affcf5ce7fc8e20b793979aef127faad3a827ed444f0d5442416c53be704220f54e1d75bd8a707dd401439e2cbd7c0b73d0e5fd0650829
+  metadata.gz: f83e57cd0ac6eb857a7dd8ee12e87852fcc4aac8d86604effedc4fb933cd5c7579537fa7d67aa6d59d6ae1dd664843e53e5ddb99ac8ecc54dc2fcadb72e11029
+  data.tar.gz: e6a40b432d91e781df79340aab7be09e1f1e66623522de650a1bbea3dd61b4d10974d47fa62705c5b6d0a6798b905ee7b226aebac077dc9205cd908afd897f1f

data/README.md

@@ -40,7 +40,8 @@ $ todo toggle foo                  # should assume ./TODO.txt but i can't figure
 
 # Filtering items
 
-$ todo list --since 2015-12-01 --before 2015-11-01 # by done date
+$ todo list --since 2015-12-01                     # by done date
+$ todo list --after 2015-11-01 --before 2015-12-01 # by done date
 $ todo list --status pending                       # by status
 $ todo list --status done                          # by status
 $ todo list --project foo                          # by project

data/lib/todo/cli/archive.rb

@@ -14,9 +14,9 @@ module Todo
       end
 
       def run
-        items = list.select(status: :done, before: before).items
-        archive.write(format(items))
-        io.write(format(list.items - items))
+        selected = list.select(status: :done, before: before)
+        archive.write(format(selected))
+        io.write(format(list.reject { |item| selected.items.include?(item) }))
       end
 
       private

data/lib/todo/cli/list.rb

@@ -34,7 +34,7 @@ module Todo
       end
 
       def run
-        out.write(format(list.items, format: opts[:format] || :short))
+        out.write(format(list, format: opts[:format] || :short))
       end
 
       private

data/lib/todo/cli/push.rb

@@ -21,7 +21,7 @@ module Todo
       }
 
       def run
-        lines = format(list.items, format: [:text, :tags, :id])
+        lines = format(list, format: [:text, :tags, :id])
         src.write(lines)
         io.write(lines)
       end

data/lib/todo/cli/toggle.rb

@@ -16,7 +16,7 @@ module Todo
       def run
         list = Data::List.parse(io.read)
         list.toggle(data)
-        io.write(format(list.items))
+        io.write(format(list))
       end
 
       private

data/lib/todo/data/item.rb

@@ -14,6 +14,10 @@ module Todo
         define_method(name) { data[name] }
       end
 
+      def item?
+        !!status
+      end
+
       def done?
         status == :done
       end

data/lib/todo/format.rb

@@ -3,7 +3,7 @@ require 'todo/helpers/hash/format'
 require 'todo/helpers/object/presence'
 
 module Todo
-  class Format < Struct.new(:items, :opts)
+  class Format < Struct.new(:list, :opts)
     FORMATS = {
       full:  [:status, :text, :tags, :id],
       short: [:status, :done_date, :text]
@@ -12,17 +12,19 @@ module Todo
     include Helpers::Hash::Format, Helpers::Object::Presence
 
     def apply
-      items.map { |item| format(item) }
+      list.items.map { |item| format(item) }
     end
 
     private
 
       def format(item)
-        cols.map { |col| format_col(col, item.send(col)) }.compact.join(' ')
+        cols.map { |col| format_col(col, item) }.compact.join(' ')
       end
 
-      def format_col(col, value)
-        send(:"format_#{col}", value) if present?(value)
+      def format_col(col, item)
+        value = item.send(col)
+        value = list.next_id if item.item? && col == :id && value.nil?
+        send(:"format_#{col}", value) if value
       end
 
       def format_status(status)

data/lib/todo/support/date.rb

@@ -21,7 +21,7 @@ module Todo
       end
 
       def format(str, opts = {})
-        apply(str).strftime(opts[:format] || FORMAT)
+        apply(str.downcase).strftime(opts[:format] || FORMAT)
       end
 
       private

data/lib/todo/version.rb

@@ -1,3 +1,3 @@
 module Todo
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/todo/format_spec.rb

@@ -2,8 +2,8 @@ require 'todo/format'
 
 describe Todo::Format do
   let(:lines) { ['- foo [1]', 'x bar done:2015-12-01 [2]'] }
-  let(:items) { Todo::Data::List.parse(lines).items }
-  subject     { described_class.new(items, format: format) }
+  let(:list)  { Todo::Data::List.parse(lines) }
+  subject     { described_class.new(list, format: format) }
 
   describe 'default columns' do
     let(:format) {}
@@ -19,4 +19,10 @@ describe Todo::Format do
     let(:format) { :short }
     it { expect(subject.apply).to eq(['- foo', 'x 2015-12-01 bar']) }
   end
+
+  describe 'adds missing ids' do
+    let(:format) { :full }
+    let(:lines) { ['- foo', 'x bar done:2015-12-01'] }
+    it { expect(subject.apply).to eq(['- foo [1]', 'x bar done:2015-12-01 [2]']) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: todo.txt
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Sven Fuchs