slaw 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75915642fffe0d65b3d4386745c12cd019e3d715
-  data.tar.gz: fb183f90a301b479fd4d422d7da479f8796e808d
+  metadata.gz: aa99a0d10c55f90c3cc64dc38caf91b986b94ab1
+  data.tar.gz: afd8583f42680e2caa287d5ebc993b616e4eeac8
 SHA512:
-  metadata.gz: acf9d6a07f1a927461394721228a8ebd6548fe79c5604e59f36463bdb4bd0a25df1bafa8aa391a937ed45756f1a70f85e9c48469d752c92817c04f392f62c169
-  data.tar.gz: 4ada4ce9e47e9d71bdcf55f1fc8c94c7977e03711b46d0ec86ceae17f8df5a2efcc7a23aa171adf967a0c24a3fd889d80f2aefdee3ebd6c6fb0f0893f14598d6
+  metadata.gz: 617cfdd201458cf85da6ea524e8e97ee955473825e1064fc86684adfcd9418faca2c9a4626c8c0654e3ecdcd2705199ab154c7cd1bd8a018380e8654ccaae842
+  data.tar.gz: 6c987cb5f14663c1e5ad5fa73af06554afc2b1cd4a6ea2732592ab5b7180aa3834799e449f68c315ed1e0d1396f5b4b7b5371bd31e682011924e56b29308adc7

data/bin/slaw

@@ -37,8 +37,16 @@ class SlawCLI < Thor
 
     if options[:fragment]
       generator.document_class = Slaw::Fragment
+
       fragment = options[:fragment]
-      fragment = 'act' if fragment.downcase == 'akomantoso'
+      fragment = case fragment.downcase
+                 when 'akomantoso'
+                   'act'
+                 when 'doc'
+                   'schedule'
+                 else
+                   fragment
+                  end
       generator.builder.parse_options[:root] = fragment
 
       if options[:id_prefix]
@@ -48,7 +56,12 @@ class SlawCLI < Thor
       end
     end
 
-    act = generator.generate_from_text(text)
+    begin
+      act = generator.generate_from_text(text)
+    rescue Slaw::Parse::ParseError => e
+      error e.message
+      exit 1
+    end
 
     # definitions?
     generator.builder.link_definitions(act.doc) if options[:definitions]

data/lib/slaw/version.rb

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

data/lib/slaw/za/act.treetop

@@ -110,7 +110,7 @@ module Slaw
       # statements
 
       rule numbered_statement
-        space? numbered_statement_prefix whitespace? (!blocklist_item_prefix content eol)? <NumberedStatement>
+        space? numbered_statement_prefix whitespace (!blocklist_item_prefix content eol)? <NumberedStatement>
       end
 
       rule naked_statement
@@ -126,7 +126,7 @@ module Slaw
       # prefixes
 
       rule part_heading_prefix
-        'part'i space alphanums ':'?
+        'part'i space alphanums whitespace [:-]?
       end
 
       rule chapter_heading_prefix
@@ -173,7 +173,7 @@ module Slaw
       end
 
       rule blocklist_item
-        space? blocklist_item_prefix whitespace? item_content:(!blocklist_item_prefix content eol)?
+        space? blocklist_item_prefix whitespace item_content:(!blocklist_item_prefix content eol)?
         <BlocklistItem>
       end
 

data/lib/slaw/za/act_nodes.rb

