todo-txt 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d702d4739e83cb71e7663bf0feb86ab11b8d81
-  data.tar.gz: 107da665b03b10d335e16b582a31cfdee9ce6569
+  metadata.gz: d7a77690c0596d1dc7ab740024ced36e746b8371
+  data.tar.gz: ace4ecb0e56427567374642cae500ac5f8914373
 SHA512:
-  metadata.gz: b1d76f95cee15a70800ecb80c96927ec5d9978e264f415c95170069b73d5388ba7b49ec6dbfe8d53252e9b7166496a5ff5a7b0e2f6c5223048ede4b757a13b22
-  data.tar.gz: 914f9766d4c6932d37f70f0be79e526a4487a70ffad95c377b6e461744c9d3fe7b0147f1633a9de8f6658f00ab1a7561e8d52fcc72b79e1531c859b6cb801fe4
+  metadata.gz: ef210708fbf399f7e88ec46eb62baaaebb22420d0ed51db02470a9b3cdd3121dc6abb8c827dba187c16024efa9cfb8f0a3320943427f62baa00e4034d6d5ec87
+  data.tar.gz: c69513629db8e4b058c4020c42e71d34da2e1c4813c6f9ba5e74e051dc8a15a5a17e97f64894ba274721073e50afe4d90832a66e5525384eb878bce5af4a8153

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - rbx-2
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - jruby-9000
-  - jruby-head
-  - ruby-head
 before_install: gem install bundler -v 1.10.6
 script: bundle exec rspec

data/lib/todo/syntax.rb

@@ -22,7 +22,7 @@ module Todo
     DUE_ON_PATTERN = /(?:due:)(\d{4}-\d{2}-\d{2})(?:\s+|$)/i
 
     # The regex used to match generic tags.
-    TAGS_PATTERN = /([a-z]+):([a-z0-9_-]+)/i
+    TAGS_PATTERN = /([a-z]+):([A-Za-z0-9_-]+)/i
 
     # Extracts the readable text content of a task line, stripping out all the
     # discrete pieces of metadata (priority, dates, completion flag, projects,
@@ -38,6 +38,7 @@ module Todo
           .gsub(CONTEXTS_PATTERN, '')
           .gsub(PROJECTS_PATTERN, '')
           .gsub(DUE_ON_PATTERN, '')
+          .gsub(TAGS_PATTERN, '')
           .strip
     end
 

data/lib/todo/task.rb

@@ -12,7 +12,9 @@ module Todo
     include Todo::Logger
     include Todo::Syntax
 
-    def initialize(line)
+    # @param line [String]
+    # @param options [Todo::Options]
+    def initialize(line, options=Todo.options)
       @raw = line
       @priority = extract_priority(raw)
       @created_on = extract_created_on(raw)
@@ -20,7 +22,7 @@ module Todo
       @contexts ||= extract_contexts(raw)
       @projects ||= extract_projects(raw)
 
-      if Todo.options.require_completed_on
+      if options.require_completed_on
         @completed_on = extract_completed_date(raw)
         @is_completed = !@completed_on.nil?
       else

data/spec/todo-txt/syntax_spec.rb

@@ -135,6 +135,10 @@ describe Todo::Syntax do
     specify 'task with multiple tags' do
       expect(extract_tags('something to do hello:world and foo:bar')).to eq(:hello => 'world', :foo => 'bar')
     end
+
+    specify 'task with uppercase letters' do
+      expect(extract_tags('something to do TagKey:TagValue attrKey:attrValue')).to eq(:tagkey => 'TagValue', :attrkey => 'attrValue')
+    end
   end
 
   describe '#extract_item_text' do
@@ -146,8 +150,8 @@ describe Todo::Syntax do
       expect(extract_item_text('something to do')).to eq('something to do')
     end
 
-    specify 'task with date, priority, projects and context' do
-      expect(extract_item_text('(A) 2016-03-29 something to do +experiment @work')).to eq('something to do')
+    specify 'task with date, priority, projects, context and tags' do
+      expect(extract_item_text('(A) 2016-03-29 something to do tag:val +experiment @work')).to eq('something to do')
     end
 
     specify 'completed task with projects and context' do

data/spec/todo-txt/task_spec.rb

@@ -434,4 +434,28 @@ describe Todo::Task do
       task.orig
     end
   end
+
+  describe 'customizable options' do
+    before(:all) do
+      Todo.customize do |options|
+        options.require_completed_on = false
+      end
+    end
+
+    after(:all) do
+      Todo.options.reset
+    end
+
+    it 'should default to global options' do
+      task = Todo::Task.new('x this is an outstanding task')
+      expect(task.done?).to eq(true)
+    end
+
+    it 'accepts options instance' do
+      options = Todo::Options.new
+      options.require_completed_on = true
+      task = Todo::Task.new('x this is an outstanding task', options)
+      expect(task.done?).to eq(false)
+    end
+  end
 end

data/todo-txt.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'todo-txt'
-  s.version = '0.11'
+  s.version = '0.12'
   s.authors = ['Sam Rose']
   s.email = 'samwho@lbak.co.uk'
   s.summary = 'A client library for parsing todo.txt files.'
   s.homepage = 'http://github.com/samwho/todo-txt-gem'
   s.description = 'Allows for simple parsing of todo.txt files, as per Gina Trapani\'s todo.txt project.'
-  s.required_ruby_version = '>= 2.0'
-  s.license = 'GPL-2'
+  s.required_ruby_version = '>= 2.2'
+  s.license = 'GPL-2.0'
   s.files = `git ls-files`.split(/\n/)
 end

data/todo.txt

@@ -9,7 +9,7 @@ use << operation to move tasks between lists +api +feature
 create github issue with roadmap for 1.0 release +feature +api
 consider rewriting file write tests with mocking and stringio +refactor +build
 remove deprecated date and orig methods from task +api
-pass in options as an instance rather than make it always global +refactor +api
+x 2016-08-18 pass in options as an instance rather than make it always global +refactor +api
 save a backup of an existing todo file when the IO object is read in +feature
 x 2016-06-16 extract `due:` formatting into a more general syntax for adding tags +feature +refactor +api
 x rename lib path to match standard gem conventions +refactor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-txt
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Sam Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies: []
 description: Allows for simple parsing of todo.txt files, as per Gina Trapani's todo.txt
   project.
@@ -46,7 +46,7 @@ files:
 - todo.txt
 homepage: http://github.com/samwho/todo-txt-gem
 licenses:
-- GPL-2
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -64,8 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A client library for parsing todo.txt files.
 test_files: []
+has_rdoc: