slaw 0.17.2 → 1.0.0.alpha.1

data/spec/za/act_block_spec.rb

@@ -3,6 +3,8 @@
 require 'slaw'
 
 describe Slaw::ActGenerator do
+  subject { Slaw::ActGenerator.new('za') }
+
   def parse(rule, s)
     subject.builder.text_to_syntax_tree(s, {root: rule})
   end
@@ -1897,12 +1899,12 @@ EOS
     it 'should handle a clause with a remark' do
       node = parse :clauses, "simple [[remark]]. text"
       node.text_value.should == "simple [[remark]]. text"
-      node.elements[7].is_a?(Slaw::ZA::Act::Remark).should be_true
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be_true
 
       node = parse :clauses, "simple [[remark]][[another]] text"
       node.text_value.should == "simple [[remark]][[another]] text"
-      node.elements[7].is_a?(Slaw::ZA::Act::Remark).should be_true
-      node.elements[7].is_a?(Slaw::ZA::Act::Remark).should be_true
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be_true
+      node.elements[7].is_a?(Slaw::Grammars::ZA::Act::Remark).should be_true
     end
   end
 end

data/spec/za/act_inline_spec.rb

@@ -3,6 +3,8 @@
 require 'slaw'
 
 describe Slaw::ActGenerator do
+  subject { Slaw::ActGenerator.new('za') }
+
   def parse(rule, s)
     subject.builder.text_to_syntax_tree(s, {root: rule})
   end

data/spec/za/act_schedules_spec.rb

@@ -3,6 +3,8 @@
 require 'slaw'
 
 describe Slaw::ActGenerator do
+  subject { Slaw::ActGenerator.new('za') }
+
   def parse(rule, s)
     subject.builder.text_to_syntax_tree(s, {root: rule})
   end

data/spec/za/act_table_spec.rb

@@ -3,6 +3,8 @@
 require 'slaw'
 
 describe Slaw::ActGenerator do
+  subject { Slaw::ActGenerator.new('za') }
+
   def parse(rule, s)
     subject.builder.text_to_syntax_tree(s, {root: rule})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,19 @@ files:
 - lib/slaw/extract/html_to_akn_text.xsl
 - lib/slaw/extract/yomu_patch.rb
 - lib/slaw/generator.rb
+- lib/slaw/grammars/core_nodes.rb
+- lib/slaw/grammars/inlines.treetop
+- lib/slaw/grammars/inlines_nodes.rb
+- lib/slaw/grammars/pl/act.treetop
+- lib/slaw/grammars/pl/act_nodes.rb
+- lib/slaw/grammars/schedules.treetop
+- lib/slaw/grammars/schedules_nodes.rb
+- lib/slaw/grammars/tables.treetop
+- lib/slaw/grammars/tables_nodes.rb
+- lib/slaw/grammars/terminals.treetop
+- lib/slaw/grammars/za/act.treetop
+- lib/slaw/grammars/za/act_nodes.rb
+- lib/slaw/grammars/za/act_text.xsl
 - lib/slaw/lifecycle_event.rb
 - lib/slaw/logging.rb
 - lib/slaw/namespace.rb
@@ -190,9 +203,6 @@ files:
 - lib/slaw/schemas/xml.xsd
 - lib/slaw/version.rb
 - lib/slaw/xml_support.rb
-- lib/slaw/za/act.treetop
-- lib/slaw/za/act_nodes.rb
-- lib/slaw/za/act_text.xsl
 - slaw.gemspec
 - spec/act_spec.rb
 - spec/bylaw_spec.rb
@@ -201,6 +211,7 @@ files:
 - spec/generator_spec.rb
 - spec/parse/builder_spec.rb
 - spec/parse/cleanser_spec.rb
+- spec/pl/act_block_spec.rb
 - spec/spec_helper.rb
 - spec/xml_helpers.rb
 - spec/za/act_block_spec.rb
@@ -222,9 +233,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12
@@ -239,6 +250,7 @@ test_files:
 - spec/generator_spec.rb
 - spec/parse/builder_spec.rb
 - spec/parse/cleanser_spec.rb
+- spec/pl/act_block_spec.rb
 - spec/spec_helper.rb
 - spec/xml_helpers.rb
 - spec/za/act_block_spec.rb

data/lib/slaw/za/act.treetop

