slaw 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab0729eacd76a7bf7f4cd639986b5a892a635125
-  data.tar.gz: c9994dc951d991553f55709a22cd8d21e6bb9aa7
+  metadata.gz: 9da16bde12dc6832dbf6772de7205268e7ebe3d2
+  data.tar.gz: 74eb889730d1be5cf02a656f410cf66f7878fa50
 SHA512:
-  metadata.gz: 4d40d3cba28815aed221a31216dc6d337300f0cc74925e816f974c5a42e3e427a88b2a18010aafb554bc9b9ffc4fe691b7d4bcadeadfee6022bb198e2425c469
-  data.tar.gz: 42653d4f00bf24f9d7345938255ab49d725ef197adda131410d7317dd8d30dcec34f61cf66c6da48dcffbaf57fd63a61398973c332cd98a9d763c3a3d80cf734
+  metadata.gz: c5b5d462affc8dc8e2a39fffee9c6612f1755746a9c5c3c31b654515f9062dd060ef0f9aebc383dd92e1799db583bac41ccb72abc0bdeaec3e44051f54fd9932
+  data.tar.gz: d06d15f2768bd2abb2aae5ca2919975d55e75acde2e4c256099c96e75aac84b01cb43832db2146836be9c864a945045100778c8897f901c0eb54a434d8626c37

data/README.md

@@ -213,3 +213,14 @@ Akoma Ntoso `component` elements at the end of the XML document, with a name of
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Changelog
+
+### 0.7.2
+
+* add --section-number-position argument to slaw command
+* grammar supports empty chapters and parts
+
+### 0.7.1
+
+* major changes to grammar to permit chapters, parts, sections etc. in schedules

data/bin/slaw

@@ -14,6 +14,7 @@ class SlawCLI < Thor
   option :definitions, type: :boolean, desc: "Find and link definitions (this can be slow). Default: false"
   option :fragment, type: :string, desc: "Akoma Ntoso element name that the imported text represents. Support depends on the grammar."
   option :id_prefix, type: :string, desc: "Prefix to be used when generating ID elements when parsing a fragment."
+  option :section_number_position, enum: ['before-title', 'after-title', 'guess'], desc: "Where do section titles come in relation to the section number? Default: before-title"
   def parse(name)
     logging
 
@@ -56,6 +57,18 @@ class SlawCLI < Thor
       end
     end
 
+    case (options[:section_number_position] || "before-title")
+    when "before-title"
+      generator.parser.options[:section_number_after_title] = false
+    when "after-title"
+      generator.parser.options[:section_number_after_title] = true
+    when "guess"
+      after = generator.guess_section_number_after_title(text)
+      error "guessed section number position is #{after ? "after-title" : "before-title"}"
+
+      generator.parser.options[:section_number_after_title] = after
+    end
+
     begin
       act = generator.generate_from_text(text)
     rescue Slaw::Parse::ParseError => e

data/lib/slaw/generator.rb

@@ -35,5 +35,24 @@ module Slaw
       text = @cleanser.reformat(text)
       text
     end
+
+    # Try to determine if section numbers come after titles,
+    # rather than before.
+    #
+    # eg:
+    #
+    #   Section title
+    #   1. Section content
+    #
+    # versus
+    #
+    #   1. Section title
+    #   Section content
+    def guess_section_number_after_title(text)
+      before = text.scan(/^\w{4,}[^\n]+\n\d+\. /).length
+      after  = text.scan(/^\s*\n\d+\. \w{4,}/).length
+
+      before > after * 1.25
+    end
   end
 end

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/slaw/za/act.treetop

@@ -36,13 +36,13 @@ module Slaw
 
       rule chapter
         heading:chapter_heading
-        children:(part / section / block_paragraphs / subsection)+
+        children:(part / section / block_paragraphs / subsection)*
         <Chapter>
       end
 
       rule part
         heading:part_heading
-        children:(section / block_paragraphs / subsection)+
+        children:(section / block_paragraphs / subsection)*
         <Part>
       end
 

data/spec/generator_spec.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+require 'slaw'
+
+describe Slaw::ActGenerator do
+  describe 'guess_section_number_after_title' do
+    context 'section number after title' do
+      it 'should work' do
+        text = "
+Section title
+1. Section content
+
+Another section title
+2. Section content that is long.
+"
+        subject.guess_section_number_after_title(text).should be_true
+      end
+    end
+
+    context 'section number before title' do
+      it 'should default to false' do
+        subject.guess_section_number_after_title("").should be_false
+      end
+
+      it 'should be false' do
+        text = "
+Mistaken title
+1. Section title
+
+Some content.
+
+2. Second title
+
+Some content.
+"
+        subject.guess_section_number_after_title(text).should be_false
+      end
+    end
+  end
+end

data/spec/za/act_spec.rb

@@ -215,6 +215,23 @@ EOS
   </section>
 </chapter>'
     end
+
+    it 'should handle empty chapters' do
+      node = parse :body, <<EOS
+Chapter 2 The Chapter Heading
+Chapter 3 The Other Heading
+EOS
+      to_xml(node).should == '<body>
+  <chapter id="chapter-2">
+    <num>2</num>
+    <heading>The Chapter Heading</heading>
+  </chapter>
+  <chapter id="chapter-3">
+    <num>3</num>
+    <heading>The Other Heading</heading>
+  </chapter>
+</body>'
+    end
   end
 
   #-------------------------------------------------------------------------------
@@ -382,6 +399,23 @@ EOS
   </section>
 </part>'
     end
+
+    it 'should handle empty parts' do
+      node = parse :body, <<EOS
+Part 2 The Part Heading
+Part 3 The Other Heading
+EOS
+      to_xml(node).should == '<body>
+  <part id="part-2">
+    <num>2</num>
+    <heading>The Part Heading</heading>
+  </part>
+  <part id="part-3">
+    <num>3</num>
+    <heading>The Other Heading</heading>
+  </part>
+</body>'
+    end
   end
 
   #-------------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,6 +196,7 @@ files:
 - spec/bylaw_spec.rb
 - spec/extract/extractor_spec.rb
 - spec/fixtures/community-fire-safety.xml
+- spec/generator_spec.rb
 - spec/parse/builder_spec.rb
 - spec/parse/cleanser_spec.rb
 - spec/spec_helper.rb
@@ -230,6 +231,7 @@ test_files:
 - spec/bylaw_spec.rb
 - spec/extract/extractor_spec.rb
 - spec/fixtures/community-fire-safety.xml
+- spec/generator_spec.rb
 - spec/parse/builder_spec.rb
 - spec/parse/cleanser_spec.rb
 - spec/spec_helper.rb