slaw 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde17ca3304eb910432a89b75fe777e9ce50cf1abed667d2bb7b2d673bc77aa0
-  data.tar.gz: 7102e2b19079e12bbf89c783aed99a48b9cd645f9dac396b0b68061279e86174
+  metadata.gz: c0c018a71314291d2304ba458300e360da8555bfe6df1d4348fcba8bb4501700
+  data.tar.gz: 5c68a881a0d52f54b28998fe195d877a068361c3750a254e8f88e3479c24f056
 SHA512:
-  metadata.gz: c7740c01a12b46d138051b82de734a67806155f5166c2c0c56a9aab1d7d5fc8e79526260bc4236310cd88215dd742ce3beabb298288c086f5a39111375d825ff
-  data.tar.gz: 219658ca25c23b52ce5f7ae499728a8e183b488db3f03477cb726d5f88f7ec290faf26a02727c8eb705f21ea85866f64d3e437799b0cafdb53fb3a087fd80144
+  metadata.gz: 5538b79f68d5db2289d713a0db9760147bb3baf4a986d63d0a9097fc86af95df6e6b3c8637eeaccd25834b4c79b8cadedf50c107c60833c8fb90382d7559f43f
+  data.tar.gz: d9bdcf5780887407f8ab397e765b6df83de5d54e1898a71792f0560a74044d1216e41b30e6166cc86974719fc4007513db82340c927117dec6087b974b176f1b

data/README.md

@@ -81,6 +81,11 @@ You can create your own grammar by creating a gem that provides these files and
 
 ## Changelog
 
+### 8.0.0 (19 Feb 2020)
+
+* Obey --id-prefix for group nodes
+* Ensure that schedules prefix their children, for those that require it (parts and chapters)
+
 ### 7.0.0 (31 Jan 2020)
 
 * Lists ids are now numbered sequentially, rather than by tree position

data/lib/slaw/grammars/core_nodes.rb

@@ -1,13 +1,13 @@
 module Slaw
   module Grammars
     class GroupNode < Treetop::Runtime::SyntaxNode
-      def to_xml(b, *args)
-        children.elements.each { |e| e.to_xml(b, *args) }
+      def to_xml(b, id_prefix='')
+        children.elements.each { |e| e.to_xml(b, id_prefix) }
       end
     end
 
     class Body < Treetop::Runtime::SyntaxNode
-      def to_xml(b)
+      def to_xml(b, id_prefix='')
         b.body { |b|
           children.elements.each_with_index { |e, i| e.to_xml(b, '', i) }
         }

data/lib/slaw/grammars/za/act_nodes.rb

@@ -137,13 +137,8 @@ module Slaw
             heading.num
           end
 
-          def to_xml(b, *args)
-            id = "part-#{num}"
-
-            # include a chapter number in the id if our parent has one
-            if parent and parent.parent.is_a?(Chapter) and parent.parent.num
-              id = "chapter-#{parent.parent.num}.#{id}"
-            end
+          def to_xml(b, id_prefix='', *args)
+            id = id_prefix + "part-#{num}"
 
             b.part(id: id) { |b|
               heading.to_xml(b)
@@ -172,13 +167,8 @@ module Slaw
             heading.num
           end
 
-          def to_xml(b, *args)
-            id = "chapter-#{num}"
-
-            # include a part number in the id if our parent has one
-            if parent and parent.parent.is_a?(Part) and parent.parent.num
-              id = "part-#{parent.parent.num}.#{id}"
-            end
+          def to_xml(b, id_prefix='', *args)
+            id = id_prefix + "chapter-#{num}"
 
             b.chapter(id: id) { |b|
               heading.to_xml(b)

data/lib/slaw/parse/builder.rb

@@ -148,14 +148,7 @@ module Slaw
         builder.akomaNtoso("xmlns:xsi"=> "http://www.w3.org/2001/XMLSchema-instance", 
                            "xsi:schemaLocation" => "http://www.akomantoso.org/2.0 akomantoso20.xsd",
                            "xmlns" => NS) do |b|
-          args = [b]
-
-          # should we provide an id prefix?
-          arity = tree.method('to_xml').arity 
-          arity = arity.abs-1 if arity < 0
-          args << (fragment_id_prefix || "") if arity > 1
-
-          tree.to_xml(*args)
+          tree.to_xml(b, fragment_id_prefix || '')
         end
 
         builder.to_xml(encoding: 'UTF-8')

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "7.0.0"
+  VERSION = "8.0.0"
 end

data/spec/za/act_schedules_spec.rb

@@ -383,19 +383,19 @@ EOS
       <hcontainer id="schedule1" name="schedule">
         <heading>Schedule 1</heading>
         <subheading>Forms</subheading>
-        <part id="part-I">
+        <part id="schedule1.part-I">
           <num>I</num>
           <heading>Form of authentication statement</heading>
-          <paragraph id="part-I.paragraph0">
+          <paragraph id="schedule1.part-I.paragraph0">
             <content>
               <p>This printed impression has been carefully compared by me with the bill which was passed by Parliament and found by me to be a true copy of the bill.</p>
             </content>
           </paragraph>
         </part>
-        <part id="part-II">
+        <part id="schedule1.part-II">
           <num>II</num>
           <heading>Form of statement of the President’s assent.</heading>
-          <paragraph id="part-II.paragraph0">
+          <paragraph id="schedule1.part-II.paragraph0">
             <content>
               <p>I signify my assent to the bill and a whole bunch of other stuff.</p>
             </content>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake