deckar01-task_list 2.3.4 → 3.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a298b08198908753ccb6e7d75d867daf8d12c596586bfbc45ab54baf8cff1e3f
-  data.tar.gz: c1e7f45c0f827b697813cd5c45d3b3dd9d8d9063e8a219a7cc2292affb25a21c
+  metadata.gz: '058afd74f87d80538ead4fff4993788d7f71b1152112edd07115e0554029050c'
+  data.tar.gz: 12daa5aca83f2a05ca08f6937b5f7c438ac7a93e6acce53346189fcf25c6814e
 SHA512:
-  metadata.gz: fc40c8f60bb4f1bd6d61919d7252de08f007bd64a2cb6318c420c3c9893c332e84cbcfb77e6215166ff3e5de0cede45fd9941512093aa5366895b515f3e1565b
-  data.tar.gz: 1cafaea6e577823575588d5636fc83e607877584a859981c4ed63fcf6bc5e214920ada3d8d92252c7b264bc9184f96b7b5e422cae6208b482081396229d6a3bb
+  metadata.gz: 7578ca24199c41c957baab771a76f2f7d605bf9d128ff461fffa618700aca615d29c5128b4ffb2b40b251fc7bbf5ed19ec49dd9b44a87b654dd6a15fc78f433d
+  data.tar.gz: bc47cc0071775b370fc3a26e232d6121c4aff312579c9879c428437d1af8b46d14dfdb4bd9e22378d9cbcb363bd513e72c21590bb545e0f5c12af588de1131e6

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "deckar01-task_list",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "Markdown TaskList components",
   "homepage": "https://gitlab.com/deckar01/task_list",
   "devDependencies": {

data/lib/task_list/filter.rb

@@ -37,35 +37,20 @@ class TaskList
     IncompletePattern = /\[[[:space:]]\]/.freeze # matches all whitespace
     CompletePattern   = /\[[xX]\]/.freeze        # matches any capitalization
 
+    # All valid checkbox patterns.
+    # Useful for overriding ItemPattern wih custom formats.
+    CheckboxPatterns  = /#{CompletePattern}|#{IncompletePattern}/
+
     # Pattern used to identify all task list items.
     # Useful when you need iterate over all items.
     ItemPattern = /
-      \A
+      ^
       (?:\s*[-+*]|(?:\d+\.))? # optional list prefix
       \s*                     # optional whitespace prefix
-      (                       # checkbox
-        #{CompletePattern}|
-        #{IncompletePattern}
-      )
+      (#{CheckboxPatterns})   # checkbox
       (?=\s)                  # followed by whitespace
     /x
 
-    ListItemSelector = ".//li[nokogiri:task_list_item(.)]".freeze
-
-    class XPathSelectorFunction
-      def self.task_list_item(nodes)
-        nodes.select { |li| Filter::item_container(li).inner_html =~ ItemPattern }
-      end
-    end
-
-    # Selects first P tag of an LI, if present
-    ItemParaSelector = "./p[1]".freeze
-
-    # The the node directly containing the checkbox text
-    def self.item_container(li)
-      li.xpath(ItemParaSelector)[0] || li
-    end
-
     # List of `TaskList::Item` objects that were recognized in the document.
     # This is available in the result hash as `:task_list_items`.
     #
@@ -74,18 +59,24 @@ class TaskList
       result[:task_list_items] ||= []
     end
 
+    # Computes attributes for the item input.
+    #
+    # Returns an String of HTML attributes.
+    def checkbox_attributes(item)
+      'checked="checked"' if item.complete?
+    end
+
     # 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"
-        #{'checked="checked"' if item.complete?}
+        #{checkbox_attributes(item)}
         disabled="disabled"
       />)
     end
 
-    # Deprecated: Removed in v3
     # Public: Marks up the task list item checkbox with metadata and behavior.
     #
     # NOTE: produces a string that, when assigned to a Node's `inner_html`,
@@ -101,16 +92,6 @@ class TaskList
         item.source.sub(ItemPattern, render_item_checkbox(item)), 'utf-8'
     end
 
-    # Deprecated: Removed in v3
-    # Public: Select all task list items within `container`.
-    #
-    # Returns an Array of Nokogiri::XML::Element objects for ordered and
-    # unordered lists. The container can either be the entire document (as
-    # returned by `#doc`) or an Element object.
-    def list_items(container)
-      container.xpath(ListItemSelector, XPathSelectorFunction)
-    end
-
     # Filters the source for task list items.
     #
     # Each item is wrapped in HTML to identify, style, and layer
@@ -120,16 +101,15 @@ class TaskList
     #
     # Returns nothing.
     def filter!
-      list_items(doc).reverse.each do |li|
-        outer = self.class.item_container(li)
-        inner = outer.inner_html
-        checkbox = inner.match(ItemPattern).captures[0]
-        item = TaskList::Item.new(checkbox, inner)
-        # prepend because we're iterating in reverse
+      doc.xpath(".//li").reverse.each do |li|
+        container = li.xpath("./p[1]")[0] || li
+        next if not container.inner_html =~ ItemPattern
+
+        item = TaskList::Item.new($1, container.inner_html)
         task_list_items.unshift item
+        container.inner_html = render_task_list_item(item)
         li.parent.add_class('task-list')
         li.add_class('task-list-item')
-        outer.inner_html = render_task_list_item(item)
       end
     end
 
@@ -137,15 +117,5 @@ class TaskList
       filter!
       doc
     end
-
-    # Deprecated: Removed in v3
-    # Private: adds a CSS class name to a node, respecting existing class
-    # names.
-    def add_css_class(node, *new_class_names)
-      class_names = (node['class'] || '').split(' ')
-      return if new_class_names.all? { |klass| class_names.include?(klass) }
-      class_names.concat(new_class_names)
-      node['class'] = class_names.uniq.join(' ')
-    end
   end
 end

data/lib/task_list/version.rb

@@ -1,3 +1,3 @@
 class TaskList
-  VERSION = [2, 3, 4].join('.')
+  VERSION = [3, 0, 'alpha1'].join('.')
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckar01-task_list",
-  "version": "2.3.4",
+  "version": "3.0.0",
   "description": "Markdown TaskList components",
   "main": "dist/task_list.js",
   "directories": {

data/task_list.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activesupport", "~> 4.0" if RUBY_VERSION < '2.2.2'
   gem.add_dependency "nokogiri", "~> 1.6.0" if RUBY_VERSION < '2.1.0'
-  gem.add_dependency "html-pipeline", "~> 2.0"
+  gem.add_dependency "html-pipeline"
 
-  gem.add_development_dependency "commonmarker", "~> 0.23"
+  gem.add_development_dependency "commonmarker"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "json"

data/test/task_list/filter_test.rb

@@ -159,15 +159,6 @@ class TaskList::FilterTest < Minitest::Test
     assert_equal 2, filter(text)[:output].css("[checked]").size
   end
 
-  def test_dangling_checkbox
-    text = <<-md
-- one
-  - foo
-    [ ] bar
-    md
-    assert_equal 0, filter(text)[:output].css(@item_selector).size
-  end
-
   protected
 
   def filter(input, context = @context, result = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deckar01-task_list
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 3.0.alpha1
 platform: ruby
 authors:
 - Jared Deckard
@@ -9,36 +9,36 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.18
 signing_key: