slaw 4.2.0 → 5.0.0

data/spec/za/act_block_spec.rb

@@ -1673,582 +1673,6 @@ EOS
     end
   end
 
-  #-------------------------------------------------------------------------------
-  # schedules
-
-  context 'schedules' do
-    it 'should handle a simple schedule' do
-      node = parse :schedules, <<EOS
-Schedule
-
-Subject to approval in terms of this By-Law, the erection:
-1. Foo
-2. Bar
-EOS
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == '<component id="component-schedule">
-  <doc name="schedule">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="Schedule"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="' + today + '" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule" name="schedule">
-        <heading>Schedule</heading>
-        <paragraph id="schedule.paragraph0">
-          <content>
-            <p>Subject to approval in terms of this By-Law, the erection:</p>
-          </content>
-        </paragraph>
-        <section id="section-1">
-          <num>1.</num>
-          <heading>Foo</heading>
-        </section>
-        <section id="section-2">
-          <num>2.</num>
-          <heading>Bar</heading>
-        </section>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>'
-    end
-
-    it 'should serialise many schedules correctly' do
-      node = parse :schedules_container, <<EOS
-Schedule "2"
-A Title
-1. Foo
-2. Bar
-Schedule 3
-Another Title
-Baz
-Boom
-EOS
-
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == <<EOS
-<components>
-  <component id="component-schedule2">
-    <doc name="schedule2">
-      <meta>
-        <identification source="#slaw">
-          <FRBRWork>
-            <FRBRthis value="/za/act/1980/01/schedule2"/>
-            <FRBRuri value="/za/act/1980/01"/>
-            <FRBRalias value="Schedule 2"/>
-            <FRBRdate date="1980-01-01" name="Generation"/>
-            <FRBRauthor href="#council"/>
-            <FRBRcountry value="za"/>
-          </FRBRWork>
-          <FRBRExpression>
-            <FRBRthis value="/za/act/1980/01/eng@/schedule2"/>
-            <FRBRuri value="/za/act/1980/01/eng@"/>
-            <FRBRdate date="1980-01-01" name="Generation"/>
-            <FRBRauthor href="#council"/>
-            <FRBRlanguage language="eng"/>
-          </FRBRExpression>
-          <FRBRManifestation>
-            <FRBRthis value="/za/act/1980/01/eng@/schedule2"/>
-            <FRBRuri value="/za/act/1980/01/eng@"/>
-            <FRBRdate date="#{today}" name="Generation"/>
-            <FRBRauthor href="#slaw"/>
-          </FRBRManifestation>
-        </identification>
-      </meta>
-      <mainBody>
-        <hcontainer id="schedule2" name="schedule">
-          <heading>Schedule 2</heading>
-          <subheading>A Title</subheading>
-          <section id="section-1">
-            <num>1.</num>
-            <heading>Foo</heading>
-          </section>
-          <section id="section-2">
-            <num>2.</num>
-            <heading>Bar</heading>
-          </section>
-        </hcontainer>
-      </mainBody>
-    </doc>
-  </component>
-  <component id="component-schedule3">
-    <doc name="schedule3">
-      <meta>
-        <identification source="#slaw">
-          <FRBRWork>
-            <FRBRthis value="/za/act/1980/01/schedule3"/>
-            <FRBRuri value="/za/act/1980/01"/>
-            <FRBRalias value="Schedule 3"/>
-            <FRBRdate date="1980-01-01" name="Generation"/>
-            <FRBRauthor href="#council"/>
-            <FRBRcountry value="za"/>
-          </FRBRWork>
-          <FRBRExpression>
-            <FRBRthis value="/za/act/1980/01/eng@/schedule3"/>
-            <FRBRuri value="/za/act/1980/01/eng@"/>
-            <FRBRdate date="1980-01-01" name="Generation"/>
-            <FRBRauthor href="#council"/>
-            <FRBRlanguage language="eng"/>
-          </FRBRExpression>
-          <FRBRManifestation>
-            <FRBRthis value="/za/act/1980/01/eng@/schedule3"/>
-            <FRBRuri value="/za/act/1980/01/eng@"/>
-            <FRBRdate date="#{today}" name="Generation"/>
-            <FRBRauthor href="#slaw"/>
-          </FRBRManifestation>
-        </identification>
-      </meta>
-      <mainBody>
-        <hcontainer id="schedule3" name="schedule">
-          <heading>Schedule 3</heading>
-          <subheading>Another Title</subheading>
-          <paragraph id="schedule3.paragraph0">
-            <content>
-              <p>Baz</p>
-              <p>Boom</p>
-            </content>
-          </paragraph>
-        </hcontainer>
-      </mainBody>
-    </doc>
-  </component>
-</components>
-EOS
-    .strip
-
-    end
-
-    it 'should handle a schedule with a title and a number' do
-      node = parse :schedules, <<EOS
-Schedule 1 - First Schedule
-Schedule Heading
-
-Subject to approval in terms of this By-Law, the erection:
-1. Foo
-2. Bar
-EOS
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == '<component id="component-schedule1">
-  <doc name="schedule1">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule1"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="First Schedule"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="' + today + '" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule1" name="schedule">
-        <heading>First Schedule</heading>
-        <subheading>Schedule Heading</subheading>
-        <paragraph id="schedule1.paragraph0">
-          <content>
-            <p>Subject to approval in terms of this By-Law, the erection:</p>
-          </content>
-        </paragraph>
-        <section id="section-1">
-          <num>1.</num>
-          <heading>Foo</heading>
-        </section>
-        <section id="section-2">
-          <num>2.</num>
-          <heading>Bar</heading>
-        </section>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>'
-    end
-
-    it 'should handle a schedule with dot in the number' do
-      node = parse :schedules, <<EOS
-Schedule 1. First Schedule
-Schedule Heading
-
-Subject to approval in terms of this By-Law, the erection:
-1. Foo
-2. Bar
-EOS
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == '<component id="component-schedule1">
-  <doc name="schedule1">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule1"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="First Schedule"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="' + today + '" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule1" name="schedule">
-        <heading>First Schedule</heading>
-        <subheading>Schedule Heading</subheading>
-        <paragraph id="schedule1.paragraph0">
-          <content>
-            <p>Subject to approval in terms of this By-Law, the erection:</p>
-          </content>
-        </paragraph>
-        <section id="section-1">
-          <num>1.</num>
-          <heading>Foo</heading>
-        </section>
-        <section id="section-2">
-          <num>2.</num>
-          <heading>Bar</heading>
-        </section>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>'
-    end
-
-    it 'should handle a schedule with a title' do
-      node = parse :schedules, <<EOS
-Schedule - First Schedule
-
-Subject to approval in terms of this By-Law, the erection:
-1. Foo
-2. Bar
-EOS
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == '<component id="component-firstschedule">
-  <doc name="firstschedule">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/firstschedule"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="First Schedule"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/firstschedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/firstschedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="' + today + '" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="firstschedule" name="schedule">
-        <heading>First Schedule</heading>
-        <paragraph id="firstschedule.paragraph0">
-          <content>
-            <p>Subject to approval in terms of this By-Law, the erection:</p>
-          </content>
-        </paragraph>
-        <section id="section-1">
-          <num>1.</num>
-          <heading>Foo</heading>
-        </section>
-        <section id="section-2">
-          <num>2.</num>
-          <heading>Bar</heading>
-        </section>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>'
-    end
-
-    it 'should serialise a single schedule without a heading' do
-      node = parse :schedules, <<EOS
-Schedule "1"
-
-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.
-1. Foo
-2. Bar
-EOS
-
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == <<EOS
-<component id="component-schedule1">
-  <doc name="schedule1">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule1"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="Schedule 1"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="#{today}" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule1" name="schedule">
-        <heading>Schedule 1</heading>
-        <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>
-        </paragraph>
-        <section id="section-1">
-          <num>1.</num>
-          <heading>Foo</heading>
-        </section>
-        <section id="section-2">
-          <num>2.</num>
-          <heading>Bar</heading>
-        </section>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>
-EOS
-      .strip
-    end
-
-    it 'should support rich parts, chapters and sections in a schedule' do
-      node = parse :schedules, <<EOS
-Schedule 1
-Forms
-
-Part I
-Form of authentication statement
-
-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.
-
-Part II
-Form of statement of the President’s assent.
-
-I signify my assent to the bill and a whole bunch of other stuff.
-EOS
-
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == <<EOS
-<component id="component-schedule1">
-  <doc name="schedule1">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule1"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="Schedule 1"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="#{today}" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule1" name="schedule">
-        <heading>Schedule 1</heading>
-        <subheading>Forms</subheading>
-        <part id="part-I">
-          <num>I</num>
-          <heading>Form of authentication statement</heading>
-          <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>
-          </paragraph>
-        </part>
-        <part id="part-II">
-          <num>II</num>
-          <heading>Form of statement of the President’s assent.</heading>
-          <paragraph id="part-II.paragraph0">
-            <content>
-              <p>I signify my assent to the bill and a whole bunch of other stuff.</p>
-            </content>
-          </paragraph>
-        </part>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>
-EOS
-      .strip
-    end
-
-    it 'should not get confused by schedule headings in TOC' do
-      parse :schedules_container, <<EOS
-Schedule 1. Summoning and procedure of Joint Sittings of Senate and House of Assembly.
-Schedule 2. Oaths.
-Schedule 3. Matters which shall continue to be regulated by Swazi Law and Custom.
-Schedule 4. Specially entrenched provisions and entrenched provisions.
-EOS
-    end
-
-    it 'should handle escaped schedules' do
-      node = parse :schedules, <<EOS
-Schedule
-
-Subject to approval in terms of this By-Law.
-
-\\Schedule another
-
-More stuff
-EOS
-      s = to_xml(node)
-      today = Time.now.strftime('%Y-%m-%d')
-      s.should == '<component id="component-schedule">
-  <doc name="schedule">
-    <meta>
-      <identification source="#slaw">
-        <FRBRWork>
-          <FRBRthis value="/za/act/1980/01/schedule"/>
-          <FRBRuri value="/za/act/1980/01"/>
-          <FRBRalias value="Schedule"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRcountry value="za"/>
-        </FRBRWork>
-        <FRBRExpression>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="1980-01-01" name="Generation"/>
-          <FRBRauthor href="#council"/>
-          <FRBRlanguage language="eng"/>
-        </FRBRExpression>
-        <FRBRManifestation>
-          <FRBRthis value="/za/act/1980/01/eng@/schedule"/>
-          <FRBRuri value="/za/act/1980/01/eng@"/>
-          <FRBRdate date="' + today + '" name="Generation"/>
-          <FRBRauthor href="#slaw"/>
-        </FRBRManifestation>
-      </identification>
-    </meta>
-    <mainBody>
-      <hcontainer id="schedule" name="schedule">
-        <heading>Schedule</heading>
-        <paragraph id="schedule.paragraph0">
-          <content>
-            <p>Subject to approval in terms of this By-Law.</p>
-            <p>Schedule another</p>
-            <p>More stuff</p>
-          </content>
-        </paragraph>
-      </hcontainer>
-    </mainBody>
-  </doc>
-</component>'
-    end
-
-  end
-
-  #-------------------------------------------------------------------------------
-  # inline_items
-
-  context 'inline_items' do
-    it 'should handle a simple clause' do
-      node = parse :inline_items, "simple text"
-      node.text_value.should == "simple text"
-    end
-
-    it 'should handle a clause with a remark' do
-      node = parse :inline_items, "simple [[remark]]. text"
-      node.text_value.should == "simple [[remark]]. text"
-      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
-
-      node = parse :inline_items, "simple [[remark]][[another]] text"
-      node.text_value.should == "simple [[remark]][[another]] text"
-      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
-      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
-    end
-  end
-
   #-------------------------------------------------------------------------------
   # crossheadings
 

data/spec/za/act_inline_spec.rb

@@ -33,6 +33,27 @@ describe Slaw::ActGenerator do
     Slaw::Grammars::ZA::Act::BlockElements.counters.clear
   end
 
+  #-------------------------------------------------------------------------------
+  # inline_items
+
+  context 'inline_items' do
+    it 'should handle a simple clause' do
+      node = parse :inline_items, "simple text"
+      node.text_value.should == "simple text"
+    end
+
+    it 'should handle a clause with a remark' do
+      node = parse :inline_items, "simple [[remark]]. text"
+      node.text_value.should == "simple [[remark]]. text"
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
+
+      node = parse :inline_items, "simple [[remark]][[another]] text"
+      node.text_value.should == "simple [[remark]][[another]] text"
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be true
+    end
+  end
+
   #-------------------------------------------------------------------------------
   # Remarks