govspeak 1.6.0 → 1.6.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1
+
+* Fix a bug with parsing of `$LegislativeList` and `$PriorityList` so that they
+  are not matched when immediately preceeded by other text.
+
 ## 1.6.0
 
 * Add `$LegislativeList` to allow editors to insert lists with custom markers.

data/README.md

@@ -136,6 +136,20 @@ Steps can be created similar to an ordered list:
 
 Note that steps need an extra line break after the final step (ie. two full blank lines) or other markdown directly afterwards won't work. If you have a subhead after - add a line break after this.
 
+## Legislative Lists
+
+For lists where you want to specify the numbering and have multiple indent levels.
+
+    $LegislativeList
+    * 1. Item 1
+    * 2. Item 2
+      * a) Item 2a
+      * b) Item 2b
+        * i. Item 2 b i
+        * ii. Item 2 b ii
+    * 3. Item 3
+    (to indent, add 2 spaces)
+
 ## Abbreviations
 
 Abbreviations can be defined at the end of the document, and any occurrences elswhere in the document will wrapped in an `<abbr>` tag. They are parsed in the order in which they are defined, so `PCSOs` should be defined before `PCSO`, for example.

data/lib/govspeak.rb

@@ -160,7 +160,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("legislative list", /\$LegislativeList\s*$(.*?)(?:^\s*$|\Z)/m) do |body|
+    extension("legislative list", /(?<=\A|\n{2})^\$LegislativeList\s*$(.*?)(?:^\s*$|\Z)/m) do |body|
       Govspeak::KramdownOverrides.with_kramdown_ordered_lists_disabled do
         Kramdown::Document.new(body.strip).to_html.tap do |doc|
           doc.gsub!('<ul>', '<ol>')
@@ -196,7 +196,7 @@ module Govspeak
       end
     end
 
-    extension("Priority list", /\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
+    extension("Priority list", /(?<=\A|\n{2})^\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
       number_to_show = number_to_show.to_i
       tagged = 0
       Govspeak::Document.new(body.strip).to_html.gsub(/<li>/) do |match|

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/test/govspeak_test.rb

@@ -418,6 +418,32 @@ $CTA
     }
   end
 
+  test_given_govspeak "
+    The quick brown
+    $LegislativeList
+    * 1. fox jumps over
+  " do
+    assert_html_output "
+    <p>The quick brown
+    $LegislativeList
+    * 1. fox jumps over</p>"
+  end
+
+  test_given_govspeak "
+    The quick brown fox
+
+    $LegislativeList
+    * 1. jumps over the lazy dog
+  " do
+    assert_html_output %{
+      <p>The quick brown fox</p>
+
+      <ol class="legislative-list">
+        <li>1. jumps over the lazy dog</li>
+      </ol>
+    }
+  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
@@ -601,4 +627,52 @@ $PriorityList:1
       |
     end
   end
+
+  test "Priority list placed incorrectly" do
+    govspeak = "
+    This is a paragraph
+    $PriorityList:3
+    * List item 1
+    * List item 2
+    * List item 3
+    * List item 4
+    * List item 5"
+
+    given_govspeak(govspeak) do
+      assert_html_output("
+      <p>This is a paragraph
+      $PriorityList:3
+      * List item 1
+      * List item 2
+      * List item 3
+      * List item 4
+      * List item 5</p>")
+    end
+  end
+
+  test "Priority list placed correctly" do
+    govspeak = "
+    This is a paragraph
+
+    $PriorityList:3
+    * List item 1
+    * List item 2
+    * List item 3
+    * List item 4
+    * List item 5"
+
+    given_govspeak(govspeak) do
+      assert_html_output %|
+        <p>This is a paragraph</p>
+
+        <ul>
+          <li class="primary-item">List item 1</li>
+          <li class="primary-item">List item 2</li>
+          <li class="primary-item">List item 3</li>
+          <li>List item 4</li>
+          <li>List item 5</li>
+        </ul>
+      |
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3370036994273431811
+      hash: 4364278234785949725
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3370036994273431811
+      hash: 4364278234785949725
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23