deckar01-task_list 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa88b4fa286bd28b155409f3fec9e902eb979f3b
-  data.tar.gz: 752b3e624982c591d2acbb476eb131ac914363dd
+  metadata.gz: fdfcf76a91d8eaab8ec42ad11c61cadf5563cd6b
+  data.tar.gz: 71f6596cbe4bd8edfd4362c693ae8f54f257c647
 SHA512:
-  metadata.gz: f464c95ab4f96fefd9001631ac7a49b79f554242875fb7642f9bf5692826e8504043ef32267c9e96dde3bb6f1e86c3e6324f887fb3992f8b75b476c186dc71e8
-  data.tar.gz: 3699906243780c404a938b1d0672d938d52b7db44027b32ca9625a224b794d512c32de9829060819c32897ade56cb73a404693958fca1f02934a33fa52685832
+  metadata.gz: cf328e7bc0d70b33a7124b15f4c0847b93a2eab368ff673872668b768276aa5b32cc65ff226d439fcbdbeeeb518f708a874447b740d88b709e1145262f458f40
+  data.tar.gz: 41fb013dcdfc812ef969a358ed9e6918595c68c99243f4eabc89d90dc5c0282b5d666c712f4121ed00fd57b03cfc9058758124fa5abe5a0de4b53f7cdfcf7a82

data/README.md

@@ -27,7 +27,7 @@ Rendering Task List item checkboxes from source Markdown depends on the `TaskLis
 
 ``` ruby
 require 'html/pipeline'
-require 'deckar01-task_list/filter'
+require 'task_list/filter'
 
 pipeline = HTML::Pipeline.new [
   HTML::Pipeline::MarkdownFilter,
@@ -97,7 +97,7 @@ This is the preferred method for including the frontend assets in your applicati
 
 ``` ruby
 # config/application.rb
-require 'deckar01-task_list/railtie'
+require 'task_list/railtie'
 ```
 
 ### Frontend: Rails 2.3 Manual method
@@ -107,7 +107,7 @@ Wherever you have your Sprockets setup:
 ``` ruby
 Sprockets::Environment.new(Rails.root) do |env|
   # Load TaskList assets
-  require 'deckar01-task_list/railtie'
+  require 'task_list/railtie'
   TaskList.asset_paths.each do |path|
     env.append_path path
   end

data/app/assets/javascripts/task_list.coffee

@@ -135,17 +135,10 @@ itemPattern = ///
   )
 ///
 
-# Used to filter out code fences from the source for comparison only.
-# http://rubular.com/r/x5EwZVrloI
-# Modified slightly due to issues with JS
-codeFencesPattern = ///
-  ^`{3}           # ```
-    (?:\s*\w+)?   # followed by optional language
-    [\S\s]        # whitespace
-  .*              # code
-  [\S\s]          # whitespace
-  ^`{3}$          # ```
-///mg
+# Used to skip checkbox markup inside of code fences.
+# http://rubular.com/r/TfCDNsy8x4
+startFencesPattern = /^`{3}.*$/
+endFencesPattern = /^`{3}$/
 
 # Used to filter out potential mismatches (items not in lists).
 # http://rubular.com/r/OInl6CiePy
@@ -164,11 +157,19 @@ itemsInParasPattern = ///
 #
 # Returns the updated String text.
 updateTaskListItem = (source, itemIndex, checked) ->
-  clean = source.replace(/\r/g, '').replace(codeFencesPattern, '').
-    replace(itemsInParasPattern, '').split("\n")
+  clean = source.replace(/\r/g, '').replace(itemsInParasPattern, '').split("\n")
   index = 0
+  inCodeBlock = false
   result = for line in source.split("\n")
-    if line in clean && line.match(itemPattern)
+    if inCodeBlock
+      # Lines inside of a code block are ignored.
+      if line.match(endFencesPattern)
+        # Stop ignoring lines once the code block is closed.
+        inCodeBlock = false
+    else if line.match(startFencesPattern)
+      # Start ignoring lines inside a code block.
+      inCodeBlock = true
+    else if line in clean && line.match(itemPattern)
       index += 1
       if index == itemIndex
         line =

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "deckar01-task_list",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Markdown TaskList components",
   "homepage": "https://github.com/deckar01/task_list",
   "dependencies": {

data/lib/task_list/version.rb

@@ -1,3 +1,3 @@
 class TaskList
-  VERSION = [1, 0, 5].join('.')
+  VERSION = [1, 0, 6].join('.')
 end

data/test/unit/test_updates.coffee

@@ -564,3 +564,70 @@ asyncTest "updates items followed by links", ->
   , 20
 
   item2Checkbox.click()
+
+# See https://github.com/deckar01/task_list/issues/3
+asyncTest "doesn't update items inside code blocks", ->
+  expect 3
+
+  container = $ '<div>', class: 'js-task-list-container'
+
+  list = $ '<ul>', class: 'task-list'
+
+  item1 = $ '<li>', class: 'task-list-item'
+  item1Checkbox = $ '<input>',
+    type: 'checkbox'
+    class: 'task-list-item-checkbox'
+    disabled: true
+    checked: false
+
+  item2 = $ '<li>', class: 'task-list-item'
+  item2Checkbox = $ '<input>',
+    type: 'checkbox'
+    class: 'task-list-item-checkbox'
+    disabled: true
+    checked: false
+
+  field = $ '<textarea>', class: 'js-task-list-field', text: """
+    ```
+    - [ ] test1
+    - [ ] test2
+    ```
+
+    - [ ] test1
+    - [ ] test2
+  """
+
+  changes = """
+    ```
+    - [ ] test1
+    - [ ] test2
+    ```
+
+    - [ ] test1
+    - [x] test2
+  """
+
+  item1.append item1Checkbox
+  list.append item1
+  item1.expectedIndex = 1
+
+  item2.append item2Checkbox
+  list.append item2
+  item2.expectedIndex = 2
+
+  container.append list
+  container.append field
+
+  $('#qunit-fixture').append(container)
+  container.taskList()
+
+  field.on 'tasklist:changed', (event, index, checked) =>
+    ok checked
+    equal index, item2.expectedIndex
+    equal field.val(), changes
+
+  setTimeout ->
+    start()
+  , 20
+
+  item2Checkbox.click()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deckar01-task_list
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jared Deckard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack