extended-markdown-filter 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e569e5b9e033f4ea11723b2d3fc1fd6686f198d2
-  data.tar.gz: 84df74f4cd5b2876eecd5ea183c6f2494138d6a8
+  metadata.gz: 5fbd677ca783661a274b905b28823a0f3caa7ab0
+  data.tar.gz: 01b74dc9163510f34cf772043b778b8b22e9c6f6
 SHA512:
-  metadata.gz: 41188b4985ad1e114413660bb787639e9c0950cd81f31f8c36de14b6c72461ef07952b12727f501921c57b3582d5d6eae07d98ae3581918be9d814da6bc4f64d
-  data.tar.gz: d3a04b1fa512dc65f96e03a8c520a99d034c400f0472c69bd5a08d06295f1ec9d005409102a3cb84dcfa590826e12e4749de498a40a3b80333fe2aa38b02eb8f
+  metadata.gz: 05317b1c16e27dbd2523980fa5861e8b7147a7b435144faf879ef25f0dd983284fb07c51dd3a2789b2eb00b9a5cc8213fb530c5deaa5824bd4d910315af68f79
+  data.tar.gz: e25e070dbac753840d2e9594aef9282ceebdf0bb3a515455d35e5a3c4e243b94aab8856ef6be2b5accf23b7c1afad4048f7aca65718db49eda830ed04245e896

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - 2.2
+
+sudo: false
+cache: bundler
+git:
+  depth: 10

data/README.md

@@ -1,5 +1,4 @@
-extended-markdown-filter
-====================
+# extended-markdown-filter
 
 Extended Markdown filters for the [HTML::Pipeline](https://github.com/jch/html-pipeline).
 
@@ -27,7 +26,21 @@ The simplest way to do this is
 require 'extended-markdown-filter'
 ```
 
-Then just use the HTML pipeline normally.
+Then just use the HTML pipeline normally. With Jekyll, this is meant to be used with another plugin in conjunction, https://github.com/gjtorikian/jekyll-html-pipeline.
+
+A minimum config file might look like:
+``` yaml
+gems:
+  - extended-markdown-filter
+  - jekyll-html-pipeline
+
+markdown: HTMLPipeline
+html_pipeline:
+  filters:
+    - "ExtendedMarkdownFilter"
+  context:
+    emf_use_blocks: true
+```
 
 ### Within Jekyll
 
@@ -78,12 +91,12 @@ You can create separate, priority-colored callouts with `{{#tip}}`, `{{#note}}`,
     Here's a hot tip: line two
 
     {{/tip}}
-    
+
     {{#note}}
-    
+
     You should probably know this! line one
     You should probably know this! line two
-    
+
     {{/note}}
 
     {{#warning}}

data/extended-markdown-filter.gemspec

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

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

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

data/test/fixtures/command_line_indented.md

@@ -0,0 +1,6 @@
+    ``` command-line
+    $ git remote add origin https://github.com/<em>user</em>/<em>repo</em>.git
+    # Set a new remote
+    > origin  https://github.com/user/repo.git
+    $ git remote add -f spoon-knife git@github.com:octocat/Spoon-Knife.git
+    ```

data/test/test_extended_markdown_filter.rb

@@ -18,6 +18,19 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     assert_equal 0, doc.css('.command-line a').size
   end
 
+  def test_command_line_indented
+    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 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('.command-line a').size
+  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.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -123,6 +123,7 @@ files:
 - test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
+- test/fixtures/command_line_indented.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md
@@ -160,6 +161,7 @@ test_files:
 - test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
+- test/fixtures/command_line_indented.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md