slaw 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c547c592602183d308cb921d933342705d3abfc5
-  data.tar.gz: 6c51e8eb899baa73562df3e6ce80f6d29ad7e048
+  metadata.gz: 509885e0ab8866ac5793804d77249885c141b2dc
+  data.tar.gz: 20f4d702127bbe215f4710e25587c10f2e07b73e
 SHA512:
-  metadata.gz: b529abf4b1c3040c3217a02ea2abf5ac534f76cca5863b0c5d84049a835d5a835247d0b0768c75bf80aae9cefdca57409573f162cad4e78324a28c6f84646f01
-  data.tar.gz: 5405a71b050b492e998e01a6e29d8c7cf02d498912759207902b81114bbc76e3aae487d0de1112a23114e7c4aabf8f04d9c634be2ee326168e49237f75d72997
+  metadata.gz: cca31525dc5bed1c19ff6be61b5a167b6debfe42b59f196c55624d9b4e333f86480b6a8ff0100a43e7ac8086489d4352a7d27ef0bc1745cdc9b9c18b17343216
+  data.tar.gz: 4a8af41380e9a45d3785844347e17fae18de1669ce41ada5989dff2d807dcaefbaeda7f89a0d1b15b8d6aeaf9d98ff2cea2e61799dd45867094a5ed3fceeb31b

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

data/lib/slaw/za/act.treetop

@@ -12,13 +12,21 @@ module Slaw
       # major containers
 
       rule act
-        preamble
+        empty_line*
+        preface:preface?
+        preamble:preamble?
         chapters:chapter*
         schedules:schedules <Act>
       end
 
+      rule preface
+        !'PREAMBLE'
+        ('PREFACE'i space? eol)?
+        statements:(!'PREAMBLE' naked_statement)* <Preface>
+      end
+
       rule preamble
-        empty_line*
+        'PREAMBLE'i space? eol
         statements:naked_statement* <Preamble>
       end
 

data/lib/slaw/za/act_nodes.rb

@@ -12,6 +12,7 @@ module Slaw
         def to_xml(b, idprefix)
           b.act(contains: "originalVersion") { |b|
             write_meta(b)
+            write_preface(b)
             write_preamble(b)
             write_body(b)
           }
@@ -57,6 +58,10 @@ module Slaw
           }
         end
 
+        def write_preface(b)
+          preface.to_xml(b)
+        end
+
         def write_preamble(b)
           preamble.to_xml(b)
         end
@@ -72,14 +77,26 @@ module Slaw
         end
       end
 
+      class Preface < Treetop::Runtime::SyntaxNode
+        def to_xml(b)
+          if text_value != ""
+            b.preface { |b|
+              statements.elements.each { |element|
+                for e in element.elements
+                  e.to_xml(b, "") if e.is_a? NakedStatement
+                end
+              }
+            }
+          end
+        end
+      end
+
       class Preamble < Treetop::Runtime::SyntaxNode
         def to_xml(b)
           if text_value != ""
             b.preamble { |b|
               statements.elements.each { |e|
-                if not (e.clauses.text_value =~ /^preamble/i)
-                  b.p(e.clauses.text_value)
-                end
+                e.to_xml(b, "")
               }
             }
           end

data/spec/za/act_spec.rb

@@ -139,7 +139,7 @@ PREVENTION AND SUPPRESSION OF HEALTH NUISANCES
 No owner or occupier of any shop or business premises or vacant land adjoining a shop or business premises shall cause a health nuisance.
 EOS
 
-      part = node.elements[1].elements[0].elements[1].elements[0]
+      part = node.chapters.elements[0].parts.elements[0]
       part.heading.num.should == "1"
       part.heading.title.should == "PREVENTION AND SUPPRESSION OF HEALTH NUISANCES"
 
@@ -412,6 +412,8 @@ EOS
 
       Some content
 EOS
+
+      today = Time.now.strftime('%Y-%m-%d')
       to_xml(node, "").should == '<doc name="schedule1">
   <meta>
     <identification source="#slaw">
@@ -433,7 +435,7 @@ EOS
       <FRBRManifestation>
         <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
         <FRBRuri value="/za/act/1980/01/eng@"/>
-        <FRBRdate date="2015-05-20" name="Generation"/>
+        <FRBRdate date="' + today + '" name="Generation"/>
         <FRBRauthor href="#slaw" as="#author"/>
       </FRBRManifestation>
     </identification>
@@ -464,10 +466,10 @@ EOS
   end
 
   #-------------------------------------------------------------------------------
-  # Preamble
+  # Preface
 
-  context 'preamble' do
-    it 'should consider any text at the start to be preamble' do
+  context 'preface' do
+    it 'should consider any text at the start to be preface' do
       node = parse :act, <<EOS
 foo
 bar
