Remove item index from Ruby side

Author: mtodd

lib/task_list.rb

@@ -23,7 +23,7 @@ def summary
     @summary ||= TaskList::Summary.new(record.task_list_items)
   end
 
-  class Item < Struct.new(:index, :checkbox_text, :source)
+  class Item < Struct.new(:checkbox_text, :source)
     Complete = "[x]".freeze # see TaskListFilter
     def complete?
       checkbox_text == Complete

lib/task_list/filter.rb

@@ -62,18 +62,6 @@ class Filter < HTML::Pipeline::Filter
     # Selects first P tag of an LI, if present
     ItemParaSelector = ".//p[1]".freeze
 
-    attr_accessor :index
-
-    def initialize(*)
-      @index = 0
-      super
-    end
-
-    # Private: increments and returns the next item index Integer.
-    def next_index
-      @index += 1
-    end
-
     # List of `TaskList::Item` objects that were recognized in the document.
     # This is available in the result hash as `:task_list_items`.
     #
@@ -82,13 +70,12 @@ def task_list_items
       result[:task_list_items] ||= []
     end
 
-    # Renders the item checkbox in a span including the item index and state.
+    # Renders the item checkbox in a span including the item state.
     #
     # Returns an HTML-safe String.
     def render_item_checkbox(item)
       %(<input type="checkbox"
         class="task-list-item-checkbox"
-        data-item-index="#{item.index}"
         #{'checked="checked"' if item.complete?}
         disabled="disabled"
       />)
@@ -137,7 +124,7 @@ def filter_list(node)
             [li, li.inner_html]
           end
         if match = (inner.chomp =~ ItemPattern && $1)
-          item = TaskList::Item.new(next_index, match, inner)
+          item = TaskList::Item.new(match, inner)
           task_list_items << item
 
           add_css_class(li, 'task-list-item')

test/task_list/filter_test.rb

@@ -51,11 +51,9 @@ def test_populates_result_with_task_list_items
     incomplete, complete = result[:task_list_items]
 
     assert incomplete
-    assert_equal 1, incomplete.index
     assert !incomplete.complete?
 
     assert complete
-    assert_equal 2, complete.index
     assert complete.complete?
   end
 

test/task_list/summary_test.rb

@@ -4,8 +4,8 @@
 
 class TaskList::SummaryTest < Test::Unit::TestCase
   def setup
-    @complete   = make_item 1, "[x]", "complete"
-    @incomplete = make_item 2, "[ ]", "incomplete"
+    @complete   = make_item "[x]", "complete"
+    @incomplete = make_item "[ ]", "incomplete"
     @items = [@complete, @incomplete]
     @summary = make_summary @items
   end
@@ -30,8 +30,8 @@ def test_incomplete_count
 
   protected
 
-  def make_item(index = 1, checkbox_text = "[ ]", source = "an item!")
-    TaskList::Item.new(index, checkbox_text, source)
+  def make_item(checkbox_text = "[ ]", source = "an item!")
+    TaskList::Item.new(checkbox_text, source)
   end
 
   def make_summary(items)

test/task_list_test.rb

@@ -16,12 +16,12 @@ def test_has_summary
   end
 
   def test_complete_item
-    item = TaskList::Item.new(1, "[x]", "complete")
+    item = TaskList::Item.new("[x]", "complete")
     assert item.complete?, "expected to be complete"
   end
 
   def test_incomplete_item
-    item = TaskList::Item.new(1, "[ ]", "incomplete")
+    item = TaskList::Item.new("[ ]", "incomplete")
     assert !item.complete?, "expected to be incomplete"
   end