slaw 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa99a0d10c55f90c3cc64dc38caf91b986b94ab1
-  data.tar.gz: afd8583f42680e2caa287d5ebc993b616e4eeac8
+  metadata.gz: c18d054d1825b20bfc2dcf608a445e2d4b3a0c6a
+  data.tar.gz: 73cc58395c8f2d8dda8117d592f7c9faf48e57b2
 SHA512:
-  metadata.gz: 617cfdd201458cf85da6ea524e8e97ee955473825e1064fc86684adfcd9418faca2c9a4626c8c0654e3ecdcd2705199ab154c7cd1bd8a018380e8654ccaae842
-  data.tar.gz: 6c987cb5f14663c1e5ad5fa73af06554afc2b1cd4a6ea2732592ab5b7180aa3834799e449f68c315ed1e0d1396f5b4b7b5371bd31e682011924e56b29308adc7
+  metadata.gz: b91f7c896b92dcd42cf81bb23118921db55653695c9f65093a917f9e3d0fc3b849f11f9ce1e6b494cd85df5ac8ba84d871bd6c472c001fffa3f4c41c1fecdcbd
+  data.tar.gz: 317aba38148c36f8753009ff417e8bca9550e101a0ef4e5f18e923170ddf4a7f121b312eadf98b9b8b33d626f703c7b65696e0bae5cad4f3adbc6efa03b1ce2e

data/lib/slaw/version.rb

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

data/lib/slaw/za/act.treetop

@@ -38,7 +38,7 @@ module Slaw
       end
 
       rule subsection
-        statement:(numbered_statement / naked_statement)
+        statement:(numbered_statement / table / naked_statement)
         blocklist:blocklist? <Subsection>
       end
 
@@ -48,7 +48,7 @@ module Slaw
 
       rule schedule
         schedule_heading
-        statements:schedule_statement* <Schedule>
+        statements:(table / schedule_statement)* <Schedule>
       end
 
       ##########
@@ -120,6 +120,23 @@ module Slaw
 
       rule schedule_statement
         space? (!schedule_heading) content eol
+        <ScheduleStatement>
+      end
+
+      ##########
+      # tables
+
+      rule table
+        space? table_start eol? (!table_end content eol)* table_end eol
+        <Table>
+      end
+
+      rule table_start
+        space? '{|'
+      end
+
+      rule table_end
+        space? '|}'
       end
 
       ##########

data/lib/slaw/za/act_nodes.rb

@@ -1,3 +1,5 @@
+require 'wikicloth'
+
 module Slaw
   module ZA
     module Act
@@ -252,7 +254,7 @@ module Slaw
                 end
               else
                 # raw content
-                b.p(statement.content.text_value) if statement.content
+                statement.to_xml(b, idprefix)
               end
             }
           }
@@ -275,9 +277,16 @@ module Slaw
             elements[3].content
           end
         end
+
+        def to_xml(b, idprefix)
+          b.p(content.text_value) if content
+        end
       end
 
       class NakedStatement < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.p(content.text_value) if content
+        end
       end
 
       class Blocklist < Treetop::Runtime::SyntaxNode
@@ -313,6 +322,31 @@ module Slaw
         end
       end
 
+      class Table < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          # parse the table using wikicloth
+          html = WikiCloth::Parser.new({data: self.text_value}).to_html
+
+          # we need to strip any surrounding p tags and add
+          # an id to the table
+          html = Nokogiri::HTML(html)
+          table = html.css("table").first
+          table['id'] = "#{idprefix}table0"
+
+          # wrap td and th content in p tags
+          table.css("td, th").each do |cell|
+            p = Nokogiri::XML::Node.new("p", html)
+            p.children = cell.children
+            p.parent = cell
+          end
+
+          table.xpath('//text()[1]').each{ |t|      t.content = t.content.lstrip }
+          table.xpath('//text()[last()]').each{ |t| t.content = t.content.rstrip }
+
+          b << table.to_html
+        end
+      end
+
       class ScheduleContainer < Treetop::Runtime::SyntaxNode
         def to_xml(b)
           return if schedules.elements.empty?
@@ -389,13 +423,19 @@ module Slaw
               b.article(id: id) { |b|
                 b.heading(heading) if heading
                 b.content { |b|
-                  statements.elements.each { |e| b.p(e.content.text_value) }
+                  statements.elements.each { |e| e.to_xml(b, id + '.') }
                 }
               }
             }
           }
         end
       end
+
+      class ScheduleStatement < Treetop::Runtime::SyntaxNode
+        def to_xml(b, idprefix)
+          b.p(content.text_value) if content
+        end
+      end
     end
   end
 end

data/slaw.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 0.19.1"
   spec.add_runtime_dependency "mimemagic", "~> 0.2.1"
   spec.add_runtime_dependency 'yomu', '~> 0.2.2'
+  spec.add_runtime_dependency 'wikicloth', '~> 0.8.3'
 end

data/spec/za/act_spec.rb

@@ -21,10 +21,10 @@ describe Slaw::ActGenerator do
     end
   end
 
-  def to_xml(node)
+  def to_xml(node, *args)
     s = ""
     b = Builder::XmlMarkup.new(target: s)
-    node.to_xml(b)
+    node.to_xml(b, *args)
     s
   end
 
@@ -548,4 +548,68 @@ EOS
 EOS
     end
   end
+
+  describe 'tables' do
+    it 'should parse basic tables' do
+      node = parse :table, <<EOS
+{|
+| r1c1
+| r1c2
+|-
+| r2c1
+| r2c2
+|}
+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>
+<td><p>r1c2</p></td></tr>
+<tr><td><p>r2c1</p></td>
+<td><p>r2c2</p></td></tr></table>'
+    end
+
+    it 'should parse a table in a section' do
+      node = parse :section, <<EOS
+10. A section title
+
+Heres a table:
+
+{|
+| r1c1
+| r1c2
+|-
+| r2c1
+| r2c2
+|}
+EOS
+
+      xml = to_xml(node)
+      xml.should == '<section id="section-10"><num>10.</num><heading>A section title</heading><subsection id="section-10.subsection-0"><content><p>Heres a table:</p></content></subsection><subsection id="section-10.subsection-1"><content><table id="section-10.subsection-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></subsection></section>'
+    end
+
+    it 'should parse a table in a schedule' do
+      node = parse :schedule, <<EOS
+Schedule 1
+
+Heres a table:
+
+{|
+| r1c1
+| r1c2
+|-
+| r2c1
+| r2c2
+|}
+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>
+<td><p>r1c2</p></td></tr>
+<tr><td><p>r2c1</p></td>
+<td><p>r2c2</p></td></tr></table></content></article></mainBody></doc>'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: wikicloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 description: Slaw is a lightweight library for rendering and generating Akoma Ntoso
   acts from plain text and PDF documents.
 email: