govspeak 1.5.0 → 1.5.1

data/lib/govspeak.rb

@@ -185,7 +185,7 @@ module Govspeak
       end
     end
 
-    extension("Priority list", /\$PriorityList:(\d+)\n(.*)(?:^\s*\n|\Z)/m) do |number_to_show, body|
+    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|

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/test/govspeak_test.rb

@@ -464,21 +464,75 @@ $CTA
     assert document.valid?
   end
 
-["$PriorityList:3
+  expected_priority_list_output = %|
+    <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>
+  |
+
+  test "Single priority list ending with EOF" do
+    govspeak = "$PriorityList:3
  * List item 1
  * List item 2
  * List item 3
  * List item 4
- * List item 5",
-"$PriorityList:3
- * List item 1
- * List item 2
- * List item 3
- * List item 4
- * List item 5
+ * List item 5"
+
+    given_govspeak(govspeak) do
+      assert_html_output(expected_priority_list_output)
+    end
+  end
 
- "].each do |govspeak|
-    test_given_govspeak(govspeak) do
+  test "Single priority list ending with newlines" do
+    govspeak = "$PriorityList:3
+* List item 1
+* List item 2
+* List item 3
+* List item 4
+* List item 5
+
+"
+
+    given_govspeak(govspeak) do
+      assert_html_output(expected_priority_list_output)
+    end
+  end
+
+  test 'Single priority list with \n newlines' do
+    govspeak = "$PriorityList:3\n * List item 1\n * List item 2\n * List item 3\n * List item 4\n * List item 5"
+
+    given_govspeak(govspeak) do
+      assert_html_output(expected_priority_list_output)
+    end
+  end
+
+  test 'Single priority list with \r\n newlines' do
+    govspeak = "$PriorityList:3\r\n * List item 1\r\n * List item 2\r\n * List item 3\r\n * List item 4\r\n * List item 5"
+
+    given_govspeak(govspeak) do
+      assert_html_output(expected_priority_list_output)
+    end
+  end
+
+
+  test "Multiple priority lists" do
+    govspeak = "
+$PriorityList:3
+* List item 1
+* List item 2
+* List item 3
+* List item 4
+* List item 5
+
+$PriorityList:1
+* List item 1
+* List item 2"
+
+    given_govspeak(govspeak) do
       assert_html_output %|
         <ul>
           <li class="primary-item">List item 1</li>
@@ -487,6 +541,11 @@ $CTA
           <li>List item 4</li>
           <li>List item 5</li>
         </ul>
+
+        <ul>
+          <li class="primary-item">List item 1</li>
+          <li>List item 2</li>
+        </ul>
       |
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 132095242591557468
+      hash: -2566926204979886726
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 132095242591557468
+      hash: -2566926204979886726
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23