@@ -318,43 +318,10 @@ module Slaw
           return if schedules.elements.empty?
 
           b.components { |b| 
-            schedules.elements.each_with_index { |e, i| write_schedule(e, i+1, b) }
-          }
-        end
-
-        def write_schedule(element, i, b)
-          # component name
-          comp = "schedule#{i}"
-
-          b.component(id: "component-#{i}") { |b|
-            b.doc(name: "schedule#{i}") { |b|
-              b.meta { |b|
-                b.identification(source: "#slaw") { |b|
-                  b.FRBRWork { |b|
-                    b.FRBRthis(value: "#{Act::WORK_URI}/#{comp}")
-                    b.FRBRuri(value: Act::WORK_URI)
-                    b.FRBRalias(value: element.alias)
-                    b.FRBRdate(date: '1980-01-01', name: 'Generation')
-                    b.FRBRauthor(href: '#council', as: '#author')
-                    b.FRBRcountry(value: 'za')
-                  }
-                  b.FRBRExpression { |b|
-                    b.FRBRthis(value: "#{Act::EXPRESSION_URI}/#{comp}")
-                    b.FRBRuri(value: Act::EXPRESSION_URI)
-                    b.FRBRdate(date: '1980-01-01', name: 'Generation')
-                    b.FRBRauthor(href: '#council', as: '#author')
-                    b.FRBRlanguage(language: 'eng')
-                  }
-                  b.FRBRManifestation { |b|
-                    b.FRBRthis(value: "#{Act::MANIFESTATION_URI}/#{comp}")
-                    b.FRBRuri(value: Act::MANIFESTATION_URI)
-                    b.FRBRdate(date: Time.now.strftime('%Y-%m-%d'), name: 'Generation')
-                    b.FRBRauthor(href: '#slaw', as: '#author')
-                  }
-                }
+            schedules.elements.each_with_index { |e, i| 
+              b.component(id: "component-#{i+1}") { |b|
+                e.to_xml(b, "", i+1)
               }
-
-              b.mainBody { |b| element.to_xml(b, i) }
             }
           }
         end
@@ -382,16 +349,49 @@ module Slaw
           end
         end
 
-        def to_xml(b, idprefix, i=0)
+        def to_xml(b, idprefix, i=1)
           n = num.nil? ? i : num
-          id = "schedule-#{n}"
-
-          # there is no good AKN hierarchy container for schedules, so we
-          # just use article because we don't use it anywhere else.
-          b.article(id: id) { |b|
-            b.heading(heading) if heading
-            b.content { |b|
-              statements.elements.each { |e| b.p(e.content.text_value) }
+
+          # component name
+          comp = "schedule#{n}"
+          id = "#{idprefix}schedule-#{n}"
+
+          b.doc(name: "schedule#{n}") { |b|
+            b.meta { |b|
+              b.identification(source: "#slaw") { |b|
+                b.FRBRWork { |b|
+                  b.FRBRthis(value: "#{Act::WORK_URI}/#{comp}")
+                  b.FRBRuri(value: Act::WORK_URI)
+                  b.FRBRalias(value: self.alias)
+                  b.FRBRdate(date: '1980-01-01', name: 'Generation')
+                  b.FRBRauthor(href: '#council', as: '#author')
+                  b.FRBRcountry(value: 'za')
+                }
+                b.FRBRExpression { |b|
+                  b.FRBRthis(value: "#{Act::EXPRESSION_URI}/#{comp}")
+                  b.FRBRuri(value: Act::EXPRESSION_URI)
+                  b.FRBRdate(date: '1980-01-01', name: 'Generation')
+                  b.FRBRauthor(href: '#council', as: '#author')
+                  b.FRBRlanguage(language: 'eng')
+                }
+                b.FRBRManifestation { |b|
+                  b.FRBRthis(value: "#{Act::MANIFESTATION_URI}/#{comp}")
+                  b.FRBRuri(value: Act::MANIFESTATION_URI)
+                  b.FRBRdate(date: Time.now.strftime('%Y-%m-%d'), name: 'Generation')
+                  b.FRBRauthor(href: '#slaw', as: '#author')
+                }
+              }
+            }
+
+            b.mainBody { |b| 
+              # there is no good AKN hierarchy container for schedules, so we
+              # just use article because we don't use it anywhere else.
+              b.article(id: id) { |b|
+                b.heading(heading) if heading
+                b.content { |b|
+                  statements.elements.each { |e| b.p(e.content.text_value) }
+                }
+              }
             }
           }
         end

data/spec/za/act_spec.rb

@@ -61,6 +61,28 @@ EOS
       to_xml(node).should == "<part id=\"part-2\"><num>2</num><heading>The Part Heading</heading><section id=\"section-1\"><num>1.</num><heading>Section</heading><subsection id=\"section-1.subsection-0\"><content><p>Hello there</p></content></subsection></section></part>"
     end
 
+    it 'should handle part headers with dashes' do
+      node = parse :part, <<EOS
+Part 2 - The Part Heading
+1. Section
+Hello there
+EOS
+      node.num.should == "2"
+      node.heading.title.should == 'The Part Heading'
+      to_xml(node).should == "<part id=\"part-2\"><num>2</num><heading>The Part Heading</heading><section id=\"section-1\"><num>1.</num><heading>Section</heading><subsection id=\"section-1.subsection-0\"><content><p>Hello there</p></content></subsection></section></part>"
+    end
+
+    it 'should handle part headers with colons' do
+      node = parse :part, <<EOS
+Part 2: The Part Heading
+1. Section
+Hello there
+EOS
+      node.num.should == "2"
+      node.heading.title.should == 'The Part Heading'
+      to_xml(node).should == "<part id=\"part-2\"><num>2</num><heading>The Part Heading</heading><section id=\"section-1\"><num>1.</num><heading>Section</heading><subsection id=\"section-1.subsection-0\"><content><p>Hello there</p></content></subsection></section></part>"
+    end
+
     it 'should handle parts and odd section numbers' do
       subject.parser.options = {section_number_after_title: false}
       node = parse :act, <<EOS
@@ -367,11 +389,11 @@ EOS
 
     it 'should serialise many schedules correctly' do
       node = parse :schedules, <<EOS
-Schedule "1"
+Schedule "2"
 A Title
 1. Foo
 2. Bar
-Schedule 2
+Schedule 3
 Another Title
 Baz
 Boom
@@ -387,26 +409,26 @@ EOS
       s.should == <<EOS
 <components>
   <component id="component-1">
-    <doc name="schedule1">
+    <doc name="schedule2">
       <meta>
         <identification source="#slaw">
           <FRBRWork>
-            <FRBRthis value="/za/act/1980/01/schedule1"/>
+            <FRBRthis value="/za/act/1980/01/schedule2"/>
             <FRBRuri value="/za/act/1980/01"/>
-            <FRBRalias value="Schedule 1"/>
+            <FRBRalias value="Schedule 2"/>
             <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"/>
+            <FRBRthis value="/za/act/1980/01/eng@/schedule2"/>
             <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"/>
+            <FRBRthis value="/za/act/1980/01/eng@/schedule2"/>
             <FRBRuri value="/za/act/1980/01/eng@"/>
             <FRBRdate date="#{today}" name="Generation"/>
             <FRBRauthor href="#slaw" as="#author"/>
@@ -414,7 +436,7 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <article id="schedule-1">
+        <article id="schedule-2">
           <heading>A Title</heading>
           <content>
             <p>1. Foo</p>
@@ -425,26 +447,26 @@ EOS
     </doc>
   </component>
   <component id="component-2">
-    <doc name="schedule2">
+    <doc name="schedule3">
       <meta>
         <identification source="#slaw">
           <FRBRWork>
-            <FRBRthis value="/za/act/1980/01/schedule2"/>
+            <FRBRthis value="/za/act/1980/01/schedule3"/>
             <FRBRuri value="/za/act/1980/01"/>
-            <FRBRalias value="Schedule 2"/>
+            <FRBRalias value="Schedule 3"/>
             <FRBRdate date="1980-01-01" name="Generation"/>
             <FRBRauthor href="#council" as="#author"/>
             <FRBRcountry value="za"/>
           </FRBRWork>
           <FRBRExpression>
-            <FRBRthis value="/za/act/1980/01/eng@/schedule2"/>
+            <FRBRthis value="/za/act/1980/01/eng@/schedule3"/>
             <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@/schedule2"/>
+            <FRBRthis value="/za/act/1980/01/eng@/schedule3"/>
             <FRBRuri value="/za/act/1980/01/eng@"/>
             <FRBRdate date="#{today}" name="Generation"/>
             <FRBRauthor href="#slaw" as="#author"/>
@@ -452,7 +474,7 @@ EOS
         </identification>
       </meta>
       <mainBody>
-        <article id="schedule-2">
+        <article id="schedule-3">
           <heading>Another Title</heading>
           <content>
             <p>Baz</p>

metadata

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