govspeak 1.5.2 → 1.5.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.3
+
+* Nested Govspeak blocks are now parsed recursively using Govspeak. Among other
+  things, this fixes the display of external links in callout blocks.
+
 ## 1.5.2
 
 * Fixed over-eager step list matching.

data/lib/govspeak.rb

@@ -96,7 +96,7 @@ module Govspeak
       }
     end
 
-    def insert_strong_inside_p(body, parser=Kramdown::Document)
+    def insert_strong_inside_p(body, parser=Govspeak::Document)
       parser.new(body.strip).to_html.sub(/^<p>(.*)<\/p>$/,"<p><strong>\\1</strong></p>")
     end
 
@@ -106,7 +106,7 @@ module Govspeak
 
     extension('highlight-answer') { |body|
       %{\n\n<div class="highlight-answer">
-#{Kramdown::Document.new(body.strip).to_html}</div>\n}
+#{Govspeak::Document.new(body.strip).to_html}</div>\n}
     }
 
     # FIXME: these surrounded_by arguments look dodgy
@@ -116,7 +116,7 @@ module Govspeak
 
     extension('informational', surrounded_by("^")) { |body|
       %{\n\n<div class="application-notice info-notice">
-#{Kramdown::Document.new(body.strip).to_html}</div>\n}
+#{Govspeak::Document.new(body.strip).to_html}</div>\n}
     }
 
     extension('important', surrounded_by("@")) { |body|
@@ -124,7 +124,7 @@ module Govspeak
     }
 
     extension('helpful', surrounded_by("%")) { |body|
-      %{\n\n<div class="application-notice help-notice">\n#{Kramdown::Document.new(body.strip).to_html}</div>\n}
+      %{\n\n<div class="application-notice help-notice">\n#{Govspeak::Document.new(body.strip).to_html}</div>\n}
     }
 
     extension('attached-image', /^!!([0-9]+)/) do |image_number|
@@ -162,7 +162,7 @@ module Govspeak
     extension("numbered list", /^\s*((s\d+\.\s.*(?:\n|$))+)/) do |body|
       steps ||= 0
       body.gsub!(/s(\d+)\.\s(.*)(?:\n|$)/) do |b|
-          "<li>#{Kramdown::Document.new($2.strip).to_html}</li>\n"
+          "<li>#{Govspeak::Document.new($2.strip).to_html}</li>\n"
       end
       %{<ol class="steps">\n#{body}</ol>}
     end
@@ -180,7 +180,7 @@ module Govspeak
       extension("devolved-#{k}",/:#{k}:(.*?):#{k}:/m) do |body|
 %{<div class="devolved-content #{k}">
 <p class="devolved-header">This section applies to #{v}</p>
-<div class="devolved-body">#{Kramdown::Document.new(body.strip).to_html}</div>
+<div class="devolved-body">#{Govspeak::Document.new(body.strip).to_html}</div>
 </div>\n}
       end
     end
@@ -188,7 +188,7 @@ module Govspeak
     extension("Priority list", /\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
       number_to_show = number_to_show.to_i
       tagged = 0
-      Kramdown::Document.new(body.strip).to_html.gsub(/<li>/) do |match|
+      Govspeak::Document.new(body.strip).to_html.gsub(/<li>/) do |match|
         if tagged < number_to_show
           tagged += 1
           '<li class="primary-item">'

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/test/govspeak_test.rb

@@ -395,7 +395,7 @@ $CTA
 
   test_given_govspeak "@ Message with [a link](http://foo.bar/)@" do
     assert_html_output %{
-      <div class="advisory"><p><strong>Message with <a href="http://foo.bar/">a link</a></strong></p>
+      <div class="advisory"><p><strong>Message with <a rel="external" href="http://foo.bar/">a link</a></strong></p>
       </div>
       }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1265897029881878331
+      hash: 3341378448441504199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1265897029881878331
+      hash: 3341378448441504199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23