govspeak 1.5.3 → 1.5.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.4
+
+* Stop steps list regex matching newline.
+
 ## 1.5.3
 
 * Nested Govspeak blocks are now parsed recursively using Govspeak. Among other

data/lib/govspeak.rb

@@ -159,7 +159,7 @@ module Govspeak
       %{<div class="address"><div class="adr org fn"><p>\n#{body.sub("\n", "").gsub("\n", "<br />")}\n</p></div></div>\n}
     }
 
-    extension("numbered list", /^\s*((s\d+\.\s.*(?:\n|$))+)/) do |body|
+    extension("numbered list", /^[ \t]*((s\d+\.\s.*(?:\n|$))+)/) do |body|
       steps ||= 0
       body.gsub!(/s(\d+)\.\s(.*)(?:\n|$)/) do |b|
           "<li>#{Govspeak::Document.new($2.strip).to_html}</li>\n"

data/lib/govspeak/version.rb

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

data/test/govspeak_test.rb

@@ -374,6 +374,28 @@ $CTA
     assert_text_output "zippy bungle george"
   end
 
+  test_given_govspeak "
+    - unordered
+    - list
+
+    s1. step
+    s2. list
+    " do
+    assert_html_output %{
+      <ul>
+        <li>unordered</li>
+        <li>list</li>
+      </ul>
+
+      <ol class="steps">
+      <li><p>step</p>
+      </li>
+      <li><p>list</p>
+      </li>
+      </ol>}
+    assert_text_output "unordered list step list"
+  end
+
   test_given_govspeak "
     Zippy, Bungle and George did not qualify for the tax exemption in s428. They filled in their tax return accordingly.
     " do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-11 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: 3341378448441504199
+      hash: 17277922338174539
 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: 3341378448441504199
+      hash: 17277922338174539
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23