qiita-markdown 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778b3df4d04671c390617f51ec231bb2929fb77c
-  data.tar.gz: e5474939d020ce354844259c1f37d11e10567c4f
+  metadata.gz: bea900399e3f98f773a66f64b0f513b7df75a9ef
+  data.tar.gz: 9e662b826ce1e8bb783a93ef1b4dd20c12c3e16d
 SHA512:
-  metadata.gz: 3ab6e4e68ce78816662dabe71a9a150fc10655be8933f65d8de26903608ef12dcdca53824e761e6e3d7acca7dda5327cd4714b1652e356a4cee11772779585d8
-  data.tar.gz: c567e7488ef2aae1065d5ad0ca4399102867464ef42fdbf6ec409c7ecb394b96e73851b3005d29951703eaf7256b8eb4e08f010178530d0b064a01ee28b2a7fd
+  metadata.gz: 43d04fc9ed20153039185cc685e8b2b8ca4fcd89373a89bdcc553a0819232e2f5010ba567d207a749b9805375f060303655a227951b880ac89e3ba36d965d7d3
+  data.tar.gz: 99cc9042b28fe2f2972c184b95af6f2f044251ab835565a4617779b70c06526509809f154bf2e8cfd213e13c68ed104a2436f491578221b9e562b7802f7e690e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.8
+* Support gapped task list
+
 ## 0.0.7
 * Change dependent gem version
 

data/README.md

@@ -9,6 +9,7 @@ Qiita-specified markdown processor.
 * Emoji
 * Syntax highlighting
 * Mention
+* Task list
 
 ## Usage
 Qiita::Markdown::Processor provides markdown rendering logic.
@@ -43,9 +44,21 @@ processor.call(text)
 ```
 
 ### Context
-Processor takes optional context as a Hash which is shared by all filters.
+`.new` and `#call` can take optional context as a Hash with following keys:
+
+```
+:allowed_usernames - A list of usernames allowed to be username. (Array<String>)
+:asset_path        - URL path to link to emoji sprite. (String)
+:asset_root        - Base URL to link to emoji sprite. (String)
+:base_url          - Used to construct links to user profile pages for each. (String)
+:checkbox_disabled - Pass true to add `disabled` attribute to input element/ (Boolean)
+:default_language  - Default language used if no language detected from code. (String)
+:language_aliases  - Alias table for some language names. (Hash)
+:rule              - Sanitization rule table. (Hash)
+:script            - A flag to allow to embed script element. (Boolean)
+```
 
 ```ruby
 processor = Qiita::Markdown::Processor.new(asset_root: "http://example.com/assets")
-processor.call(text, asset_root: "http://cdn.example.com")
+processor.call(text)
 ```

data/lib/qiita/markdown.rb

@@ -1,6 +1,7 @@
 require "active_support/core_ext/object/blank"
 require "html/pipeline"
 require "linguist"
+require "mem"
 require "nokogiri"
 require "redcarpet"
 require "sanitize"

data/lib/qiita/markdown/filters/checkbox.rb

@@ -21,6 +21,8 @@ module Qiita
         end
 
         class List
+          include Mem
+
           CHECKBOX_CLOSE_MARK = "[x] "
           CHECKBOX_OPEN_MARK  = "[ ] "
 
@@ -36,7 +38,7 @@ module Qiita
 
           def convert
             first_text_node.content = first_text_node.content.sub(checkbox_mark, "")
-            @node.prepend_child(checkbox_node)
+            first_text_node.add_previous_sibling(checkbox_node)
             @node["class"] = "task-list-item"
           end
 
@@ -60,25 +62,23 @@ module Qiita
           end
 
           def first_text_node
-            @first_text_node ||= @node.children.first
+            @first_text_node ||= begin
+              if @node.children.first.name == "p"
+                @node.children.first.children.first
+              else
+                @node.children.first
+              end
+            end
           end
 
+          memoize\
           def has_close_checkbox?
-            if instance_variable_defined?(:@has_close_checkbox)
-              @has_close_checkbox
-            else
-              inner = @node.children.first
-              @has_close_checkbox = inner.text? && inner.content.start_with?(CHECKBOX_CLOSE_MARK)
-            end
+            @has_close_checkbox = first_text_node.text? && first_text_node.content.start_with?(CHECKBOX_CLOSE_MARK)
           end
 
+          memoize\
           def has_open_checkbox?
-            if instance_variable_defined?(:@has_open_checkbox)
-              @has_open_checkbox
-            else
-              inner = @node.children.first
-              @has_open_checkbox = inner.text? && inner.content.start_with?(CHECKBOX_OPEN_MARK)
-            end
+            @has_open_checkbox = first_text_node.text? && first_text_node.content.start_with?(CHECKBOX_OPEN_MARK)
           end
         end
       end

data/lib/qiita/markdown/version.rb

@@ -1,5 +1,5 @@
 module Qiita
   module Markdown
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/qiita-markdown.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gemoji"
   spec.add_dependency "github-linguist"
   spec.add_dependency "html-pipeline"
+  spec.add_dependency "mem"
   spec.add_dependency "redcarpet"
   spec.add_dependency "rugged", ">= 0.21.1b2"
   spec.add_dependency "sanitize"

data/spec/qiita/markdown/processor_spec.rb

@@ -376,7 +376,7 @@ describe Qiita::Markdown::Processor do
       end
     end
 
-    context "with checkbox list" do
+    context "with task list" do
       let(:markdown) do
         <<-EOS.strip_heredoc
           - [ ] a
@@ -396,7 +396,7 @@ describe Qiita::Markdown::Processor do
       end
     end
 
-    context "with nested checkbox list" do
+    context "with nested task list" do
       let(:markdown) do
         <<-EOS.strip_heredoc
           - [ ] a
@@ -420,7 +420,7 @@ describe Qiita::Markdown::Processor do
       end
     end
 
-    context 'with checkbox list in code block' do
+    context 'with task list in code block' do
       let(:markdown) do
         <<-EOS.strip_heredoc
           ```
@@ -439,7 +439,7 @@ describe Qiita::Markdown::Processor do
       end
     end
 
-    context "with checkbox list and :checkbox_disabled context" do
+    context "with task list and :checkbox_disabled context" do
       before do
         context[:checkbox_disabled] = true
       end
@@ -462,5 +462,24 @@ describe Qiita::Markdown::Processor do
         EOS
       end
     end
+
+    context 'with empty line between task list' do
+      let(:markdown) do
+        <<-EOS.strip_heredoc
+          - [ ] a
+
+          - [x] b
+        EOS
+      end
+
+      it "inserts checkbox with disabled attribute" do
+        should eq <<-EOS.strip_heredoc
+          <ul>
+          <li class="task-list-item"><p><input type="checkbox" class="task-list-item-checkbox" data-checkbox-index="0">a</p></li>
+          <li class="task-list-item"><p><input type="checkbox" class="task-list-item-checkbox" data-checkbox-index="1" checked>b</p></li>
+          </ul>
+        EOS
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement