nora_mark 0.2beta3 → 0.2beta4

data/lib/nora_mark/parser.rb

@@ -1,31 +1,12 @@
+require 'nora_mark/node'
 require 'nora_mark/parser.kpeg'
 
 module NoraMark
   class Parser
-    def create_item(type, command, children = [], raw: nil)
-      children[0].sub!(/^[[:space:]]+/, '') if !children.nil? && children[0].is_a?(String)
-      item = {:type => type, :children => children, :raw_text => raw }.merge command || {}
-      item[:args] ||= []
-      item[:named_args] = Hash[*(item[:args].select { |x| x.include?(':') }.map { |x| v = x.split(':', 2); [v[0].strip.to_sym, v[1]]}.flatten)]
-      item
-    end
-    
-    def parse_text(content)
-        content.inject([]) do
-        |result, item|
-        if item.is_a? String
-          s = result.last
-          if s.is_a? String
-            result.pop
-          else
-            s = ''
-          end
-          result.push s + item
-        else
-          result.push item
-        end
-      end
+    def initialize(src)
+       super src
     end
+
   end
 end
 

data/lib/nora_mark/version.rb

@@ -1,3 +1,3 @@
 module NoraMark
-  VERSION = "0.2beta3"
+  VERSION = "0.2beta4"
 end

data/lib/nora_mark.rb

@@ -1,9 +1,12 @@
 require "nora_mark/version"
 require 'nora_mark/html/generator'
+require 'nora_mark/node'
 require 'nora_mark/parser'
+require 'securerandom'
 
 module NoraMark
-  class Document
+  class Document < Node
+    attr_accessor :document_name
     private_class_method :new 
 
     def self.parse(string_or_io, param = {})
@@ -19,6 +22,7 @@ module NoraMark
         if (!@parser.parse)
           raise @parser.raise_error
         end
+        @content = @parser.result
       end
       instance
     end
@@ -29,7 +33,7 @@ module NoraMark
 
     def html
       if @html.nil?
-        @html = @html_generator.convert(@parser.result)
+        @html = @html_generator.convert(self)
       end
       @html
     end
@@ -39,6 +43,7 @@ module NoraMark
                         Proc.new { |text| text.gsub(/\r?\n(\r?\n)+/, "\n\n") },
                        ]
       @html_generator = Html::Generator.new(param)
+      @document_name = param[:document_name] || "noramark_#{SecureRandom.uuid}"
     end 
 
 

data/nora_mark.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0.0'
   gem.add_dependency "kpeg"
   gem.add_development_dependency "rspec", "~> 2.14"
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "nokogiri", "~> 1.6.0"
 end

data/spec/epub30-schemas/epub-nav-30.nvdl

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" startMode="html">
+  <mode name="html">
+    <namespace ns="http://www.w3.org/1999/xhtml">
+      <validate schema="epub-nav-30.rnc" schemaType="application/relax-ng-compact-syntax"
+        useMode="attach"/>
+      <validate schema="epub-xhtml-30.sch" useMode="attach"/>
+      <validate schema="epub-nav-30.sch" useMode="attach"/>
+    </namespace>
+  </mode>
+  <mode name="attach">
+    <anyNamespace>
+      <attach/>
+    </anyNamespace>
+  </mode>
+</rules>

data/spec/epub30-schemas/epub-nav-30.rnc

@@ -0,0 +1,10 @@
+
+
+   default namespace = "http://www.w3.org/1999/xhtml"
+   namespace epub = "http://www.idpf.org/2007/ops"
+      
+   include "epub-xhtml-30.rnc" {   
+        html5.nav.content = html5.headings.class?, html5.ol     
+        html5.oli.content = html5.a.phrasing | ((html5.a.phrasing | html5.span), html5.ol)
+   }
+   

data/spec/epub30-schemas/epub-nav-30.sch

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+
+    <ns uri="http://www.w3.org/1999/xhtml" prefix="html"/>
+    <ns uri="http://www.idpf.org/2007/ops" prefix="epub"/>
+
+    <pattern id="nav-ocurrence">
+        <rule context="html:body">
+            <assert test="count(.//html:nav[@epub:type='toc']) = 1">Exactly one 'toc' nav element
+                must be present</assert>
+            <assert test="count(.//html:nav[@epub:type='page-list']) &lt; 2">Multiple occurrences of
+                the 'page-list' nav element</assert>
+            <assert test="count(.//html:nav[@epub:type='landmarks']) &lt; 2">Multiple occurrences of
+                the 'landmarks' nav element</assert>
+        </rule>
+    </pattern>
+
+    <pattern id="span-no-sublist">
+        <rule context="html:body//html:nav//html:span">
+            <assert test="count(.//ol) = 0"> The span element must only be used as heading for flat
+                sublists (not hierarchical navigation structures) </assert>
+        </rule>
+    </pattern>
+
+    <pattern id="landmarks">
+        <rule context="html:nav[@epub:type='landmarks']//html:ol//html:a">
+            <assert test="@epub:type">Missing epub:type attribute on anchor inside 'landmarks' nav
+                element</assert>
+        </rule>
+    </pattern>
+
+    <pattern id="link-labels">
+        <rule context="html:nav//html:ol//html:a">
+            <assert test="string-length(normalize-space(string(.))) > 0">Anchors within nav elements
+                must contain text</assert>
+        </rule>
+    </pattern>
+
+    <pattern id="span-labels">
+        <rule context="html:nav//html:ol//html:span">
+            <assert test="string-length(normalize-space(string(.))) > 0">Spans within nav elements
+                must contain text</assert>
+        </rule>
+    </pattern>
+
+    <pattern id="req-heading">
+        <rule
+            context="html:nav[not(@epub:type = 'toc') and not (@epub:type = 'page-list') and not (@epub:type = 'landmarks')]">
+            <let name="fc" value="local-name(./*[1])"/>
+            <assert test="(starts-with($fc,'h') and string-length($fc) = 2) or ($fc = 'hgroup')">nav
+                elements other than 'toc', 'page-list' and 'landmarks' must contain a heading as the
+                first child</assert>
+        </rule>
+    </pattern>
+
+    <pattern id="heading-content">
+        <rule context="html:h1|html:h2|html:h3|html:h4|html:h5|html:h6|html:hgroup">
+            <assert test="string-length(normalize-space(string(.))) > 0">Heading elements must
+                contain text</assert>
+        </rule>
+    </pattern>
+
+
+    <!-- warnings mode <pattern id="page-list-flat">
+        <rule context="html:body//html:nav[@epub:type='page-list']">
+        <assert test="count(.//html:ol) = 1">The page-list navigation structure should be a
+        list, not a nested hierarchy</assert>
+        </rule>
+        </pattern> 
+    -->
+
+</schema>

