slaw 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab4d37da9ebc5aadc6da5bb3b14a9d786541b187
-  data.tar.gz: 3fdf535965572c529ceaa60bcfa8e95ff3ba76bd
+  metadata.gz: ebc9c571ef0b0a1ef1bff4a209bac844df2d22a3
+  data.tar.gz: 6052a4641c800a8510ec02aeddc6653cb482a349
 SHA512:
-  metadata.gz: 0b08087358bb70d8b17c276fed6501d5ddc67fe84114d5b066409fcd9825a81312dfbac68ec4add9f4481e9e3c44864beebf58a20cdb455d6134fb7751aab07d
-  data.tar.gz: d8a2983bb30778dbfee1d07822552d7efa9a0207ed30e2f1b10f7f52de671d3684dbc1a7adc82da9229e0f05f52300c5f1e151612459e40efe8df094d0c8eff7
+  metadata.gz: d57425bab077cc85397b0c05bd2f68d187e64278f4758006d9679aa00ef002a519071a960e3703b1bd608b2ab4bccac544e3d7254869ea7f47840d4420e066d0
+  data.tar.gz: fe7372c0aee508e481d5c2665747030a1b26e11d00e912311424d79c6cf30438db81dbe4577ab14aae6efb99aaa8f33dc30d605c1691a9c48b632354c63d0817

data/README.md

@@ -216,6 +216,10 @@ Akoma Ntoso `component` elements at the end of the XML document, with a name of
 
 ## Changelog
 
+### 0.8.2
+
+* Schedules can be empty (#10)
+
 ### 0.8.1
 
 * Schedules can have both a title and a heading, permitting schedules titled "First Schedule" and not just "Schedule 1"

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/slaw/za/act.treetop

@@ -66,7 +66,7 @@ module Slaw
 
       rule schedule
         schedule_title
-        body
+        body:body?
         <Schedule>
       end
 
@@ -136,7 +136,7 @@ module Slaw
       end
 
       rule schedule_title
-        space? schedule_title_prefix space? "\""? num:alphanums? "\""? [ \t:-]* title:(content)?
+        space? schedule_title_prefix space? "\""? num:alphanums? "\""? [ \t:.-]* title:(content)?
         heading:(newline space? content)?
         eol
       end

data/lib/slaw/za/act_nodes.rb

@@ -474,7 +474,7 @@ module Slaw
                 # just use article because we don't use it anywhere else.
                 b.article(id: id) { |b|
                   b.heading(heading) if heading
-                  body.children.elements.each { |e| e.to_xml(b) }
+                  body.children.elements.each { |e| e.to_xml(b) } if body.is_a? Body
                 }
               }
             }

data/spec/za/act_spec.rb

@@ -31,7 +31,7 @@ describe Slaw::ActGenerator do
   # General body
 
   describe 'body' do
-    it 'should handle general content before chapters' do
+    it 'should handle general content before sections' do
       node = parse :body, <<EOS
 Some content before the section
 
@@ -56,7 +56,7 @@ EOS
 </body>'
     end
 
-    it 'should handle blocklists before chapters' do
+    it 'should handle blocklists before sections' do
       node = parse :body, <<EOS
 Some content before the section
 
@@ -1235,6 +1235,66 @@ 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>
+      <article id="schedule1">
+        <heading>Schedule Heading</heading>
+        <paragraph id="paragraph-0">
+          <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>
+      </article>
+    </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
@@ -1484,6 +1544,15 @@ EOS
 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
   end
 
   #-------------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler