extended-markdown-filter 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555bea313bb40a9b286a9916a4bc3a87c258771d
-  data.tar.gz: 3780420bd64f8cd2034ccbecb60a34d0e467c881
+  metadata.gz: 0be701777aecab5f6a8ed73bcb9778cc4a01b68d
+  data.tar.gz: 074027daffa94871274bb024e1d6fc306029a15f
 SHA512:
-  metadata.gz: a56659b608016e369af761743454e54403ebff307a5904b5a98e75c22ac672c3be491c80bc1e6c1ffc7a5d2350fa43ed43ef79c2e222e26dc37c2da2e9fde832
-  data.tar.gz: 86eb129658b054247d53dd1acb6ae9d075e94c850a79a5cecc067b0003127a6d2f7c41b5fd591753cd08750b91b4711ce1abc7b183c2ccd3544d92f9777ff9c0
+  metadata.gz: caa52431a623a1f427462a9d5ebbf24f60361186d1e0f21e9ffb4008ccbf202eedeba22c2604332765e43370d20de6f96673e3bebb527cc358dd4fb97bca21ad
+  data.tar.gz: 3de7ea80ba2efcdbbd72186be361b83876c5ed2d1962ded4700b2f394fcfb6bab25a9aa64b1c434ffbda0b8fe333641d6298549b31d8d0bef12541b680a0ad82

data/extended-markdown-filter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "extended-markdown-filter"
-  spec.version       = "0.3.4"
+  spec.version       = "0.3.5"
   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,13 +1,9 @@
 module Filters
   module PreFilter
     def format_command_line!(text)
-      text.gsub! /((`{3}\s*)(command-line)?(\s*([\w\W]+?)\n*)\2)\n*(?:[^\S\w\s]|$)/m do |block|
-        str = $5.dup
-        return block unless str.lines.to_a[0].chomp == "command-line"
-        str = str.lines.to_a[1..-1].join
-
-        block.gsub! /``` command-line/, '<pre class="command-line">'
-        block.gsub! /```/, "</pre>\n"
+      text.gsub! /\n?``` command-line(.+?)```/m do |block|
+        block.gsub! /^``` command-line/, '<pre class="command-line">'
+        block.gsub! /^```$/, "</pre>\n"
         block.gsub!(/^\$ (.+)$/) { %Q|<span class="command">#{$1.rstrip}</span>| }
         block.gsub!(/^(\# .+)$/) { %Q|<span class="comment">#{$1.rstrip}</span>| }
         block.gsub!(/^> (.+)$/) { %Q|<span class="output"><span># </span>#{$1.rstrip}</span>| }

data/lib/filters/pre/helper.rb

@@ -1,6 +1,8 @@
 module Filters
   module PreFilter
     def format_helper!(text)
+      prefix = '<p'
+
       text.gsub! /\n?``` helper(.+?)```/m do |block|
         block.gsub! /^``` helper\s*/, ''
         block.gsub! /^```$/, ''
@@ -12,7 +14,7 @@ module Filters
         end
 
         content = block.strip
-        content = "<p>#{content}</p>" unless content =~ /^<p/
+        content = "<p>#{content}</p>" unless content[0, prefix.length] == prefix
         content = "<div class='helper'><h4 class='header'><a href='#'>#{header}</a></h4><div class='content'>#{content}</div></div>"
       end
     end

data/test/test_extended_markdown_filter.rb

@@ -14,11 +14,6 @@ class HTML::Pipeline::ExtendedMarkdownFilterTest < Minitest::Test
     assert_equal 1, doc.css('span.comment').size
     assert_equal 2, doc.css('em').size
     assert_equal 1, doc.css('span.output').size
-
-    doc = ExtendedMarkdownFilter.to_document(fixture("command_line_list.md"), {})
-    assert doc.kind_of?(HTML::Pipeline::DocumentFragment)
-
-    assert_equal 2, doc.css('li pre.command-line').size
   end
 
   def test_helper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended-markdown-filter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -109,7 +109,6 @@ files:
 - test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
-- test/fixtures/command_line_list.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md
@@ -147,7 +146,6 @@ test_files:
 - test/fixtures/block_octicon.md
 - test/fixtures/block_os_blocks.md
 - test/fixtures/command_line.md
-- test/fixtures/command_line_list.md
 - test/fixtures/helper.md
 - test/fixtures/intro.md
 - test/fixtures/octicon.md

data/test/fixtures/command_line_list.md

@@ -1,29 +0,0 @@
-1. On the command line, navigate to the repository that contains the commit you want to amend.
-2. Use the `git rebase -i HEAD~n` command to display a list of the last `n` commits in your default text editor.
-  ``` command-line
-  $ git rebase -i HEAD~3 # Displays a list of the last 3 commits on the current branch
-  ```  
-  The list will look similar to the following:
-  ``` command-line
-  pick e499d89 Delete CNAME
-  pick 0c39034 Better README
-  pick f7fde4a Change the commit message but push the same commit.
-
-  # Rebase 9fdb3bd..f7fde4a onto 9fdb3bd
-  #
-  # Commands:
-  #  p, pick = use commit
-  #  r, reword = use commit, but edit the commit message
-  #  e, edit = use commit, but stop for amending
-  #  s, squash = use commit, but meld into previous commit
-  #  f, fixup = like "squash", but discard this commit's log message
-  #  x, exec = run command (the rest of the line) using shell
-  #
-  # These lines can be re-ordered; they are executed from top to bottom.
-  #
-  # If you remove a line here THAT COMMIT WILL BE LOST.
-  #
-  # However, if you remove everything, the rebase will be aborted.
-  #
-  # Note that empty commits are commented out
-  ```