@@ -1,393 +0,0 @@
-# encoding: UTF-8
-
-require 'slaw/parse/grammar_helpers'
-require 'slaw/za/act_nodes'
-
-module Slaw
-  module ZA
-    grammar Act
-      include Slaw::Parse::GrammarHelpers
-
-      ########
-      # major containers
-
-      rule act
-        empty_line*
-        preface:preface?
-        preamble:preamble?
-        body
-        schedules:schedules_container? <Act>
-      end
-
-      rule preface
-        !'PREAMBLE'
-        ('PREFACE'i space? eol)?
-        statements:(!'PREAMBLE' pre_body_statement)* <Preface>
-      end
-
-      rule preamble
-        'PREAMBLE'i space? eol
-        statements:pre_body_statement* <Preamble>
-      end
-
-      rule body
-        children:(chapter / part / section / subsection / block_paragraphs)+ <Body>
-      end
-
-      rule chapter
-        heading:chapter_heading
-        children:(part / section / subsection / block_paragraphs)*
-        <Chapter>
-      end
-
-      rule part
-        heading:part_heading
-        children:(section / subsection / block_paragraphs)*
-        <Part>
-      end
-
-      rule section
-        section_title
-        children:(subsection / block_paragraphs)* <Section>
-      end
-
-      rule subsection
-        space? subsection_prefix space?
-        # eg: (2) (a) foo
-        first_child:inline_block_element?
-        # eg: (2)
-        eol?
-        children:block_element* <Subsection>
-      end
-
-      rule schedules_container
-        schedules:schedules <ScheduleContainer>
-      end
-
-      rule schedules
-        children:schedule+ <GroupNode>
-      end
-
-      rule schedule
-        schedule_title
-        body:body?
-        <Schedule>
-      end
-
-      ##########
-      # group elements
-      # 
-      # these are used externally and provide support when parsing just
-      # a particular portion of a document
-
-      rule chapters
-        children:chapter+ <GroupNode>
-      end
-
-      rule parts
-        children:part+ <GroupNode>
-      end
-
-      rule sections
-        children:section+ <GroupNode>
-      end
-
-      ##########
-      # headings
-
-      rule chapter_heading
-        space? chapter_heading_prefix heading:(newline? content)? eol
-        <ChapterHeading>
-      end
-
-      rule part_heading
-        space? part_heading_prefix heading:(newline? content)? eol
-        <PartHeading>
-      end
-
-      rule section_title
-        section_title_1 / section_1_title
-      end
-
-      rule section_title_1
-        &{ |s| options[:section_number_after_title] }
-        # Section title
-        # 1. Section content
-        content eol
-        section_title_prefix whitespace <SectionTitleType1>
-      end
-
-      rule section_1_title
-        # 1. Section title
-        # Section content
-        #
-        # Additionally, the section title is optional.
-        !{ |s| options[:section_number_after_title] }
-        space? section_title_prefix section_title:section_title_content? eol?
-        <SectionTitleType2>
-      end
-
-      rule section_title_content
-        # don't match subsections, eg.
-        #
-        # 10. (1) subsection content...
-        space !subsection_prefix content eol
-      end
-
-      rule schedule_title
-        space? schedule_title_prefix space? "\""? num:alphanums? "\""? [ \t:.-]* title:(content)?
-        heading:(newline space? content)?
-        eol
-      end
-
-      ##########
-      # blocks of content inside containers
-
-      rule block_paragraphs
-        block_element+ <BlockParagraph>
-      end
-
-      rule block_element
-        (table / blocklist / naked_statement)
-      end
-
-      # Block elements that don't have to appear at the start of a line.
-      # ie. we don't need to guard against the start of a chapter, section, etc.
-      rule inline_block_element
-        (table / blocklist / inline_statement)
-      end
-
-      rule blocklist
-        blocklist_item+ <Blocklist>
-      end
-
-      rule blocklist_item
-        # TODO: this whitespace should probably be space, to allow empty blocklist items followed by plain text
-        space? blocklist_item_prefix whitespace item_content:(!blocklist_item_prefix clauses:clauses? eol)? eol?
-        <BlocklistItem>
-      end
-
-      rule blocklist_item_prefix
-        ('(' letter_ordinal ')') / dotted_number_3
-      end
-
-      ##########
-      # wikimedia-style tables
-      #
-      # this grammar doesn't support inline table cells (eg: | col1 || col2 || col3)
-      # instead, the builder preprocesses tables to break inline cells onto their own
-      # lines, which we do support.
-
-      rule table
-        space? '{|' eol
-        table_body
-        '|}' eol
-        <Table>
-      end
-
-      rule table_body
-        (table_row / table_cell)*
-      end
-
-      rule table_row
-        '|-' space? eol
-      end
-
-      rule table_cell
-        # don't match end-of-table
-        !'|}'
-        [!|] attribs:table_attribs? space?
-        # first content line, then multiple lines
-        content:(line:table_line (![!|] space? line:table_line)*)
-        <TableCell>
-      end
-
-      rule table_line
-        clauses:clauses? eol
-        <TableLine>
-      end
-
-      rule table_attribs
-        space? attribs:(table_attrib+) '|'
-      end
-
-      rule table_attrib
-        name:([a-z_-]+) '=' value:(
-                                   ('"' (!'"' .)* '"') /
-                                   ("'" (!"'" .)* "'"))
-        space?
-      end
-
-      ##########
-      # statements - single lines of content
-      #
-      # If a statement starts with a backslash, it's considered to have escaped the subsequent word,
-      # and is ignored. This allows escaping of section headings, etc.
-
-      rule naked_statement
-        space? !(chapter_heading / part_heading / section_title / schedule_title / subsection_prefix) '\\'? clauses eol
-        <NakedStatement>
-      end
-
-      rule pre_body_statement
-        space? !(chapter_heading / part_heading / section_title / schedule_title) '\\'? clauses eol
-        <NakedStatement>
-      end
-
-      rule inline_statement
-        space? '\\'? clauses eol
-        <NakedStatement>
-      end
-
-      ##########
-      # inline content
-
-      # one or more words, allowing inline elements
-      rule clauses
-        (remark / image / ref / [^\n])+
-        <Clauses>
-      end
-
-      rule remark
-        '[[' content:(ref / (!']]' .))+ ']]'
-        <Remark>
-      end
-
-      rule image
-        # images like markdown
-        # eg. ![title text](image url)
-        #
-        # the title text is optional, but the enclosing square brackets aren't
-        '![' content:(!'](' [^\n])* '](' href:([^)\n]+) ')'
-        <Image>
-      end
-
-      rule ref
-        # links like markdown
-        # eg. [link text](link url)
-        '[' content:(!'](' [^\n])+ '](' href:([^)\n]+) ')'
-        <Ref>
-      end
-
-      ##########
-      # prefixes
-
-      rule part_heading_prefix
-        'part'i space alphanums [ :-]*
-      end
-
-      rule chapter_heading_prefix
-        'chapter'i space alphanums [ :-]*
-      end
-
-      rule schedule_title_prefix
-        'schedule'i 's'i?
-      end
-
-      rule section_title_prefix
-        number_letter '.'?
-      end
-
-      rule subsection_prefix
-        # there are two subsection handling syntaxes:
-        # 
-        # (1) foo
-        # (2A) foo
-        #
-        # and
-        #
-        # 8.2 for
-        # 8.3 bar
-        #
-        # The second is less common, but this allows us to handle it.
-        # Note that it is usually accompanied by a similar list number format:
-        #
-        # 8.2.1 item 1
-        # 8.2.2 item 2
-        #
-        # which aren't subsections, but lists, so force the space at the end
-        # of the number to catch this case.
-        num:('(' number_letter ')')
-        /
-        num:dotted_number_2 '.'? space
-      end
-
-      #########
-      ## one line of basic content
-
-      rule content
-        # anything but a newline, followed by a
-        # newline or end of file (without consuming the newline)
-        [^\n]+ &eol
-      end
-
-      ##########
-      # terminals
-
-      # eg. 2, 2A, 2b
-      rule number_letter
-        number letter*
-      end
-
-      rule letter_ordinal
-        letter (letter / digit)*
-      end
-
-      rule dotted_number_3
-        number '.' number ('.' number)+
-      end
-
-      rule dotted_number_2
-        number '.' number
-      end
-
-      rule number
-        digit+
-      end
-
-      rule digit
-        [0-9]
-      end
-
-      rule letter
-        [a-zA-Z]
-      end
-
-      rule alphanums
-        [a-zA-Z0-9]+
-      end
-
-      rule quotes
-        ["“”]
-      end
-      
-      rule non_quotes
-        [^"“”]
-      end
-
-      ##########
-      # whitespace
-
-      rule space
-        [ \t]+
-      end
-
-      rule whitespace
-        [ \t\n]*
-      end
-
-      rule empty_line
-        space? newline
-      end
-
-      rule eol
-        newline
-        empty_line*
-      end
-
-      rule newline
-        "\n"
-      end
-    end
-  end
-end