govspeak 3.1.0 → 3.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.1
+
+* Fix a bug where address information could get mixed in with preceding paragraph text.
+
 ## 3.1.0
 
 * Allow a call to `#valid?` on a `Govspeak::Document` to accept validation options.

data/lib/govspeak.rb

@@ -157,7 +157,7 @@ module Govspeak
     wrap_with_div('call-to-action', '$CTA', Govspeak::Document)
 
     extension('address', surrounded_by("$A")) { |body|
-      %{<div class="address"><div class="adr org fn"><p>\n#{body.sub("\n", "").gsub("\n", "<br />")}\n</p></div></div>\n}
+      %{\n<div class="address"><div class="adr org fn"><p>\n#{body.sub("\n", "").gsub("\n", "<br />")}\n</p></div></div>\n}
     }
 
     extension("legislative list", /(?<=\A|\n\n|\r\n\r\n)^\$LegislativeList\s*$(.*?)\$EndLegislativeList/m) do |body|

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/test/govspeak_test.rb

@@ -64,7 +64,20 @@ Testcase Cliffs
 Teston
 0123 456 7890 $A    }
     doc = Govspeak::Document.new(input)
-    assert_equal %{<div class="address"><div class="adr org fn"><p>\n123 Test Street<br />Testcase Cliffs<br />Teston<br />0123 456 7890 \n</p></div></div>\n}, doc.to_html
+    assert_equal %{\n<div class="address"><div class="adr org fn"><p>\n123 Test Street<br />Testcase Cliffs<br />Teston<br />0123 456 7890 \n</p></div></div>\n}, doc.to_html
+  end
+
+  test "address div is separated from paragraph text by a couple of line-breaks" do
+    # else kramdown processes address div as part of paragraph text and escapes HTML
+    input = %{Paragraph1
+
+$A
+123 Test Street
+Testcase Cliffs
+Teston
+0123 456 7890 $A}
+    doc = Govspeak::Document.new(input)
+    assert_equal %{<p>Paragraph1</p>\n\n<div class="address"><div class="adr org fn"><p>\n123 Test Street<br />Testcase Cliffs<br />Teston<br />0123 456 7890 \n</p></div></div>\n}, doc.to_html
   end
 
   test_given_govspeak("^ I am very informational ^") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453983176966331010
+      hash: 1973029752197064168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453983176966331010
+      hash: 1973029752197064168
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23