slaw 2.2.0 → 3.0.0

data/spec/za/act_inline_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'slaw'
+require 'slaw/grammars/za/act_nodes'
 
 describe Slaw::ActGenerator do
   subject { Slaw::ActGenerator.new('za') }
@@ -27,15 +28,20 @@ describe Slaw::ActGenerator do
     b.doc.root.to_xml(encoding: 'UTF-8')
   end
 
+  before(:each) do
+    Slaw::Grammars::ZA::Act::Crossheading.counters.clear
+    Slaw::Grammars::ZA::Act::BlockElements.counters.clear
+  end
+
   #-------------------------------------------------------------------------------
   # Remarks
 
   describe 'remark' do
     it 'should handle a plain remark' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       [[Section 2 amended by Act 23 of 2004]]
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>
       <remark status="editorial">[Section 2 amended by Act 23 of 2004]</remark>
@@ -45,10 +51,10 @@ EOS
     end
 
     it 'should handle an inline remark at the end of a sentence' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       This statement has an inline remark. [[Section 2 amended by Act 23 of 2004]]
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>This statement has an inline remark. <remark status="editorial">[Section 2 amended by Act 23 of 2004]</remark></p>
   </content>
@@ -68,10 +74,10 @@ EOS
     end
 
     it 'should handle many inline remarks' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       This statement has an inline remark. [[Section 2 amended by Act 23 of 2004]]. And now some more. [[Another remark]] [[and another]]
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>This statement has an inline remark. <remark status="editorial">[Section 2 amended by Act 23 of 2004]</remark>. And now some more. <remark status="editorial">[Another remark]</remark> <remark status="editorial">[and another]</remark></p>
   </content>
@@ -88,7 +94,7 @@ EOS
       to_xml(node).should == '<section id="section-1">
   <num>1.</num>
   <heading>Section title</heading>
-  <paragraph id="section-1.paragraph-0">
+  <paragraph id="section-1.paragraph0">
     <content>
       <p>Some text is a long line.</p>
       <p>
@@ -110,7 +116,7 @@ EOS
       to_xml(node).should == '<section id="section-1">
   <num>1.</num>
   <heading>Section title</heading>
-  <paragraph id="section-1.paragraph-0">
+  <paragraph id="section-1.paragraph0">
     <content>
       <p>Some text is a long line.</p>
     </content>
@@ -172,7 +178,7 @@ EOS
       <hcontainer id="schedule1" name="schedule">
         <heading>Schedule 1</heading>
         <subheading>A Title</subheading>
-        <paragraph id="schedule1.paragraph-0">
+        <paragraph id="schedule1.paragraph0">
           <content>
             <p>
               <remark status="editorial">[Schedule 1 added by Act 23 of 2004]</remark>
@@ -185,6 +191,17 @@ EOS
   </doc>
 </component>'
     end
