extended-markdown-filter 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c80fe003cb7909cd1b2f7368e74ae1d0b4fb915
-  data.tar.gz: 815b57e98452cbcc6ca0d84b6035fce004c19cc9
+  metadata.gz: a24153805c60c83a7451eff6e4cdf31828efdb34
+  data.tar.gz: 045f098ea5039f10096dc383436fff6cf97d58fc
 SHA512:
-  metadata.gz: 9d98e090c3df568b9bf39e7f6edc8d2c1fa9821b57773c99b01650fd13dc4d9f6f912e82f35c4081825cbfc049ed526e44bae512a37ccc429dd216813507a979
-  data.tar.gz: dcf8c6384922e4172e0f4cf467b73716426dfbaa1c11016a15ce5270962d8ce5cde982253fe54d168a11cf2a3274eb7fcb771aa1bcc35a3e32b1cc3c3871809a
+  metadata.gz: fa174512d31cb75081ed55226d4962de1dc6c79938c5d7aba000f73287e9297166b951bdd0a2b640ef660149d205af23a96c4990bdc62f683207043441d1e0ad
+  data.tar.gz: 77aa4727d976490209aae4edaf5b731754f4803ba67d3f86577529f9abb550dc6096e045e7c1ddd0040764fe7bca809f539534b76497e495144103fdb7a7f8dc

data/extended-markdown-filter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "extended-markdown-filter"
-  spec.version       = "0.5.1"
+  spec.version       = "0.6.0"
   spec.authors       = ["Garen Torikian"]
   spec.email         = ["gjtorikian@gmail.com"]
   spec.summary       = %q{Add extended markup syntax to the HTML::Pipeline}

data/lib/extended-markdown-filter.rb

@@ -21,7 +21,6 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
     end
 
     # do preprocessing, then call HTML::Pipeline::Markdown
-    text = format_command_line    text
     text = format_helper          text
 
     super text, context, result
@@ -51,6 +50,7 @@ class ExtendedMarkdownFilter < HTML::Pipeline::MarkdownFilter
     format_os_blocks!       html
     format_admonitions!     html
     format_octicons!        html
+    format_command_line!    html
 
     html
   end

data/lib/filters/post/command-line.rb

@@ -0,0 +1,20 @@
+module Filters
+  module PostFilter
+    def format_command_line!(html)
+      html.gsub!(/<pre><code>``` command-line\n/, "<pre class=\"command-line\">\n")
+      html.gsub!(/<pre lang="command-line">/, "<pre class=\"command-line\">\n")
+
+      html.gsub! /^\n?\s*<pre class="command-line">(.+?)<\/pre>/m do |block|
+        block.gsub!(/<\/*code>/, "")
+        block.gsub!(/```/, "")
+        block.gsub!(/^\s*\$ (.+)$/) { %(<span class="command">#{$1.rstrip}</span>) }
+        block.gsub!(/^\s*(\# .+)$/) { %(<span class="comment">#{$1.rstrip}</span>) }
+        block.gsub!(/^\s*&gt; (.+)$/) { %(<span class="output">#{$1.rstrip}</span>) }
+        block.gsub!(/&lt;/, "<")
+        block.gsub!(/&gt;/, ">")
+
+        block
+      end
+    end
+  end
+end

data/test/fixtures/command_line_nested.md

@@ -0,0 +1,9 @@
+2. Create a bare clone of the repository.
+   ``` command-line
+   $ git clone --bare https://{{ site.data.variables.command_line.codeblock }}/<em>exampleuser</em>/<em>old-repository</em>.git
+   ```
+3. Mirror-push to the new repository.
+   ``` command-line
+   $ cd <em>old-repository</em>.git
+   $ git push --mirror https://{{ site.data.variables.command_line.codeblock }}/<em>exampleuser</em>/<em>new-repository</em>.git
+   ```

data/test/test_extended_markdown_filter.rb

@@ -9,13 +9,15 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     doc = ExtendedMarkdownFilter.to_document(fixture("command_line.md"), {})
     assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
 
-    assert_equal 1, doc.css('pre').size
+    assert_equal 1, doc.css('pre.command-line').size
     assert_equal 2, doc.css('span.command').size
     assert_equal 1, doc.css('span.comment').size
     assert_equal 2, doc.css('em').size
     assert_equal 1, doc.css('span.output').size
+    assert_equal 0, doc.css('code').size
 
     assert_equal 0, doc.css('.command-line a').size
+    assert_equal 8, doc.to_html.lines.count
     refute_equal 0, doc.css('pre').inner_text.length
   end
 
@@ -23,7 +25,7 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     doc = ExtendedMarkdownFilter.to_document(fixture("command_line_indented.md"), {})
     assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
 
-    assert_equal 1, doc.css('pre').size
+    assert_equal 1, doc.css('pre.command-line').size
     assert_equal 2, doc.css('span.command').size
     assert_equal 1, doc.css('span.comment').size
     assert_equal 2, doc.css('em').size
@@ -33,6 +35,26 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     refute_equal 0, doc.css('pre').inner_text.length
   end
 
+  def test_nested_command_line
+    doc = ExtendedMarkdownFilter.to_document(fixture("command_line_nested.md"), {})
+    assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
+
+    assert_equal 1, doc.css('ol').size
+    assert_equal 2, doc.css('li').size
+    assert_equal 2, doc.css('pre').size
+
+    list = doc.css('ol')[0]
+    first_list_item = doc.css('li')[0]
+    first_command_line_block = doc.css('pre')[0]
+    second_list_item = doc.css('li')[1]
+    second_command_line_block = doc.css('pre')[1]
+
+    assert list.children.include?(first_list_item)
+    assert list.children.include?(second_list_item)
+    assert_equal first_command_line_block.parent, first_list_item
+    assert_equal second_command_line_block.parent, second_list_item
+  end
+
   def test_helper
     doc = ExtendedMarkdownFilter.to_document(fixture("helper.md"), {})
     assert doc.kind_of?(HTML::Pipeline::DocumentFragment)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended-markdown-filter
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -97,10 +97,10 @@ files:
 - lib/extended-markdown-filter.rb
 - lib/filters/filters.rb
 - lib/filters/post/admonition.rb
+- lib/filters/post/command-line.rb
 - lib/filters/post/intro.rb
 - lib/filters/post/octicon.rb
 - lib/filters/post/os-blocks.rb
-- lib/filters/pre/command-line.rb
 - lib/filters/pre/helper.rb
 - lib/jekyll-override.rb
 - test/fixtures/admonition.md
@@ -110,6 +110,7 @@ files:
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
 - test/fixtures/command_line_indented.md
+- test/fixtures/command_line_nested.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md
@@ -148,6 +149,7 @@ test_files:
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
 - test/fixtures/command_line_indented.md
+- test/fixtures/command_line_nested.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md

data/lib/filters/pre/command-line.rb

@@ -1,15 +0,0 @@
-module Filters
-  module PreFilter
-    def format_command_line(text)
-      text.gsub /^\n?\s*``` command-line(.+?)```/m do |block|
-        block.gsub! /^\s*``` command-line/, '<pre class="command-line">'
-        block.gsub! /^\s*```$/, "</pre>\n"
-        block.gsub!(/^\s*\$ (.+)$/) { %(<span class="command">#{$1.rstrip}</span>) }
-        block.gsub!(/^\s*(\# .+)$/) { %(<span class="comment">#{$1.rstrip}</span>) }
-        block.gsub!(/^\s*> (.+)$/) { %(<span class="output">#{$1.rstrip}</span>) }
-
-        block
-      end
-    end
-  end
-end