@@ -478,7 +480,7 @@ baz
 (1) hello
 EOS
 
-      node.elements.first.text_value.should == "foo
+      node.preface.text_value.should == "foo
 bar
 (1) stuff
 (2) more stuff
@@ -486,6 +488,99 @@ baz
 "
     end
 
+    it 'should support an optional preface' do
+      node = parse :act, <<EOS
+PREFACE
+foo
+1. Section
+(1) hello
+EOS
+
+      node.preface.text_value.should == "PREFACE\nfoo\n"
+      to_xml(node.preface).should == '<preface>
+  <p>foo</p>
+</preface>'
+    end
+
+    it 'should support remarks in the preface' do
+      node = parse :act, <<EOS
+PREFACE
+
+[[remark]]
+
+foo
+
+[[ another remark]]
+
+1. Section
+(1) hello
+EOS
+
+      to_xml(node.preface).should == '<preface>
+  <p>
+    <remark status="editorial">[remark]</remark>
+  </p>
+  <p>foo</p>
+  <p>
+    <remark status="editorial">[ another remark]</remark>
+  </p>
+</preface>'
+    end
+
+    it 'should support no preface' do
+      node = parse :act, <<EOS
+1. Section
+bar
+EOS
+
+      node.preface.text_value.should == ""
+    end
+
+    it 'should support prefaces and preambles' do
+      node = parse :act, <<EOS
+this is in the preface
+
+PREAMBLE
+
+this is in the preamble
+
+1. Section
+(1) hello
+EOS
+
+      to_xml(node.preface).should == '<preface>
+  <p>this is in the preface</p>
+</preface>'
+      to_xml(node.preamble).should == '<preamble>
+  <p>this is in the preamble</p>
+</preamble>'
+    end
+
+    it 'should support prefaces and preambles' do
+      node = parse :act, <<EOS
+PREFACE
+this is in the preface
+
+PREAMBLE
+this is in the preamble
+
+1. Section
+(1) hello
+EOS
+
+      to_xml(node.preface).should == '<preface>
+  <p>this is in the preface</p>
+</preface>'
+      to_xml(node.preamble).should == '<preamble>
+  <p>this is in the preamble</p>
+</preamble>'
+    end
+  end
+
+  #-------------------------------------------------------------------------------
+  # Preamble
+
+  context 'preamble' do
     it 'should support an optional preamble' do
       node = parse :act, <<EOS
 PREAMBLE
@@ -494,7 +589,35 @@ foo
 (1) hello
 EOS
 
-      node.elements.first.text_value.should == "PREAMBLE\nfoo\n"
+      node.preamble.text_value.should == "PREAMBLE\nfoo\n"
+      to_xml(node.preamble).should == '<preamble>
+  <p>foo</p>
+</preamble>'
+    end
+
+    it 'should support remarks in the preamble' do
+      node = parse :act, <<EOS
+PREAMBLE
+
+[[remark]]
+
+foo
+
+[[ another remark]]
+
+1. Section
+(1) hello
+EOS
+
+      to_xml(node.preamble).should == '<preamble>
+  <p>
+    <remark status="editorial">[remark]</remark>
+  </p>
+  <p>foo</p>
+  <p>
+    <remark status="editorial">[ another remark]</remark>
+  </p>
+</preamble>'
     end
 
     it 'should support no preamble' do
@@ -507,7 +630,6 @@ EOS
     end
   end
 
-
   #-------------------------------------------------------------------------------
   # Sections
 
@@ -519,7 +641,7 @@ Section
 1. (1) hello
 EOS
 
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
+      section = node.chapters.elements.first.parts.elements.first.sections.elements.first
       section.section_title.content.text_value.should == "Section"
       section.section_title.section_title_prefix.number_letter.text_value.should == "1"
     end
@@ -531,7 +653,7 @@ EOS
 (1) hello
 EOS
 
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
+      section = node.chapters.elements.first.parts.elements.first.sections.elements.first
       section.section_title.title.should == "Section"
       section.section_title.num.should == "1"
     end
@@ -545,11 +667,11 @@ EOS
 (2) Another line
 EOS
 
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
+      section = node.chapters.elements.first.parts.elements.first.sections.elements.first
       section.section_title.title.should == "A section"
       section.section_title.num.should == "1"
 
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[1]
+      section = node.chapters.elements[0].parts.elements.first.sections.elements[1]
       section.section_title.title.should == "Another section"
       section.section_title.num.should == "2"
     end
@@ -561,7 +683,7 @@ EOS
 (2) Without limiting generality, stuff.
 EOS
 
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
+      section = node.chapters.elements.first.parts.elements.first.sections.elements.first
       section.section_title.title.should == ""
       section.section_title.num.should == "10"
       section.subsections.elements[0].statement.num.should == "(1)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler