govspeak 1.5.1 → 1.5.2

data/CHANGELOG.md

@@ -1,10 +1,18 @@
+## 1.5.2
+
+* Fixed over-eager step list matching.
+
+## 1.5.1
+
+* Fixed newline matching and operating over multiple list blocks.
+
 ## 1.5.0
 
-Added `$PriorityList:x` construct to class the first `x` list items with
-`primary-item`.
-Fixed `rcov` dependency.
+* Added `$PriorityList:x` construct to class the first `x` list items with
+  `primary-item`.
+* Fixed `rcov` dependency.
 
 ## 1.4.0
 
-Added `#structured_headers` method to provide heirarchically structured
-headers extracted from markdown text heading tags.
+* Added `#structured_headers` method to provide heirarchically structured
+  headers extracted from markdown text heading tags.

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\d+\.\s.*(?:\n|$))+)/) do |body|
+    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"

data/lib/govspeak/structured_header_extractor.rb

@@ -8,6 +8,12 @@ module Govspeak
     def top_level?
       level == top_level
     end
+
+    def to_h
+      Hash[members.zip(values)].merge(
+        headers: headers.map(&:to_h),
+      )
+    end
   end
 
   class StructuredHeaderExtractor

data/lib/govspeak/version.rb

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

data/test/govspeak_structured_headers_test.rb

@@ -68,6 +68,44 @@ class GovspeakStructuredHeadersTest < Test::Unit::TestCase
     assert_equal "Sub heading 4.2", structured_headers[3].headers[1].text
   end
 
+  test "structured headers serialize to hashes recursively serializing sub headers" do
+    serialized_headers = structured_headers[1].to_h
+
+    expected_serialized_headers = {
+      :text => "Heading 2",
+      :level => 2,
+      :id => "heading-2",
+      :headers =>  [
+        {
+          :text => "Sub heading 2.1",
+          :level => 3,
+          :id => "sub-heading-21",
+          :headers => [],
+        },
+        {
+          :text => "Sub heading 2.2",
+          :level => 3,
+          :id => "sub-heading-22",
+          :headers =>  [
+            {
+              :text => "Sub sub heading 2.2.1",
+              :level => 4,
+              :id => "sub-sub-heading-221",
+              :headers => []
+            },
+          ],
+        },
+        {
+          :text => "Sub heading 2.3",
+          :level => 3, :id=>"sub-heading-23",
+          :headers => []
+        },
+      ],
+    }
+
+    assert_equal expected_serialized_headers, serialized_headers
+  end
+
   def invalid_document_body
     %{
 ### Invalid heading (h3)

data/test/govspeak_test.rb

@@ -374,6 +374,14 @@ $CTA
     assert_text_output "zippy bungle george"
   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
+    assert_html_output %{
+      <p>Zippy, Bungle and George did not qualify for the tax exemption in s428. They filled in their tax return accordingly.</p>
+    }
+  end
+
   test_given_govspeak ":scotland: I am very devolved\n and very scottish \n:scotland:" do
     assert_html_output '
       <div class="devolved-content scotland">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -60,6 +60,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2566926204979886726
+      hash: 1265897029881878331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2566926204979886726
+      hash: 1265897029881878331
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23