RubyGems - slaw - Versions diffs - 4.0.0 → 4.1.0 - Mend

slaw 4.0.0 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/README.md +4 -0
data/lib/slaw/grammars/za/act.treetop +5 -2
data/lib/slaw/grammars/za/act_nodes.rb +7 -5
data/lib/slaw/grammars/za/act_text.xsl +7 -0
data/lib/slaw/version.rb +1 -1
data/spec/generator_spec.rb +18 -6
data/spec/za/act_block_spec.rb +95 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feed0253f8ca8bfc11a4b7d8b844a66a4b50caf5ada01ec470cb8fb295f015da
-  data.tar.gz: 31d43678f703b65e07e728cee6be876fa0b91d5f921a05147b4ce19c4d696ed2
+  metadata.gz: a7b2b24c5c8bd91ce9c0a852f6bec6c81e3719830d65f9e0691044b303d019b7
+  data.tar.gz: cf91c1517334866b6a9f8c62baed484c8ef8a35c10d0c3e1fc42ae104382e37c
 SHA512:
-  metadata.gz: 0c966ce6ba9b80aa2d6de457150a83a6d26fbc0ad14d75ebee0fbb15dd3e9784723845b22222f525da370e3d170208199a723d08078a7640ae578b190296f78e
-  data.tar.gz: fa39619402b136aa5f3ef74db739b74b588b2c7a06f790ac4405be6f52e3927c9110400df9e1afeef5fd523012c31222b4e1fd287b0fb5df870ae120ef1d7907
+  metadata.gz: 9e123803b17d5ad1c4d6530daad110715312f83f83901bbc0bac859af3dee15a4345964a9e4b0fd83795c7ff4595d69ed58afab8bc333b2650c2d77316e4dfd7
+  data.tar.gz: da86501ff2f5854d3433ac8a9c87613dd534ce2581206eb99984d2deeec2655da32980905bbf44bdc66723c17f03e13aff488b11f45d0672c5712968fcc9e12b

data/README.md CHANGED Viewed

@@ -81,6 +81,10 @@ You can create your own grammar by creating a gem that provides these files and
 ## Changelog
+### 4.1.0 (4 June 2019)
+* BODY marks start of body
 ### 4.0.0 (29 May 2019)
 * Preserve whitespace for mixed content nodes

data/lib/slaw/grammars/za/act.treetop CHANGED Viewed

@@ -29,16 +29,19 @@ module Slaw
         rule preface
           !'PREAMBLE'
+          !'BODY'
           ('PREFACE'i space? eol)?
-          statements:(!'PREAMBLE' preface_statement)* <Preface>
+          statements:(!'PREAMBLE' !'BODY' preface_statement)* <Preface>
         end
         rule preamble
+          !'BODY'
           'PREAMBLE'i space? eol
-          statements:preamble_statement* <Preamble>
+          statements:(!'BODY' preamble_statement)* <Preamble>
         end
         rule body
+          ('BODY' space? eol)?
           children:(chapter / part / section / subsection / generic_container)+ <Body>
         end

data/lib/slaw/grammars/za/act_nodes.rb CHANGED Viewed

@@ -79,9 +79,10 @@ module Slaw
         class Preface < Treetop::Runtime::SyntaxNode
           def to_xml(b, *args)
-            if text_value != ""
+            stmts = statements.elements
+            if !stmts.empty?
               b.preface { |b|
-                statements.elements.each { |element|
+                stmts.each { |element|
                   for e in element.elements
                     e.to_xml(b, "") if e.respond_to? :to_xml
                   end
@@ -119,10 +120,11 @@ module Slaw
         class Preamble < Treetop::Runtime::SyntaxNode
           def to_xml(b, *args)
-            if text_value != ""
+            stmts = statements.elements
+            if !stmts.empty?
               b.preamble { |b|
-                statements.elements.each { |e|
-                  e.to_xml(b, "")
+                stmts.each { |e|
+                  e.preamble_statement.to_xml(b, "")
                 }
               }
             end

data/lib/slaw/grammars/za/act_text.xsl CHANGED Viewed

@@ -55,6 +55,13 @@
     <xsl:apply-templates />
   </xsl:template>
+  <xsl:template match="a:body">
+    <xsl:text>BODY</xsl:text>
+    <xsl:text>&#10;&#10;</xsl:text>
+    <xsl:apply-templates />
+  </xsl:template>
   <xsl:template match="a:part">
     <xsl:text>Part </xsl:text>
     <xsl:value-of select="a:num" />

data/lib/slaw/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/spec/generator_spec.rb CHANGED Viewed

@@ -72,7 +72,9 @@ XML
       ))
       text = subject.text_from_act(doc)
-      text.should == '1. Section
+      text.should == 'BODY
+1. Section
 \Chapter 2 ignored
@@ -136,7 +138,9 @@ XML
       ))
       text = subject.text_from_act(doc)
