Merge pull request #23 from github/capitalized-completed

Support capitalized completed items

Author: mtodd

app/assets/javascripts/task_lists.coffee

@@ -105,7 +105,8 @@ complete   = "[x]"
 escapePattern = (str) ->
   str.
     replace(/([\[\]])/g, "\\$1"). # escape square brackets
-    replace(/\s/, "\\s")          # match all white space
+    replace(/\s/, "\\s").         # match all white space
+    replace("x", "[xX]")          # match all cases
 
 incompletePattern = ///
   #{escapePattern(incomplete)}

lib/task_list.rb

@@ -24,9 +24,9 @@ def summary
   end
 
   class Item < Struct.new(:checkbox_text, :source)
-    Complete = "[x]".freeze # see TaskListFilter
+    Complete = /\[[xX]\]/.freeze # see TaskList::Filter
     def complete?
-      checkbox_text == Complete
+      checkbox_text =~ Complete
     end
   end
 end

lib/task_list/filter.rb

@@ -35,7 +35,7 @@ class Filter < HTML::Pipeline::Filter
     Complete   = "[x]".freeze
 
     IncompletePattern = /\[[[:space:]]\]/.freeze # matches all whitespace
-    CompletePattern   = Regexp.escape(Complete).freeze
+    CompletePattern   = /\[[xX]\]/.freeze        # matches any capitalization
 
     # Pattern used to identify all task list items.
     # Useful when you need iterate over all items.

test/functional/test_task_lists_behavior.html

@@ -74,10 +74,26 @@
           <input type="checkbox" class="task-list-item-checkbox" disabled />
           I'm a task list item
         </li>
+        <li class="task-list-item">
+          <input type="checkbox" class="task-list-item-checkbox" disabled />
+          with non-breaking space
+        </li>
+        <li class="task-list-item">
+          <input type="checkbox" class="task-list-item-checkbox" disabled checked />
+          completed, lower
+        </li>
+        <li class="task-list-item">
+          <input type="checkbox" class="task-list-item-checkbox" disabled checked />
+          completed capitalized
+        </li>
       </ul>
     </div>
     <form action="/update" method="POST" data-remote data-type="json">
-      <textarea name="comment[body]" class="js-task-list-field">- [ ] I'm a task list item</textarea>
+      <textarea name="comment[body]" class="js-task-list-field" cols="40" rows="10">
+- [ ] I'm a task list item
+- [ ] with non-breaking space
+- [x] completed, lower
+- [X] completed capitalized</textarea>
     </form>
   </div>
 

test/task_list/filter_test.rb

@@ -125,6 +125,14 @@ def test_non_breaking_space_between_brackets_in_paras
     assert_equal 3, filter(text)[:output].css(@item_selector).size
   end
 
+  def test_capital_X
+    text = <<-md
+- [x] lower case
+- [X] capital
+    md
+    assert_equal 2, filter(text)[:output].css("[checked]").size
+  end
+
   protected
 
   def filter(input, context = @context, result = nil)