data/spec/epub30-schemas/epub-svg-30.nvdl

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" startMode="svg">
+  <mode name="svg">
+    <namespace ns="http://www.w3.org/2000/svg">
+      <validate schema="epub-svg-30.rnc" schemaType="application/relax-ng-compact-syntax"
+        useMode="attach"/>
+      <validate schema="epub-svg-30.sch" useMode="attach"/>
+    </namespace>
+  </mode>
+  <mode name="attach">
+    <anyNamespace>
+      <attach/>
+    </anyNamespace>
+  </mode>
+</rules>

data/spec/epub30-schemas/epub-svg-30.rnc

@@ -0,0 +1,15 @@
+
+   namespace x = "http://www.w3.org/1999/xhtml"
+
+   include "./mod/html5/html5-grouping-30.rnc" inherit = x
+   include "./mod/html5/html5-phrasing-30.rnc" inherit = x  
+   include "./mod/html5/html5-sections-30.rnc" inherit = x
+   include "./mod/html5/html5-style-30.rnc" inherit = x
+   include "./mod/epub-ssml-attrs.rnc"
+
+   include "./mod/html5/html5-attrib-30.rnc"
+
+   include "./mod/datatypes.rnc"
+   include "./mod/html5/html5-models-30.rnc"
+
+   start = external "mod/epub-svg11-30.rnc"

data/spec/epub30-schemas/epub-svg-30.sch

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron">    
+    
+    <ns uri="http://www.w3.org/2000/svg" prefix="svg" />
+    
+    <include href="./mod/id-unique.sch"/>
+    <include href="./mod/epub-svg11-re.sch"/>
+        
+</schema>
+

data/spec/epub30-schemas/epub-xhtml-30.nvdl

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0" startMode="html">
+  <mode name="html">
+    <namespace ns="http://www.w3.org/1999/xhtml">
+      <validate schema="epub-xhtml-30.rnc" schemaType="application/relax-ng-compact-syntax"
+        useMode="attach"/>
+      <validate schema="epub-xhtml-30.sch" useMode="attach"/>
+    </namespace>
+  </mode>
+  <mode name="attach">
+    <anyNamespace>
+      <attach/>
+    </anyNamespace>
+  </mode>
+</rules>

data/spec/epub30-schemas/epub-xhtml-30.rnc

@@ -0,0 +1,37 @@
+
+
+
+   default namespace = "http://www.w3.org/1999/xhtml"
+   
+   include "./mod/html5/html5-document-30.rnc"
+      
+   include "./mod/html5/html5-sections-30.rnc"
+   include "./mod/html5/html5-grouping-30.rnc"
+   include "./mod/html5/html5-phrasing-30.rnc"   
+   include "./mod/html5/html5-embed-30.rnc"
+      
+   include "./mod/html5/html5-edit-30.rnc"
+   include "./mod/html5/html5-style-30.rnc"
+   include "./mod/html5/html5-script-30.rnc"
+   include "./mod/html5/html5-interactive-30.rnc"
+   include "./mod/html5/html5-forms-30.rnc"
+      
+   include "./mod/html5/html5-attrib-30.rnc"
+   include "./mod/html5/html5-aria-30.rnc"
+           
+   include "./mod/datatypes.rnc"
+   include "./mod/html5/html5-models-30.rnc"
+   
+   include "./mod/epub-xhtml-mathml3-30.rnc"
+   include "./mod/epub-xhtml-svg11-30.rnc"
+   
+   include "./mod/epub-trigger.rnc"
+   include "./mod/epub-switch.rnc"
+   
+   include "./mod/epub-type-attr.rnc"         
+   include "./mod/epub-prefix-attr.rnc"      
+   include "./mod/epub-ssml-attrs.rnc"
+   
+   start = html5.html
+      
+