govspeak 10.7.0 → 10.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1efcb5cc3a8435cb52e7eb9a87539a1cf9a8fc3a000adfe75e0321b2f37a98
-  data.tar.gz: 9360c67b0ff42e408f30a7613e9b6388dc2cff57d3e9eef41022ad85daf265ca
+  metadata.gz: 733f9a53a5ef973b6a5342613ba74a3511ffd72e35c90d03e6aafee6179812cf
+  data.tar.gz: b79467615c87b31c19448b30a95d8abf9cef2392afa756b9844aac539ce41f24
 SHA512:
-  metadata.gz: d2e4582880a1156af68977a09bb84a1f6b7846fa13b8b01501ae79f6fc6fbe1a3ca4f9284395801b4fc29899d04b3ebf7b2a12b91b2588e295d6ec60979503fe
-  data.tar.gz: 7a13a22a339c51c3847a43a4468ede4201ddb537bd0edabe8cd8641de025dfaa62e20a3bdfb92827ad9509ea5356950c3434c59d41168510b9a2c22ea95188cf
+  metadata.gz: 582e8c1dc672de89f3dd8baa795df2d6ff90646b313cca6ec71cd6d63d0a3b506e2b1aef8e8ed7d729195557496d934a98b810249111eb2690eafe68c322c8c8
+  data.tar.gz: fd31d88a87ab6b5148666387230d83b36af33bf74d6270fe65c6a7ff5f5d555820364fec601c04ec3298ab2fc5f5f4b5f26d4ea7bec53445e49b09ce2067b217

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 10.8.1
+
+* fix: Ensure i18n load paths are flattened [PR #453](https://github.com/alphagov/govspeak/pull/453)
+
+## 10.8.0
+
+* feature: Allow callers to specify which headers will be auto-numbered [PR #451](https://github.com/alphagov/govspeak/pull/451)
+
 ## 10.7.0
 
 * feature: Add auto-numbered headers option [PR #449](https://github.com/alphagov/govspeak/pull/449)

data/README.md

@@ -22,7 +22,7 @@ then create a new document
 
 Some additional steps or considerations are needed to ensure changes to govspeak cascade across GOV.UK in a holistic way.
 
-Once govspeak has been updated and version incremented then: 
+Once govspeak has been updated and version incremented then:
 - [`govuk_publishing_components` govspeak](https://components.publishing.service.gov.uk/component-guide/govspeak) will also need updating to reflect your most recent change.
 - [Publishing apps](https://docs.publishing.service.gov.uk/apps.html) (including but not limited to [content-publisher](https://github.com/alphagov/content-publisher) & [whitehall](https://github.com/alphagov/whitehall)) also use govspeak, these apps will need to be released with the new govspeak version present.
 
@@ -30,7 +30,7 @@ Also, consider if:
 - [whitehall](https://github.com/alphagov/whitehall) needs updating (as custom govspeak changes are present)
 - [govspeak-preview](https://github.com/alphagov/govspeak-preview) needs updating
 
-Any pages that use govspeak to generate Content will need to *republished* in order for the new changes to be reflected.  
+Any pages that use govspeak to generate Content will need to be *republished* in order for the new changes to be reflected.
 
 - Data Labs can help identify which pages need updating by [submitting a request](https://gov-uk.atlassian.net/wiki/spaces/GOVUK/pages/1860075525/GOV.UK+Data+Labs#Submitting-a-data-science-request) and [#govuk-2ndline](https://docs.publishing.service.gov.uk/manual/2nd-line.html) can help with republishing
 
@@ -48,6 +48,34 @@ with understanding how the content transforms from source through:
 
 In addition to the [standard Markdown syntax](http://daringfireball.net/projects/markdown/syntax "Markdown syntax"), we have added our own extensions.
 
+## Autonumbered headers
+
+This extension is off by default, can be turned on with
+
+    doc = Govspeak::Document.new "## Header\n### Sub-header\n#### Sub-sub-header", auto_numbered_headers: true
+
+Creates automatically numbered headers
+
+```html
+<h2>1 Header</h2>
+<h3>1.1 Sub-header</h3>
+<h4>1.1.1 Sub-sub-header</h4>
+```
+
+By default the numbering scheme will work for all headers apart from H1s, if you want to
+restrict this you can specify the levels you want in an array (default value is [2,3,4,5,6])
+
+    doc = Govspeak::Document.new "## Header\n### Sub-header\n#### Sub-sub-header", auto_numbered_headers: true, auto_numbered_header_levels: [2,3]
+
+Creates automatically numbered headers
+
+```html
+<h2>1 Header</h2>
+<h3>1.1 Sub-header</h3>
+<h4>Sub-sub-header</h4>
+```
+
+
 ## Callouts
 
 ### Information callouts

data/lib/govspeak/post_processor.rb

@@ -164,7 +164,9 @@ module Govspeak
       if govspeak_document.auto_numbered_headers
         h2, h3, h4, h5, h6 = 0, 0, 0, 0, 0, 0
 
-        document.css("h2,h3,h4,h5,h6").map do |el|
+        selector = govspeak_document.auto_numbered_header_levels.map { |i| "h#{i}" }.join(",")
+
+        document.css(selector).map do |el|
           case el.name
           when "h2"
             h2 += 1

data/lib/govspeak/structured_header_extractor.rb

@@ -41,7 +41,7 @@ module Govspeak
         stack.push(header)
       end
 
-      add_auto_numbering(structured_headers) if doc.auto_numbered_headers
+      add_auto_numbering(structured_headers, doc.auto_numbered_header_levels) if doc.auto_numbered_headers
 
       structured_headers
     end
@@ -98,10 +98,10 @@ module Govspeak
       @stack = []
     end
 
-    def add_auto_numbering(structured_headers, prefix: "")
+    def add_auto_numbering(structured_headers, levels, prefix: "")
       structured_headers.each.with_index(1) do |header, index|
-        header[:text] = "#{prefix}#{index}#{'.' if prefix == ''} #{header[:text]}"
-        add_auto_numbering(header[:headers], prefix: "#{prefix}#{index}.")
+        header[:text] = "#{prefix}#{index}#{'.' if prefix == ''} #{header[:text]}" if levels.include?(header[:level])
+        add_auto_numbering(header[:headers], levels, prefix: "#{prefix}#{index}.")
       end
     end
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "10.7.0".freeze
+  VERSION = "10.8.1".freeze
 end

data/lib/govspeak.rb

@@ -38,7 +38,7 @@ module Govspeak
     @extensions = []
 
     attr_accessor :images
-    attr_reader :attachments, :auto_numbered_headers, :contacts, :links, :locale, :log_snapshots
+    attr_reader :attachments, :auto_numbered_headers, :auto_numbered_header_levels, :contacts, :links, :locale, :log_snapshots
 
     def self.to_html(source, options = {})
       new(source, options).to_html
@@ -55,12 +55,12 @@ module Govspeak
       @log_snapshots = options.fetch(:log_snapshots, false)
       log_snapshot("options", options)
       log_snapshot("source", @source)
-
       @images = options.delete(:images) || []
       @allowed_elements = options.delete(:allowed_elements) || []
       @allowed_image_hosts = options.delete(:allowed_image_hosts) || []
       @attachments = Array.wrap(options.delete(:attachments))
       @auto_numbered_headers = options.fetch(:auto_numbered_headers, false)
+      @auto_numbered_header_levels = options.delete(:auto_numbered_header_levels) || [2, 3, 4, 5, 6]
       @links = Array.wrap(options.delete(:links))
       @contacts = Array.wrap(options.delete(:contacts))
       @locale = options.fetch(:locale, "en")
@@ -439,9 +439,9 @@ module Govspeak
   end
 end
 
-locale_paths = *Dir.glob(File.expand_path("locales/*.yml", Govspeak.root))
+locale_paths = Dir.glob(File.expand_path("locales/*.yml", Govspeak.root))
 
-I18n.load_path.unshift(locale_paths)
+I18n.load_path.unshift(*locale_paths)
 I18n.available_locales = locale_paths.map do |path|
   path.match(/([^\/]+).yml/)[1].to_sym
 end

data/test/govspeak_structured_headers_test.rb

@@ -166,4 +166,25 @@ class GovspeakStructuredHeadersTest < Minitest::Test
     assert_equal "5. Heading 5", headers[4][:text]
     assert_equal "5.1 Sub heading 5.1", headers[4][:headers][0][:text]
   end
+
+  test "auto-numbered headers are restricted to appropriate levels when the option is set on the document" do
+    doc = Govspeak::Document.new(document_body, auto_numbered_headers: true, auto_numbered_header_levels: [2, 3])
+
+    headers = doc.structured_headers
+
+    assert_equal "1. Heading 1", headers[0][:text]
+    assert_equal "2. Heading 2", headers[1][:text]
+    assert_equal "2.1 Sub heading 2.1", headers[1][:headers][0][:text]
+    assert_equal "2.2 Sub heading 2.2", headers[1][:headers][1][:text]
+    assert_equal "Sub sub heading 2.2.1", headers[1][:headers][1][:headers][0][:text]
+    assert_equal "2.3 Sub heading 2.3", headers[1][:headers][2][:text]
+    assert_equal "3. Heading 3", headers[2][:text]
+    assert_equal "4. Heading 4", headers[3][:text]
+    assert_equal "4.1 Sub heading 4.1", headers[3][:headers][0][:text]
+    assert_equal "Sub sub heading 4.1.1", headers[3][:headers][0][:headers][0][:text]
+    assert_equal "Sub sub sub heading 4.1.1.1", headers[3][:headers][0][:headers][0][:headers][0][:text]
+    assert_equal "4.2 Sub heading 4.2", headers[3][:headers][1][:text]
+    assert_equal "5. Heading 5", headers[4][:text]
+    assert_equal "5.1 Sub heading 5.1", headers[4][:headers][0][:text]
+  end
 end

data/test/govspeak_test.rb

@@ -121,6 +121,28 @@ class GovspeakTest < Minitest::Test
     assert_equal %(\n<h2 id="h2-one">1. H2 One</h2>\n\n<h3 id="h3-one">1.1 H3 One</h3>\n\n<h3 id="h3-two">1.2 H3 Two</h3>\n\n<h2 id="h2-two">2. H2 Two</h2>\n\n<h3 id="h3-three">2.1 H3 Three</h3>\n\n<h4 id="h4-one">2.1.1 H4 One</h4>\n\n<h5 id="h5-one">2.1.1.1 H5 One</h5>\n\n<h6 id="h6-one">2.1.1.1.1 H6 One</h6>\n), doc.to_html
   end
 
+  test "restricts auto-numbered headings to specified levels when the auto_numbered_heading_levels option is set" do
+    input = %(
+## H2 One
+
+### H3 One
+
+### H3 Two
+
+## H2 Two
+
+### H3 Three
+
+#### H4 One
+
+##### H5 One
+
+###### H6 One
+)
+    doc = Govspeak::Document.new(input, auto_numbered_headers: true, auto_numbered_header_levels: [2, 3])
+    assert_equal %(\n<h2 id="h2-one">1. H2 One</h2>\n\n<h3 id="h3-one">1.1 H3 One</h3>\n\n<h3 id="h3-two">1.2 H3 Two</h3>\n\n<h2 id="h2-two">2. H2 Two</h2>\n\n<h3 id="h3-three">2.1 H3 Three</h3>\n\n<h4 id="h4-one">H4 One</h4>\n\n<h5 id="h5-one">H5 One</h5>\n\n<h6 id="h6-one">H6 One</h6>\n), doc.to_html
+  end
+
   test "trailing space after the address should not prevent parsing" do
     input = %($A
 123 Test Street
@@ -1579,4 +1601,8 @@ Or so we thought.)
       )
     end
   end
+
+  test "I18n load_path is not set as a nested array" do
+    assert_equal I18n.load_path.count, I18n.load_path.flatten.count
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 10.7.0
+  version: 10.8.1
 platform: ruby
 authors:
 - GOV.UK Dev