+
+    it 'should handle other inline content' do
+      node = parse :generic_container, <<EOS
+      Remark [[with **bold** and //italics// and [a ref](/a/b)]].
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>Remark <remark status="editorial">[with <b>bold</b> and <i>italics</i> and <ref href="/a/b">a ref</ref>]</remark>.</p>
+  </content>
+</paragraph>'
+    end
   end
 
   #-------------------------------------------------------------------------------
@@ -192,10 +209,10 @@ EOS
 
   describe 'ref' do
     it 'should handle a plain ref' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello [there](/za/act/123) friend.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello <ref href="/za/act/123">there</ref> friend.</p>
   </content>
@@ -203,10 +220,10 @@ EOS
     end
 
     it 'should work many on a line' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello [there](/za/act/123) friend [and](http://foo.bar.com/with space) you too.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello <ref href="/za/act/123">there</ref> friend <ref href="http://foo.bar.com/with space">and</ref> you too.</p>
   </content>
@@ -214,10 +231,10 @@ EOS
     end
 
     it 'should handle brackets' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello ([there](/za/act/123)).
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello (<ref href="/za/act/123">there</ref>).</p>
   </content>
@@ -225,10 +242,10 @@ EOS
     end
 
     it 'should handle many clauses on a line' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello [there](/za/act/123)[[remark one]] my[friend](/za) [[remark 2]][end](/foo).
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello <ref href="/za/act/123">there</ref><remark status="editorial">[remark one]</remark> my<ref href="/za">friend</ref> <remark status="editorial">[remark 2]</remark><ref href="/foo">end</ref>.</p>
   </content>
@@ -236,12 +253,12 @@ EOS
     end
 
     it 'text should not cross end of line' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello [there
       
       my](/za/act/123) friend.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello [there</p>
     <p>my](/za/act/123) friend.</p>
@@ -250,11 +267,11 @@ EOS
     end
 
     it 'href should not cross end of line' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello [there](/za/act
       /123) friend.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello [there](/za/act</p>
     <p>/123) friend.</p>
@@ -263,13 +280,13 @@ EOS
     end
 
     it 'href should handle refs in a list' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       2.18.1 a traffic officer appointed in terms of section 3 of the Road Traffic [Act, No. 29 of 1989](/za/act/1989/29) or section 3A of the National Road Traffic [Act No. 93 of 1996](/za/act/1996/93) as the case may be;
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
-    <blockList id="paragraph-0.list0">
-      <item id="paragraph-0.list0.2.18.1">
+    <blockList id="paragraph0.list0">
+      <item id="paragraph0.list0.2.18.1">
         <num>2.18.1</num>
         <p>a traffic officer appointed in terms of section 3 of the Road Traffic <ref href="/za/act/1989/29">Act, No. 29 of 1989</ref> or section 3A of the National Road Traffic <ref href="/za/act/1996/93">Act No. 93 of 1996</ref> as the case may be;</p>
       </item>
@@ -279,12 +296,12 @@ EOS
     end
 
     it 'should handle a link in an inline remark' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       This statement has [[a [link in](/foo/bar) a remark]]
       This statement has [[[a link in](/foo/bar) a remark]]
       This statement has [[a [link in a remark](/foo/bar)]]
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>This statement has <remark status="editorial">[a <ref href="/foo/bar">link in</ref> a remark]</remark></p>
     <p>This statement has <remark status="editorial">[<ref href="/foo/bar">a link in</ref> a remark]</remark></p>
@@ -299,10 +316,10 @@ EOS
 
   describe 'images' do
     it 'should handle a simple image' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello ![title](media/foo.png) friend.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello <img src="media/foo.png" alt="title"/> friend.</p>
   </content>
@@ -310,10 +327,10 @@ EOS
     end
 
     it 'should work many on a line' do
-      node = parse :block_paragraphs, <<EOS
+      node = parse :generic_container, <<EOS
       Hello ![title](media/foo.png) friend and ![](media/bar.png) a second.
 EOS
-      to_xml(node, "").should == '<paragraph id="paragraph-0">
+      to_xml(node, "").should == '<paragraph id="paragraph0">
   <content>
     <p>Hello <img src="media/foo.png" alt="title"/> friend and <img src="media/bar.png"/> a second.</p>
   </content>
@@ -340,4 +357,127 @@ EOS
     end
   end
 
+  #-------------------------------------------------------------------------------
+  # italics and bold
+
+  describe 'bold' do
+    it 'should handle simple bold' do
+      node = parse :generic_container, <<EOS
+      Hello **something bold** foo
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>Hello <b>something bold</b> foo</p>
+  </content>
+</paragraph>'
+    end
+
+    it 'should handle complex bold' do
+      node = parse :generic_container, <<EOS
+      A [**link**](/a/b) with bold
+      This is **bold with [a link](/a/b)** end
+      This is **bold //italics [a link](/a/b)//** end
+      A **[link**](/a/b)**
+      A **[link**](/a/b)
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>A <ref href="/a/b"><b>link</b></ref> with bold</p>
+    <p>This is <b>bold with <ref href="/a/b">a link</ref></b> end</p>
+    <p>This is <b>bold <i>italics <ref href="/a/b">a link</ref></i></b> end</p>
+    <p>A <b>[link</b>](/a/b)**</p>
+    <p>A **<ref href="/a/b">link**</ref></p>
+  </content>
+</paragraph>'
+    end
+
+    it 'should not mistake bold' do
+      node = parse :generic_container, <<EOS
+      Hello **something
+      New line**
+      **New line
+      ****
+      **
+      *
+      * * foo **
+      * * foo * *
+      ** foo * *
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>Hello **something</p>
+    <p>New line**</p>
+    <p>**New line</p>
+    <p>****</p>
+    <p>**</p>
+    <p>*</p>
+    <p>* * foo **</p>
+    <p>* * foo * *</p>
+    <p>** foo * *</p>
+  </content>
+</paragraph>'
+    end
+  end
+
+  describe 'italics' do
+    it 'should handle simple italics' do
+      node = parse :generic_container, <<EOS
+      Hello //something italics// foo
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>Hello <i>something italics</i> foo</p>
+  </content>
+</paragraph>'
+    end
+
+    it 'should handle complex italics' do
+      node = parse :generic_container, <<EOS
+      A [//link//](/a/b) with italics
+      This is //italics with [a link](/a/b)// end
+      A //italics**bold//**
+      A **bold//italics**//
+      A //[link//](/a/b)//
+      A //[link//](/a/b)
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>A <ref href="/a/b"><i>link</i></ref> with italics</p>
+    <p>This is <i>italics with <ref href="/a/b">a link</ref></i> end</p>
+    <p>A //italics<b>bold//</b></p>
+    <p>A **bold<i>italics**</i></p>
+    <p>A <i>[link</i>](/a/b)//</p>
+    <p>A //<ref href="/a/b">link//</ref></p>
+  </content>
+</paragraph>'
+    end
+
+    it 'should not mistake italics' do
+      node = parse :generic_container, <<EOS
+      Hello //something
+      New line//
+      //New line
+      ////
+      //
+      /
+      / / foo //
+      / / foo / /
+      // foo / /
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph0">
+  <content>
+    <p>Hello //something</p>
+    <p>New line//</p>
+    <p>//New line</p>
+    <p>////</p>
+    <p>//</p>
+    <p>/</p>
+    <p>/ / foo //</p>
+    <p>/ / foo / /</p>
+    <p>// foo / /</p>
+  </content>
+</paragraph>'
+    end
+  end
+
 end

data/spec/za/act_schedules_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'slaw'
+require 'slaw/grammars/za/act_nodes'
 
 describe Slaw::ActGenerator do
   subject { Slaw::ActGenerator.new('za') }
@@ -27,6 +28,11 @@ describe Slaw::ActGenerator do
     b.doc.root.to_xml(encoding: 'UTF-8')
   end
 
+  before(:each) do
+    Slaw::Grammars::ZA::Act::Crossheading.counters.clear
+    Slaw::Grammars::ZA::Act::BlockElements.counters.clear
+  end
+
   #-------------------------------------------------------------------------------
   # schedules
 
@@ -71,7 +77,7 @@ EOS
     <mainBody>
       <hcontainer id="schedule" name="schedule">
         <heading>Schedule</heading>
-        <paragraph id="schedule.paragraph-0">
+        <paragraph id="schedule.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law, the erection:</p>
           </content>
@@ -180,7 +186,7 @@ EOS
         <hcontainer id="schedule3" name="schedule">
           <heading>Schedule 3</heading>
           <subheading>Another Title</subheading>
-          <paragraph id="schedule3.paragraph-0">
+          <paragraph id="schedule3.paragraph0">
             <content>
               <p>Baz</p>
               <p>Boom</p>
@@ -238,7 +244,7 @@ EOS
       <hcontainer id="schedule1" name="schedule">
         <heading>First Schedule</heading>
         <subheading>Schedule Heading</subheading>
-        <paragraph id="schedule1.paragraph-0">
+        <paragraph id="schedule1.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law, the erection:</p>
           </content>
@@ -299,7 +305,7 @@ EOS
       <hcontainer id="schedule1" name="schedule">
         <heading>First Schedule</heading>
         <subheading>Schedule Heading</subheading>
-        <paragraph id="schedule1.paragraph-0">
+        <paragraph id="schedule1.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law, the erection:</p>
           </content>
@@ -358,7 +364,7 @@ EOS
     <mainBody>
       <hcontainer id="firstschedule" name="schedule">
         <heading>First Schedule</heading>
-        <paragraph id="firstschedule.paragraph-0">
+        <paragraph id="firstschedule.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law, the erection:</p>
           </content>
@@ -419,7 +425,7 @@ EOS
     <mainBody>
       <hcontainer id="schedule1" name="schedule">
         <heading>Schedule 1</heading>
-        <paragraph id="schedule1.paragraph-0">
+        <paragraph id="schedule1.paragraph0">
           <content>
             <p>Other than as is set out hereinbelow, no signs other than locality bound signs, temporary signs including loose portable sign, estate agents signs, newspaper headline posters and posters (the erection of which must comply with the appropriate schedules pertinent thereto) shall be erected on Municipal owned land.</p>
           </content>
@@ -493,7 +499,7 @@ EOS
         <part id="part-I">
           <num>I</num>
           <heading>Form of authentication statement</heading>
-          <paragraph id="part-I.paragraph-0">
+          <paragraph id="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>
@@ -502,7 +508,7 @@ EOS
         <part id="part-II">
           <num>II</num>
           <heading>Form of statement of the President’s assent.</heading>
-          <paragraph id="part-II.paragraph-0">
+          <paragraph id="part-II.paragraph0">
             <content>
               <p>I signify my assent to the bill and a whole bunch of other stuff.</p>
             </content>
@@ -567,7 +573,7 @@ EOS
     <mainBody>
       <hcontainer id="schedule" name="schedule">
         <heading>Schedule</heading>
-        <paragraph id="schedule.paragraph-0">
+        <paragraph id="schedule.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law.</p>
             <p>Schedule another</p>
@@ -620,7 +626,7 @@ EOS
       <hcontainer id="firstschedule" name="schedule">
         <heading>First Schedule <remark status="editorial">[remark]</remark></heading>
         <subheading>Subheading <remark status="editorial">[another]</remark></subheading>
-        <paragraph id="firstschedule.paragraph-0">
+        <paragraph id="firstschedule.paragraph0">
           <content>
             <p>Subject to approval in terms of this By-Law.</p>
           </content>