-      text.should == '1. Section
+      text.should == 'BODY
+1. Section
 \(2) A special meeting [[ foo ]]:
@@ -162,7 +166,9 @@ XML
       ))
       text = subject.text_from_act(doc)
-      text.should == '1.
+      text.should == 'BODY
+1.
 [[ foo ]]
@@ -183,7 +189,9 @@ XML
       ))
       text = subject.text_from_act(doc)
-      text.should == '1.
+      text.should == 'BODY
+1.
 Hello [there](/za/act/123) friend.
@@ -210,7 +218,9 @@ XML
       ))
       text = subject.text_from_act(doc)
-      text.should == '1.
+      text.should == 'BODY
+1.
 {|
 |-
@@ -239,7 +249,9 @@ Subject to approval in terms of this By-Law.
 EOS
 )
       s = subject.text_from_act(doc)
-      s.should == '1. Something
+      s.should == 'BODY
+1. Something
 SCHEDULE - First Schedule [[remark]]
 Subheading [[another]]

data/spec/za/act_block_spec.rb CHANGED Viewed

@@ -140,6 +140,33 @@ EOS
       </content>
     </paragraph>
   </section>
+</body>'
+    end
+    it 'should understand a body marker' do
+      node = parse :body, <<EOS
+BODY
+Some content before the section
+1. Section
+Hello there
+EOS
+      to_xml(node).should == '<body>
+  <paragraph id="paragraph0">
+    <content>
+      <p>Some content before the section</p>
+    </content>
+  </paragraph>
+  <section id="section-1">
+    <num>1.</num>
+    <heading>Section</heading>
+    <paragraph id="section-1.paragraph0">
+      <content>
+        <p>Hello there</p>
+      </content>
+    </paragraph>
+  </section>
 </body>'
     end
   end
@@ -1137,7 +1164,7 @@ EOS
 </preamble>'
     end
-    it 'should support prefaces and preambles' do
+    it 'should support explicit preface and preamble' do
       node = parse :act, <<EOS
 PREFACE
 this is in the preface
@@ -1156,6 +1183,33 @@ EOS
   <p>this is in the preamble</p>
 </preamble>'
     end
+    it 'should obey a BODY marker' do
+      node = parse :act, <<EOS
+PREFACE
+this is in the preface
+PREAMBLE
+this is in the preamble
+BODY
+this is in the body
+EOS
+      to_xml(node.preface).should == '<preface>
+  <p>this is in the preface</p>
+</preface>'
+      to_xml(node.preamble).should == '<preamble>
+  <p>this is in the preamble</p>
+</preamble>'
+      to_xml(node.body).should == '<body>
+  <paragraph id="paragraph0">
+    <content>
+      <p>this is in the body</p>
+    </content>
+  </paragraph>
+</body>'
+    end
   end
   #-------------------------------------------------------------------------------
@@ -1228,6 +1282,46 @@ EOS
   <p>PREAMBLE</p>
 </preamble>'
     end
+    it 'should handle weird preamble indicators' do
+      node = parse :act, <<EOS
+BODY
+PREAMBLE
+this is actually in the body
+EOS
+      to_xml(node.body).should == '<body>
+  <paragraph id="paragraph0">
+    <content>
+      <p>PREAMBLE</p>
+      <p>this is actually in the body</p>
+    </content>
+  </paragraph>
+</body>'
+    end
+    it 'should handle weird preface indicators' do
+      node = parse :act, <<EOS
+PREFACE
+BODY
+PREFACE
+this is actually in the body
+EOS
+      to_xml(node.body).should == '<body>
+  <paragraph id="paragraph0">
+    <content>
+      <p>PREFACE</p>
+      <p>this is actually in the body</p>
+    </content>
+  </paragraph>
+</body>'
+    end
   end
   #-------------------------------------------------------------------------------

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Greg Kempe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake