slaw 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ffdf08fe85d90cfacaa3c1f054cd907a19b257a
-  data.tar.gz: b0b1f5870e4c6e55b3a9e08d979386be93bf6ebd
+  metadata.gz: 8eeb58782b2816f1d5a79ff2ca9c58a01b31ae98
+  data.tar.gz: 263785f7925b2f7634b32823e421748e75bc7c71
 SHA512:
-  metadata.gz: d2f4e281a3f03af67164b34c932956a53f5c63baf9befe1acce7b739b5d4e2d30e2aea588a8c55f4720c66281db3c6a00695c9007a5e15b6e5746f87c71f5dd2
-  data.tar.gz: f47c88f70b3a7c4ce16baa09c97d3e7812665b2ecf8bc570b9b782028257a1d3eebca65d5366aeb03b41ba33b5d2e34d2010d0570a4075a343a4758fe5c067c3
+  metadata.gz: 6faaf2748a1b641f8e7f375d08ef070a36d1e3a1d1c25e3ecda4af0e18e5d7f488f831bf3859857f95c95725605c4d9127bfb7ff19c5e394dfde002dc309bd7a
+  data.tar.gz: fd534bb5d9b6d8fee1d004c30c0657df1ca2ab6625a938c0a1ad6aad03c22bd399c9b2e3dbb53cddbd06be9a834990b18f050bc71a2393d16117d88cb44928d2

data/lib/slaw/parse/blocklists.rb

