middleman-hashicorp 0.3.35 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2c7a885e60c254c12acb316b53cabc7717496ba1f983da5d58ba6b945c069ac
-  data.tar.gz: 7f9a6224170edaed847f424251ea2655a73dac302b48d43ee3ecd622df623821
+  metadata.gz: 04d8b35b212ee6ca03b20cadc7609dff3721bfe9782ba67e5900464fdf510ee1
+  data.tar.gz: 6e8514c78339f9512a0712d58e6fcdd0133cfc0b89b2535af23539bd563633dc
 SHA512:
-  metadata.gz: 8534412acabb03191b17a3468273b661d9fdcecc615b0c233a523a0d3658819879ed0ca6fcb4d0ddb50f4bddae4588862f8221403718e88603471d77ca611148
-  data.tar.gz: e3bccac8d724eb0c7fd5caef1cae6eb7f8c1b26c873ccd21dcedf1f74aa66ba934d5661e08358f64fe28ce7c77257e616393fcf4e086b65230b001509ce0f636
+  metadata.gz: f27b4368499002f2ee5b6c00342c6c13232f8d6066d1b9b12fdc82c948c6af3aa164fb121d24c4057cbbc75db5302929b8dcc1e328997f73581ec6d475be7773
+  data.tar.gz: 6fd4cd3c9fec357693e29235c4b81725c43713e4629b86309c58be00bfa8ed1d80705cf4bbc681eee4cb72b209d61286315fe6f849620db40856c04ae516c3bc

data/README.md

@@ -1,9 +1,9 @@
-HashiCorp Middleman Customizations
-==================================
+# HashiCorp Middleman Customizations
+
 A wrapper around [Middleman][] for HashiCorp's customizations.
 
-Installation
-------------
+## Installation
+
 Add this line to the Gemfile:
 
 ```ruby
@@ -16,9 +16,8 @@ And then run:
 $ bundle
 ```
 
+## Usage
 
-Usage
------
 To generate a new site, follow the instructions in the [Middleman docs][]. Then add the following line to your `config.rb`:
 
 ```ruby
@@ -52,20 +51,21 @@ $ middleman server
 
 and you are off running!
 
-Customizations
---------------
+## Customizations
+
 ### Default Options
-- Syntax highlighting (via [middleman-syntax][]) is automatically enabled
-- Asset directories are organized like Rails:
-    - `assets/stylesheets`
-    - `assets/javascripts`
-    - `assets/images`
-    - `assets/fonts`
-- The Markdown engine is redcarpet (see the section below on Markdown customizations)
-- During development, live-reload is automatically enabled
-- During build, css, javascript and HTML are minified
-- During build, assets are hashed
-- During build, gzipped assets are also created
+
+* Syntax highlighting (via [middleman-syntax][]) is automatically enabled
+* Asset directories are organized like Rails:
+  * `assets/stylesheets`
+  * `assets/javascripts`
+  * `assets/images`
+  * `assets/fonts`
+* The Markdown engine is redcarpet (see the section below on Markdown customizations)
+* During development, live-reload is automatically enabled
+* During build, css, javascript and HTML are minified
+* During build, assets are hashed
+* During build, gzipped assets are also created
 
 ### IE Compatibility
 
@@ -150,6 +150,7 @@ Finally include the required javascript:
 ```
 
 ### Mega Nav
+
 HashiCorp has a consistent mega-nav used across all project sites. This is insertable into any document using the following:
 
 ```erb
@@ -165,51 +166,54 @@ Additionally, you must import the CSS and Javascript:
 
 ```scss
 // assets/stylesheets/application.scss
