slaw 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eeb58782b2816f1d5a79ff2ca9c58a01b31ae98
-  data.tar.gz: 263785f7925b2f7634b32823e421748e75bc7c71
+  metadata.gz: c547c592602183d308cb921d933342705d3abfc5
+  data.tar.gz: 6c51e8eb899baa73562df3e6ce80f6d29ad7e048
 SHA512:
-  metadata.gz: 6faaf2748a1b641f8e7f375d08ef070a36d1e3a1d1c25e3ecda4af0e18e5d7f488f831bf3859857f95c95725605c4d9127bfb7ff19c5e394dfde002dc309bd7a
-  data.tar.gz: fd534bb5d9b6d8fee1d004c30c0657df1ca2ab6625a938c0a1ad6aad03c22bd399c9b2e3dbb53cddbd06be9a834990b18f050bc71a2393d16117d88cb44928d2
+  metadata.gz: b529abf4b1c3040c3217a02ea2abf5ac534f76cca5863b0c5d84049a835d5a835247d0b0768c75bf80aae9cefdca57409573f162cad4e78324a28c6f84646f01
+  data.tar.gz: 5405a71b050b492e998e01a6e29d8c7cf02d498912759207902b81114bbc76e3aae487d0de1112a23114e7c4aabf8f04d9c634be2ee326168e49237f75d72997

data/lib/slaw/version.rb

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

data/lib/slaw/za/act.treetop

@@ -117,7 +117,7 @@ module Slaw
       end
 
       rule schedule_statement
-        space? (!schedule_heading) content eol
+        space? (!schedule_heading) clauses eol
         <ScheduleStatement>
       end
 

data/lib/slaw/za/act_nodes.rb

@@ -453,7 +453,7 @@ module Slaw
 
       class ScheduleStatement < Treetop::Runtime::SyntaxNode
         def to_xml(b, idprefix)
-          b.p(content.text_value) if content
+          b.p { |b| clauses.to_xml(b, idprefix) } if clauses
         end
       end
     end

data/spec/za/act_spec.rb

@@ -402,6 +402,55 @@ EOS
   </subsection>
 </section>'
     end
+
+    it 'should handle a remark in a schedule' do
+      node = parse :schedule, <<EOS
+      Schedule 1
+      A Title
+
+      [[Schedule 1 added by Act 23 of 2004]]
+
+      Some content
+EOS
+      to_xml(node, "").should == '<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" as="#author"/>
+        <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" as="#author"/>
+        <FRBRlanguage language="eng"/>
+      </FRBRExpression>
+      <FRBRManifestation>
+        <FRBRthis value="/za/act/1980/01/eng@/schedule1"/>
+        <FRBRuri value="/za/act/1980/01/eng@"/>
+        <FRBRdate date="2015-05-20" name="Generation"/>
+        <FRBRauthor href="#slaw" as="#author"/>
+      </FRBRManifestation>
+    </identification>
+  </meta>
+  <mainBody>
+    <article id="schedule-1">
+      <heading>A Title</heading>
+      <content>
+        <p>
+          <remark status="editorial">[Schedule 1 added by Act 23 of 2004]</remark>
+        </p>
+        <p>Some content</p>
+      </content>
+    </article>
+  </mainBody>
+</doc>'
+    end
   end
 
   #-------------------------------------------------------------------------------
@@ -534,9 +583,9 @@ EOS
 
       sched = node.schedules.elements[0]
       sched.schedule_heading.schedule_heading_prefix.text_value.should == "Schedule"
-      sched.statements.elements[0].content.text_value.should == "Subject to approval in terms of this By-Law, the erection:"
-      sched.statements.elements[1].content.text_value.should == "1. Foo"
-      sched.statements.elements[2].content.text_value.should == "2. Bar"
+      sched.statements.elements[0].clauses.text_value.should == "Subject to approval in terms of this By-Law, the erection:"
+      sched.statements.elements[1].clauses.text_value.should == "1. Foo"
+      sched.statements.elements[2].clauses.text_value.should == "2. Bar"
     end
 
     it 'should handle many schedules' do
@@ -555,15 +604,15 @@ EOS
       sched.schedule_heading.schedule_heading_prefix.text_value.should == "Schedule"
       sched.schedule_heading.schedule_title.content.text_value.should == "A Title"
       sched.schedule_heading.num.text_value.should == "1"
-      sched.statements.elements[0].content.text_value.should == "1. Foo"
-      sched.statements.elements[1].content.text_value.should == "2. Bar"
+      sched.statements.elements[0].clauses.text_value.should == "1. Foo"
+      sched.statements.elements[1].clauses.text_value.should == "2. Bar"
 
       sched = node.schedules.elements[1]
       sched.schedule_heading.schedule_heading_prefix.text_value.should == "Schedule"
       sched.schedule_heading.schedule_title.content.text_value.should == "Another Title"
       sched.schedule_heading.num.text_value.should == "2"
-      sched.statements.elements[0].content.text_value.should == "Baz"
-      sched.statements.elements[1].content.text_value.should == "Boom"
+      sched.statements.elements[0].clauses.text_value.should == "Baz"
+      sched.statements.elements[1].clauses.text_value.should == "Boom"
     end
 
     it 'should serialise many schedules correctly' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Greg Kempe