@@ -141,10 +141,16 @@ module Slaw
           prev_format
         when /^\([ivx]+/
           NumberingFormat.i
-        when /^\([a-z][a-z]/
+        when /^\([IVX]+/
+          NumberingFormat.I
+        when /^\([a-z]{2}/
           NumberingFormat.aa
-        when /^\([a-z]+/i
+        when /^\([A-Z]{2}/
+          NumberingFormat.AA
+        when /^\([a-z]+/
           NumberingFormat.a
+        when /^\([A-Z]+/
+          NumberingFormat.A
         when /^\d+(\.\d+)+$/
           NumberingFormat.new(:'i.i', item.num.count('.'))
         else
@@ -175,13 +181,19 @@ module Slaw
         end
 
         @@a = NumberingFormat.new(:a, 0)
-        @@i = NumberingFormat.new(:i, 1)
-        @@aa = NumberingFormat.new(:aa, 2)
-        @@unknown = NumberingFormat.new(:unknown, 3)
+        @@A = NumberingFormat.new(:a, 1)
+        @@i = NumberingFormat.new(:i, 2)
+        @@I = NumberingFormat.new(:I, 3)
+        @@aa = NumberingFormat.new(:aa, 4)
+        @@AA = NumberingFormat.new(:AA, 5)
+        @@unknown = NumberingFormat.new(:unknown, 9)
 
         def self.a; @@a; end
+        def self.A; @@A; end
         def self.i; @@i; end
+        def self.I; @@I; end
         def self.aa; @@aa; end
+        def self.AA; @@AA; end
         def self.unknown; @@unknown; end
       end
     end

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/lib/slaw/za/act.treetop

@@ -88,8 +88,6 @@ module Slaw
 
       rule section_title_content
         space !numbered_statement_prefix content eol
-        # if a section title ends in a non-character or it's really long, it's probably section content
-        !{ |s| s[2].text_value[-1] =~ /[^a-zA-z]/ or s[2].text_value.length > 100 }
       end
 
       rule schedule_heading

data/lib/slaw/za/act_nodes.rb

@@ -22,11 +22,6 @@ module Slaw
           b.meta { |b|
             write_identification(b)
 
-            b.publication(date: '1980-01-01',
-                          name: 'Publication Name',
-                          number: 'XXXX',
-                          showAs: 'Publication Name')
-
             b.references(source: "#this") {
               b.TLCOrganization(id: 'slaw', href: 'https://github.com/longhotsummer/slaw', showAs: "Slaw")
               b.TLCOrganization(id: 'council', href: '/ontology/organization/za/council', showAs: "Council")

data/spec/parse/builder_spec.rb

@@ -300,6 +300,98 @@ XML
       )
     end
 
+    # -------------------------------------------------------------------------
+    it 'should handle (I) correctly' do
+      doc = xml2doc(subsection(<<XML
+              <blockList id="section-28.3.list2">
+                <item id="section-28.3.list2.g">
+                  <num>(g)</num>
+                  <p>all memorial work up to 150 mm in thickness must be securely attached to the base;</p>
+                </item>
+                <item id="section-28.3.list2.h">
+                  <num>(h)</num>
+                  <p>all the components of memorial work must be completed before being brought into a cemetery;</p>
+                </item>
+                <item id="section-28.3.list2.i">
+                  <num>(i)</num>
+                  <p>item i</p>
+                </item>
+                <item id="section-28.3.list2.I">
+                  <num>(I)</num>
+                  <p>a subitem</p>
+                </item>
+                <item id="section-28.3.list2.II">
+                  <num>(II)</num>
+                  <p>another subitem</p>
+                </item>
+                <item id="section-28.3.list2.j">
+                  <num>(j)</num>
+                  <p>in all cases where memorial work rests on a base -</p>
+                </item>
+                <item id="section-28.3.list2.i">
+                  <num>(i)</num>
+                  <p>such memorial work must have a foundation;</p>
+                </item>
+                <item id="section-28.3.list2.ii">
+                  <num>(ii)</num>
+                  <p>such memorial work must be set with cement mortar;</p>
+                </item>
+                <item id="section-28.3.list2.iii">
+                  <num>(iii)</num>
+                  <p>the bottom base of a single memorial work must not be less than 900mm long 220 mm wide x 250 mm thick and that of a double memorial work not less than 2 286 mm long x 200 mm wide x 250 mm thick; and</p>
+                </item>
+              </blockList>
+XML
+      ))
+
+      subject.nest_blocklists(doc)
+      doc.to_s.should == subsection(<<XML
+            <blockList id="section-28.3.list2">
+              <item id="section-28.3.list2.g">
+                <num>(g)</num>
+                <p>all memorial work up to 150 mm in thickness must be securely attached to the base;</p>
+              </item>
+              <item id="section-28.3.list2.h">
+                <num>(h)</num>
+                <p>all the components of memorial work must be completed before being brought into a cemetery;</p>
+              </item>
+              <item id="section-28.3.list2.i">
+                <num>(i)</num>
+                <blockList id="section-28.3.list2.i.list0">
+                  <listIntroduction>item i</listIntroduction>
+                  <item id="section-28.3.list2.i.list0.I">
+                    <num>(I)</num>
+                    <p>a subitem</p>
+                  </item>
+                  <item id="section-28.3.list2.i.list0.II">
+                    <num>(II)</num>
+                    <p>another subitem</p>
+                  </item>
+                </blockList>
+              </item>
+              <item id="section-28.3.list2.j">
+                <num>(j)</num>
+                <blockList id="section-28.3.list2.j.list1">
+                  <listIntroduction>in all cases where memorial work rests on a base -</listIntroduction>
+                  <item id="section-28.3.list2.j.list1.i">
+                    <num>(i)</num>
+                    <p>such memorial work must have a foundation;</p>
+                  </item>
+                  <item id="section-28.3.list2.j.list1.ii">
+                    <num>(ii)</num>
+                    <p>such memorial work must be set with cement mortar;</p>
+                  </item>
+                  <item id="section-28.3.list2.j.list1.iii">
+                    <num>(iii)</num>
+                    <p>the bottom base of a single memorial work must not be less than 900mm long 220 mm wide x 250 mm thick and that of a double memorial work not less than 2 286 mm long x 200 mm wide x 250 mm thick; and</p>
+                  </item>
+                </blockList>
+              </item>
+            </blockList>
+XML
+      )
+    end
+
     # -------------------------------------------------------------------------
 
     it 'should handle deeply nested lists' do

data/spec/za/act_spec.rb

@@ -505,23 +505,6 @@ EOS
       section.section_title.num.should == "2"
     end
 
-    it 'should handle sections without titles' do
-      subject.parser.options = {section_number_after_title: false}
-      node = parse :act, <<EOS
-1. No owner or occupier of any shop or business premises or vacant land, blah blah
-2. Notwithstanding the provision of any other By-law or legislation no person shall—
-EOS
-
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
-      section.section_title.title.should == "No owner or occupier of any shop or business premises or vacant land, blah blah"
-      section.section_title.num.should == "1"
-
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[1]
-      section.section_title.title.should == ""
-      section.section_title.num.should == "2"
-      section.subsections.elements[0].statement.clauses.text_value.should == "Notwithstanding the provision of any other By-law or legislation no person shall—"
-    end
-
     it 'should handle sections without titles and with subsections' do
       subject.parser.options = {section_number_after_title: false}
       node = parse :act, <<EOS
@@ -535,19 +518,6 @@ EOS
       section.subsections.elements[0].statement.num.should == "(1)"
       section.subsections.elements[0].statement.content.text_value.should == "Transporters must remove medical waste."
     end
-
-    it 'should realise complex section titles are actually section content' do
-      subject.parser.options = {section_number_after_title: false}
-      node = parse :act, <<EOS
-10. The owner of any premises which is let or sublet to more than one tenant, shall maintain at all times in a clean and sanitary condition every part of such premises as may be used in common by more than one tenant.
-11. No person shall keep, cause or suffer to be kept any factory or trade premises so as to cause or give rise to smells or effluvia that constitute a health nuisance.
-EOS
-
-      section = node.elements[1].elements[0].elements[1].elements[0].elements[1].elements[0]
-      section.section_title.title.should == ""
-      section.section_title.num.should == "10"
-      section.subsections.elements[0].statement.clauses.text_value.should == "The owner of any premises which is let or sublet to more than one tenant, shall maintain at all times in a clean and sanitary condition every part of such premises as may be used in common by more than one tenant."
-    end
   end
 
   #-------------------------------------------------------------------------------

metadata

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