slaw 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18d054d1825b20bfc2dcf608a445e2d4b3a0c6a
-  data.tar.gz: 73cc58395c8f2d8dda8117d592f7c9faf48e57b2
+  metadata.gz: 0ba2a75b8de3436b8af7bd0267176fb82a1476a9
+  data.tar.gz: e292f43cb16ce86cd9c599f0f25410216ae1e33c
 SHA512:
-  metadata.gz: b91f7c896b92dcd42cf81bb23118921db55653695c9f65093a917f9e3d0fc3b849f11f9ce1e6b494cd85df5ac8ba84d871bd6c472c001fffa3f4c41c1fecdcbd
-  data.tar.gz: 317aba38148c36f8753009ff417e8bca9550e101a0ef4e5f18e923170ddf4a7f121b312eadf98b9b8b33d626f703c7b65696e0bae5cad4f3adbc6efa03b1ce2e
+  metadata.gz: a0f6476e7912dd560d78b59495dc25bdec405c19f91d73dfa33a2a2270f25aa48da7d6545292acf4c9f23e17d66fc0c3e4806f2412b223b5c0415442b76e65c6
+  data.tar.gz: e4ac81e36adb6fe221b3eedcb4f2e761fc01dd0dbd92b7d293c060df50fbbb21984f5af747efbb12f715cd4d2dd25f5ce03e330366b0a39af8a63812446f049b

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/slaw/za/act.treetop

@@ -38,7 +38,7 @@ module Slaw
       end
 
       rule subsection
-        statement:(numbered_statement / table / naked_statement)
+        statement:(numbered_statement / table / remark / naked_statement)
         blocklist:blocklist? <Subsection>
       end
 
@@ -139,6 +139,12 @@ module Slaw
         space? '|}'
       end
 
+      rule remark
+        # TODO: support (Section 3.5 amended by ... )
+        space? '[' content:[^\n\]]+ ']' eol
+        <Remark>
+      end
+
       ##########
       # prefixes
 

data/lib/slaw/za/act_nodes.rb

@@ -289,6 +289,12 @@ module Slaw
         end
       end
 
+      class Remark < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.p { |b| b.remark('[' + content.text_value + ']', status: 'editorial') }
+        end
+      end
+
       class Blocklist < Treetop::Runtime::SyntaxNode
         # Render a block list to xml. If a block is given,
         # yield to it a builder to insert a listIntroduction node

data/spec/za/act_spec.rb

@@ -21,9 +21,9 @@ describe Slaw::ActGenerator do
     end
   end
 
-  def to_xml(node, *args)
+  def to_xml(node, indent=nil, *args)
     s = ""
-    b = Builder::XmlMarkup.new(target: s)
+    b = Builder::XmlMarkup.new(target: s, indent: indent)
     node.to_xml(b, *args)
     s
   end
@@ -195,6 +195,50 @@ EOS
     end
   end
 
+  #-------------------------------------------------------------------------------
+  # Remarks
+
+  describe 'remark' do
+    it 'should handle basic remarks' do
+      should_parse :remark, <<EOS
+      [Section 2 amended by Act 23 of 2004]
+EOS
+    end
+
+    it 'should handle a remark' do
+      node = parse :remark, <<EOS
+      [Section 2 amended by Act 23 of 2004]
+EOS
+      node.content.text_value.should == "Section 2 amended by Act 23 of 2004"
+    end
+
+    it 'should handle a remark in a section' do
+      node = parse :section, <<EOS
+      1. Section title
+      Some text is a long line.
+
+      [Section 1 amended by Act 23 of 2004]
+EOS
+      to_xml(node, 2).should == '<section id="section-1">
+  <num>1.</num>
+  <heading>Section title</heading>
+  <subsection id="section-1.subsection-0">
+    <content>
+      <p>Some text is a long line.</p>
+    </content>
+  </subsection>
+  <subsection id="section-1.subsection-1">
+    <content>
+      <p>
+        <remark status="editorial">[Section 1 amended by Act 23 of 2004]</remark>
+      </p>
+    </content>
+  </subsection>
+</section>
+'
+    end
+  end
+
   #-------------------------------------------------------------------------------
   # Numbered statements
 
@@ -399,13 +443,8 @@ Baz
 Boom
 EOS
 
-      s = ""
-      builder = ::Builder::XmlMarkup.new(indent: 2, target: s)
-
-      node.to_xml(builder)
-
+      s = to_xml(node, 2)
       today = Time.now.strftime('%Y-%m-%d')
-
       s.should == <<EOS
 <components>
   <component id="component-1">
@@ -497,13 +536,8 @@ Other than as is set out hereinbelow, no signs other than locality bound signs,
 2. Bar
 EOS
 
-      s = ""
-      builder = ::Builder::XmlMarkup.new(indent: 2, target: s)
-
-      node.to_xml(builder)
-
+      s = to_xml(node, 2)
       today = Time.now.strftime('%Y-%m-%d')
-
       s.should == <<EOS
 <components>
   <component id="component-1">
@@ -562,7 +596,7 @@ EOS
 EOS
 
       node.text_value.should == "{|\n| r1c1\n| r1c2\n|-\n| r2c1\n| r2c2\n|}\n"
-      to_xml(node, "prefix.").should == '<table id="prefix.table0"><tr><td><p>r1c1</p></td>
+      to_xml(node, nil, "prefix.").should == '<table id="prefix.table0"><tr><td><p>r1c1</p></td>
 <td><p>r1c2</p></td></tr>
 <tr><td><p>r2c1</p></td>
 <td><p>r2c2</p></td></tr></table>'
@@ -605,8 +639,9 @@ Heres a table:
 |}
 EOS
 
-      xml = to_xml(node, "")
-      xml.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-13" name="Generation"/><FRBRauthor href="#slaw" as="#author"/></FRBRManifestation></identification></meta><mainBody><article id="schedule-1"><content><p>Heres a table:</p><table id="schedule-1.table0"><tr><td><p>r1c1</p></td>
+      xml = to_xml(node, nil, "")
+      today = Time.now.strftime('%Y-%m-%d')
+      xml.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="' + today + '" name="Generation"/><FRBRauthor href="#slaw" as="#author"/></FRBRManifestation></identification></meta><mainBody><article id="schedule-1"><content><p>Heres a table:</p><table id="schedule-1.table0"><tr><td><p>r1c1</p></td>
 <td><p>r1c2</p></td></tr>
 <tr><td><p>r2c1</p></td>
 <td><p>r2c2</p></td></tr></table></content></article></mainBody></doc>'

metadata

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