-@import 'hashicorp/mega-nav'
+@import 'hashicorp/mega-nav';
 ```
 
 ### Helpers
-- `latest_version` - get the version specified in `config.rb` as `version`, but replicated here for use in views.
 
-    ```ruby
-    latest_version #=> "1.0.0"
-    ```
+* `latest_version` - get the version specified in `config.rb` as `version`, but replicated here for use in views.
+
+  ```ruby
+  latest_version #=> "1.0.0"
+  ```
 
-- `system_icon` - use vendored image assets for a system icon
+* `system_icon` - use vendored image assets for a system icon
 
-    ```ruby
-    system_icon(:windows) #=> "<img src=\"/images/icons/....png\">"
-    ```
+  ```ruby
+  system_icon(:windows) #=> "<img src=\"/images/icons/....png\">"
+  ```
 
-- `pretty_os` - get the human name of the given operating system
+* `pretty_os` - get the human name of the given operating system
 
-    ```ruby
-    pretty_os(:darwin) => "Mac OS X"
-    ```
+  ```ruby
+  pretty_os(:darwin) => "Mac OS X"
+  ```
 
-- `pretty_arch` - get the arch out of an arch
+* `pretty_arch` - get the arch out of an arch
 
-    ```ruby
-    pretty_arch(:amd64) #=> "64-bit"
-    ```
+  ```ruby
+  pretty_arch(:amd64) #=> "64-bit"
+  ```
 
 ### Markdown
+
 This extension extends the redcarpet markdown processor to add some additional features:
 
-- Autolinking of URLs
-- Fenced code blocks
-- Tables
-- TOC data
-- Strikethrough
-- Superscript
+* Autolinking of URLs
+* Fenced code blocks
+* Tables
+* TOC data
+* Strikethrough
+* Superscript
 
 In addition to "standard markdown", the custom markdown parser supports the following:
 
 #### Auto-linking Anchor Tags
+
 Since the majority of HashiCorp's projects use the following syntax to define APIs, this extension automatically converts those to named anchor links:
 
 ```markdown
-- `api_method` - description
+* `api_method` - description
 ```
 
 Outputs:
@@ -226,12 +230,13 @@ Header links will automatically generate linkable hrefs on hover. This can be us
 
 ```scss
 // assets/stylesheets/application.scss
-@import 'hashicorp/anchor-links'
+@import 'hashicorp/anchor-links';
 ```
 
 Any special characters are converted to an underscore (`_`).
 
 #### Recursive Markdown Rendering
+
 By default, the Markdown spec does not call for rendering markdown recursively inside of HTML. With this extension, it is valid:
 
 ```markdown
@@ -241,12 +246,13 @@ By default, the Markdown spec does not call for rendering markdown recursively i
 ```
 
 #### Bootstrap Alerts
+
 There are 4 custom markdown extensions that automatically create Twitter Bootstrap-style alerts:
 
-- `=>` => `success`
-- `->` => `info`
-- `~>` => `warning`
-- `!>` => `danger`
+* `=>` => `success`
+* `->` => `info`
+* `~>` => `warning`
+* `!>` => `danger`
 
 ```markdown
 -> Hey, you should know...
@@ -271,6 +277,7 @@ Of course you can use Markdown inside the block:
 ```
 
 ### Bootstrap
+
 Twitter Bootstrap (3.x) is automatically bundled. Simply activate it it in your CSS and Javascript:
 
 ```scss
@@ -283,15 +290,18 @@ Twitter Bootstrap (3.x) is automatically bundled. Simply activate it it in your
 //= require bootstrap
 ```
 
-Contributing
-------------
+## Publishing a New Release
+
+Just bump the version string and push a new tag to the repository and our CI will release the gem automatically. Do not try running any of the Makefile tasks yourself, the CI will run them for you.
+
+## Contributing
+
 1. [Fork it](https://github.com/hashicorp/middleman-hashicorp/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-
-[Middleman]: http://middlemanapp.com/
-[Middleman docs]: http://middlemanapp.com/basics/getting-started/
+[middleman]: http://middlemanapp.com/
+[middleman docs]: http://middlemanapp.com/basics/getting-started/
 [middleman-syntax]: http://github.com/middleman/middleman-syntax/

data/lib/middleman-hashicorp/redcarpet.rb

@@ -69,10 +69,15 @@ class Middleman::HashiCorp::RedcarpetHTML < ::Middleman::Renderers::MiddlemanRed
 
     if md = raw.match(/\<(.+?)\>(.*)\<(\/.+?)\>/m)
       open_tag, content, close_tag = md.captures
-      "<#{open_tag}>\n#{recursive_render(content)}<#{close_tag}>"
-    else
-      raw
+      rendered_content = recursive_render(content)
+      # If the recursive render did more than simply wrap
+      # the content within a paragraph, assume this is valid
+      # markdown content and return the result
+      if rendered_content != paragraph(content)
+        return "<#{open_tag}>\n#{rendered_content}<#{close_tag}>"
+      end
     end
+    raw
   end
 
   #

data/lib/middleman-hashicorp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module HashiCorp
-    VERSION = "0.3.35"
+    VERSION = "0.3.37"
   end
 end

metadata

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