middleman-hashicorp 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e17a35054d12adb10150112bfd766bb05a9323
-  data.tar.gz: 660989c15ec9ecbba9f4fd5b6b4a28fe428bda60
+  metadata.gz: faa6604885b0ec377d901ba569d5e6c77af4d14f
+  data.tar.gz: abb5f50ffff04dffc4f39f7b94e14336af23c74b
 SHA512:
-  metadata.gz: ad92925188ac51058bda123c4a0a325e283751239ebc6458d50dd78dfe1e9c7ce71f92706e77c918d3b23db9a7bf9f19a541a65e3d06b857e1d9245de43b1916
-  data.tar.gz: b277f0f8232673bf60ee1a29ed9e9375eec223f52cffa2112a745c64a9328c5fe83119f3bb6d6d2b1319f334c6fc4f441307ba6a20f3ba21e6166e49fdb95cab
+  metadata.gz: 25f52e284323c966063293223a5852b75f5735208b5f6004bca6a3d9e43eb030e533aaf7b156cffd277648b642c6cd85f37059d65210b0f83176dc6d46bf0291
+  data.tar.gz: 551ed2efa0fef9310eb19d825d7410b58bdeb969ff4d2805919f505189b56f15d7f90c7d335d68717beec406a921c43e534da92c5463106b2d47b39bfa5fed84

data/lib/middleman-hashicorp/redcarpet.rb

@@ -1,5 +1,6 @@
 require "middleman-core"
 require "middleman-core/renderers/redcarpet"
+require "nokogiri"
 require "active_support/core_ext/module/attribute_accessors"
 
 # Our custom Markdown parser - extends middleman's customer parser so we pick up
@@ -25,21 +26,11 @@ class Middleman::HashiCorp::RedcarpetHTML < ::Middleman::Renderers::MiddlemanRed
   # Override headers to add custom links.
   #
   def header(title, level)
-    @headers ||= {}
-
-    name = title.downcase.strip.gsub(/\W+/, '-').gsub(/\A\-/, '')
-
-    i = 0
-    permalink = name
-    while @headers.key?(permalink) do
-      i += 1
-      permalink = "#{name}-#{i}"
-    end
-    @headers[permalink] = true
+    anchor = anchor_link(title)
 
     return <<-EOH.gsub(/^ {6}/, "")
-      <h#{level} id="#{permalink}">
-        <a name="#{permalink}" class="anchor" href="##{permalink}">&raquo;</a>
+      <h#{level} id="#{anchor}">
+        <a name="#{anchor}" class="anchor" href="##{anchor}">&raquo;</a>
         #{title}
       </h#{level}>
     EOH
@@ -52,12 +43,14 @@ class Middleman::HashiCorp::RedcarpetHTML < ::Middleman::Renderers::MiddlemanRed
   # @param [String] list_type
   #
   def list_item(text, list_type)
+    @anchors ||= {}
+
     md = text.match(/\A(?:<p>)?(<code>(.+?)<\/code>)/)
     linked = !text.match(/\A(<p>)?<a(.+?)>(.+?)<\/a>\s*?[-:]?/).nil?
 
     if !md.nil? && !linked
       container, name = md.captures
-      anchor = anchor_for(name)
+      anchor = anchor_link(name)
 
       replace = %|<a name="#{anchor}" /><a href="##{anchor}">#{container}</a>|
       text.sub!(container, replace)
@@ -95,19 +88,29 @@ class Middleman::HashiCorp::RedcarpetHTML < ::Middleman::Renderers::MiddlemanRed
   private
 
   #
-  # Remove any special characters from the anchor name.
-  #
-  # @example
-  #   anchor_for("this") #=> "this"
-  #   anchor_for("this is cool") #=> "this_is_cool"
-  #   anchor_for("this__is__cool!") #=> "this__is__cool_"
+  # Generate an anchor link from the generated raw value.
   #
-  #
-  # @param [String] text
   # @return [String]
   #
-  def anchor_for(text)
-    text.gsub(/[^[:word:]]/, "_").squeeze("_")
+  def anchor_link(raw)
+    @anchors ||= {}
+
+    name = raw
+      .downcase
+      .strip
+      .gsub(/<\/?[^>]*>/, '') # Strip links
+      .gsub(/\W+/, '-')       # Whitespace to -
+      .gsub(/\A\-/, '')       # No leading -
+      .squeeze('-')           # Collapse --
+
+    i = 0
+    link = name
+    while @anchors.key?(link) do
+      i += 1
+      link = "#{name}-#{i}"
+    end
+    @anchors[link] = true
+    return link
   end
 
   #

data/lib/middleman-hashicorp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module HashiCorp
-    VERSION = "0.3.14"
+    VERSION = "0.3.15"
   end
 end

data/spec/unit/markdown_spec.rb

@@ -20,7 +20,7 @@ module Middleman::HashiCorp
         </li>
         <li><a name="two" /><a href="#two"><code>two</code></a> has some <code>code</code> inside
         </li>
-        <li><a name="three_has_and_spaces" /><a href="#three_has_and_spaces"><code>three has ^ and spaces</code></a> with text
+        <li><a name="three-has-and-spaces" /><a href="#three-has-and-spaces"><code>three has ^ and spaces</code></a> with text
         </li>
         <li>four
         </li>
@@ -50,7 +50,7 @@ module Middleman::HashiCorp
         </li>
         <li><p><a name="two" /><a href="#two"><code>two</code></a> has some <code>code</code> inside</p>
         </li>
-        <li><p><a name="three_has_and_spaces" /><a href="#three_has_and_spaces"><code>three has ^ and spaces</code></a> with text</p>
+        <li><p><a name="three-has-and-spaces" /><a href="#three-has-and-spaces"><code>three has ^ and spaces</code></a> with text</p>
         </li>
         <li><p>four</p>
         </li>
@@ -203,6 +203,7 @@ module Middleman::HashiCorp
         # Hello World
         ## Subpath
         ## Subpath
+        ## `code` Subpath
       EOH
       output = <<-EOH.gsub(/^ {8}/, "")
         <h1 id="hello-world">
@@ -217,6 +218,10 @@ module Middleman::HashiCorp
           <a name="subpath-1" class="anchor" href="#subpath-1">&raquo;</a>
           Subpath
         </h2>
+        <h2 id="code-subpath">
+          <a name="code-subpath" class="anchor" href="#code-subpath">&raquo;</a>
+          <code>code</code> Subpath
+        </h2>
       EOH
 
       expect(markdown).to render_html(output)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-hashicorp
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman