epuber 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcab657cbef790188e95b1b238d68438e7f523e78be9c712209803c3808c3ca1
-  data.tar.gz: d36fe7e3f63eb459e9036a587adee857a5f9552524c35e8ef63ef0a867302eac
+  metadata.gz: b03d446f6c71a6105554b794179ec35e719bc3a3c630ece5bd2607edbf379681
+  data.tar.gz: b8c27f00396dc720d1e5dfc13d92fa5d97061f58947217d873a173c2ce939f7d
 SHA512:
-  metadata.gz: 640ffc22f2584d5ce642a7c7e923b13734e66e9db7fed5c2094b874b69ff56e0feabd75951be7886ac05ff94aa661b0a44e047b7cea4358d6f9efce7747b8ae2
-  data.tar.gz: eff25321a3950ccfd005fcdc3fa12b2becb8d8f2a6e2f429afdb36569f940a0461ea0165a2436a963da5b7ee88aafb895a0a7d07e7c4d4c5aec56a78be1ef81d
+  metadata.gz: 632a864249f1e89cdf915e28bcfdd8e83dbae9f3b8b4c84d933ccb873eed6d4b5ef3ab74d6775af229e9b49b6e21f9d199fe8990a542ef5b12f50fb8eda3e30d
+  data.tar.gz: 9105843aac2528104ff2febf949ccd89e9a3efe9724e8a422c5a98de003563b3bd58643f5894964c5a787071b30325c64ace3e13414c2960058c28c2417e1291

data/lib/epuber/checker/text_checker.rb

@@ -4,85 +4,25 @@ require 'active_support/core_ext/string/access'
 
 require_relative '../ruby_extensions/match_data'
 require_relative '../checker'
-
+require_relative '../compiler/problem'
 
 module Epuber
   class Checker
     class TextChecker < Checker
-      class MatchProblem
+      class MatchProblem < Compiler::Problem
         # @param message [String]
         # @param file_path [String]
         # @param match [MatchData]
         #
         def initialize(match, message, file_path)
-          @match = match
-          @message = message
-          @file_path = file_path
-        end
-
-        # Formats caret symbol with space indent
-        #
-        # @param [Fixnum] indent
-        #
-        # @return [String]
-        #
-        def caret_symbol(indent)
-          ' ' * indent + '^'
-        end
-
-        # Formats caret symbols for indent and length
-        #
-        # @param [Fixnum] length
-        # @param [Fixnum] indent
-        #
-        # @return [String]
-        #
-        def caret_symbols(indent, length)
-          start_sign = caret_symbol(indent)
-          end_sign = if length > 1
-                       caret_symbol(length-2)
-                     else
-                       ''
-                     end
-
-          "#{start_sign}#{end_sign}"
-        end
-
-        def formatted_match_line
-          match_line = @match.matched_string
-          pre_line = @match.pre_match_lines.last || ''
-
-          pre = match_pre_line = pre_line
-          if remove_tabs(match_pre_line).length > 100
-            pre = "#{match_pre_line.first(20)}...#{match_pre_line.last(30)}"
-          end
-
-          pre = remove_tabs(pre)
-
-          post_line = @match.post_match_lines.first || ''
-
-          post = if post_line.length > 50
-                   "#{post_line.first(50)}..."
-                 else
-                   post_line
-                 end
-
-          [pre, match_line, post]
-        end
-
-        def remove_tabs(text)
-          text.gsub("\t", ' ' * 4)
-        end
-
-        def to_s
-          pre_original = @match.pre_match_lines.last || ''
-          pre, match_text, post = formatted_match_line
+          whole_text = match.pre_match + match.matched_string + match.post_match
 
-          pointers = caret_symbols(pre.length, match_text.length)
+          line = match.pre_match_lines.count
+          column = (match.pre_match_lines.last || '').length + 1
+          length = match.matched_string.length
+          location = Epuber::Compiler::Problem::Location.new(line, column, length)
 
-          %{#{@file_path}:#{@match.line_number} column: #{pre_original.length} --- #{@message}
-  #{pre + match_text.ansi.red + post}
-  #{pointers}}
+          super(:warn, message, whole_text, location: location, file_path: file_path)
         end
       end
 

data/lib/epuber/compiler/file_types/xhtml_file.rb

@@ -68,11 +68,11 @@ module Epuber
           xhtml_content
         end
 
-        # @param [Array] errors
+        # @param [Array<Epuber::Compiler::Problem>] errors
         #
         def process_nokogiri_errors(errors)
-          errors.each do |e|
-            UI.warning(e)
+          errors.each do |problem|
+            UI.warning(problem, location: self)
           end
         end
 
@@ -86,12 +86,12 @@ module Epuber
           book = compilation_context.book
           file_resolver = compilation_context.file_resolver
 
-          xhtml_doc = UI.print_step_processing_time('parsing XHTML file') do
-            XHTMLProcessor.xml_document_from_string(content, source_path)
+          xhtml_doc, errors = UI.print_step_processing_time('parsing XHTML file') do
+            XHTMLProcessor.xml_doc_from_str_with_errors(content, source_path)
           end
 
           if compilation_context.release_build && xhtml_doc.errors.count > 0
-            process_nokogiri_errors(xhtml_doc.errors)
+            process_nokogiri_errors(errors)
           end
 
           UI.print_step_processing_time('adding missing elements') do

data/lib/epuber/compiler/problem.rb

@@ -0,0 +1,124 @@
+# encoding: utf-8
+
+
+module Epuber
+  class Compiler
+    class Problem
+      class Location
+        attr_reader :line
+        attr_reader :column
+        attr_reader :length
+
+        def initialize(line, column, length = nil)
+          @line = line
+          @column = column
+          @length = length || 1
+        end
+      end
+
+      attr_reader :level
+      attr_reader :message
+      attr_reader :source
+      attr_reader :location
+      attr_reader :file_path
+
+      def initialize(level, message, source, location: nil, line: nil, column: nil, length: nil, file_path: nil)
+        @level = level
+        @message = message
+        @source = source
+        @location = location
+        if @location.nil? && line && column
+          @location = Location.new(line, column, length)
+        end
+
+        @file_path = file_path
+      end
+
+      # Formats caret symbol with space indent
+      #
+      # @param [Fixnum] indent
+      #
+      # @return [String]
+      #
+      def self.caret_symbol(indent)
+        ' ' * indent + '^'
+      end
+
+      # Formats caret symbols for indent and length
+      #
+      # @param [Fixnum] length
+      # @param [Fixnum] indent
+      #
+      # @return [String]
+      #
+      def self.caret_symbols(indent, length)
+        start_sign = caret_symbol(indent)
+        end_sign = if length > 1
+                     caret_symbol(length-2)
+                   else
+                     ''
+                   end
+
+        "#{start_sign}#{end_sign}"
+      end
+
+      def self.remove_tabs(text)
+        text.gsub("\t", ' ' * 4)
+      end
+
+      # @param [Location] location
+      #
+      def self.text_at(text, location)
+        line_index = location.line - 1
+        column_index = location.column - 1
+
+        lines = text.split("\n")
+
+        line = lines[line_index] || ''
+        matched_text = line[column_index ... column_index + location.length] || ''
+
+        pre = (lines[0 ... line_index] + [line[0 ... column_index]]).join("\n")
+        post = ([line[column_index + location.length .. line.length]] + (lines[location.line .. lines.count] || [])).join("\n")
+
+        [pre, matched_text, post]
+      end
+
+      def self.formatted_match_line(text, location)
+        pre, matched, post = text_at(text, location)
+
+        pre_line = pre.split("\n").last || ''
+        post_line = post.split("\n").first || ''
+
+        pre = match_pre_line = pre_line
+        if remove_tabs(match_pre_line).length > 100
+          pre = "#{match_pre_line.first(20)}...#{match_pre_line.last(30)}"
+        end
+
+        pre = remove_tabs(pre)
+
+        post = if post_line.length > 50
+                 "#{post_line.first(50)}..."
+               else
+                 post_line
+               end
+
+        [pre, matched, post]
+      end
+
+      def to_s
+        pre, match_text, post = self.class.formatted_match_line(@source, @location)
+
+        pointers = self.class.caret_symbols(pre.length, @location.length)
+        colored_match_text = match_text.empty? ? match_text : match_text.ansi.red
+        column = @location.column
+        line = [@location.line, 1].max
+
+        [
+          "#{@file_path}:#{line} column: #{column} --- #{@message}",
+          '  ' + pre + colored_match_text + post,
+          '  ' + pointers,
+        ].join("\n")
+      end
+    end
+  end
+end

data/lib/epuber/compiler/xhtml_processor.rb

@@ -19,14 +19,14 @@ module Epuber
       #
       # @return [Nokogiri::XML::Document] parsed document
       #
-      def self.xml_document_from_string(text, file_path = nil)
+      def self.xml_doc_from_str_with_errors(text, file_path = nil)
         if /\A[\n\r ]+(<\?xml)/ =~ text
           UI.warning('XML header must be at the beginning of document', location: UI::Location.new(file_path, 1))
 
           text = text.lstrip
         end
 
-        xml_header = ''
+        xml_header = nil
         if /\A\s*(<\?xml[^>]*\?>)/ =~ text
           match = Regexp.last_match
           xml_header = text[match.begin(1)...match.end(1)]
@@ -50,20 +50,38 @@ module Epuber
                         Nokogiri::XML::ParseOptions::NOERROR | # to silence any errors or warnings printing into console
                         Nokogiri::XML::ParseOptions::NOWARNING
 
-        doc = Nokogiri::XML("#{before}<root>#{text}</root>", nil, nil, parse_options)
+        doc = Nokogiri::XML("#{before}<root>#{text}</root>", file_path, nil, parse_options)
+        text_for_errors = before + text
         doc.encoding = 'UTF-8'
         doc.file_path = file_path
 
+        if doc.errors.empty?
+          errors = []
+        else
+          errors = doc.errors.map do |e|
+            Problem.new(:error, e.message, text_for_errors, line: e.line, column: e.column, file_path: file_path)
+          end
+        end
+
         root = root_node = doc.root
         root_elements = root.children.select { |a| a.element? || a.comment? }
 
         if root_elements.count == 1
           doc.root = root_elements.first
+        elsif root_node.at_css('html')
+          doc.root = root_node.at_css('html')
         elsif root_node.at_css('body').nil?
           root_node.node_name = 'body'
+        else
+          root_node.node_name = 'html'
         end
 
-        doc
+        [doc, errors]
+      end
+
+      def self.xml_document_from_string(text, file_path = nil)
+        xml, errros = self.xml_doc_from_str_with_errors(text, file_path)
+        xml
       end
 
 
@@ -83,25 +101,37 @@ module Epuber
       def self.add_missing_root_elements(xhtml_doc, title, epub_version)
         # add missing body element
         if xhtml_doc.at_css('body').nil?
-          xhtml_doc.root.surround_with_element('body')
+          if xhtml_doc.root.node_name == 'html'
+            xhtml_doc.root << xhtml_doc.create_element('body')
+          else
+            xhtml_doc.root.surround_with_element('body')
+          end
         end
 
+        html = xhtml_doc.at_css('html')
+
         # add missing root html element
-        if xhtml_doc.at_css('html').nil?
+        if html.nil?
           attrs               = {}
           attrs['xmlns']      = 'http://www.w3.org/1999/xhtml'
           attrs['xmlns:epub'] = 'http://www.idpf.org/2007/ops' if epub_version >= 3
-          xhtml_doc.root.surround_with_element('html', attrs)
+          html = xhtml_doc.root.surround_with_element('html', attrs)
+        elsif html.namespaces.empty?
+          html['xmlns']      = 'http://www.w3.org/1999/xhtml'
+          html['xmlns:epub'] = 'http://www.idpf.org/2007/ops' if epub_version >= 3
         end
 
         # add missing head in html
         if xhtml_doc.at_css('html > head').nil?
-          html = xhtml_doc.css('html').first
           head = xhtml_doc.create_element('head')
           head << xhtml_doc.create_element('title', title)
           head << xhtml_doc.create_element('meta', charset: 'utf-8') if epub_version >= 3.0
 
-          html.children.first.before(head)
+          if (first = html.children.first)
+            first.before(head)
+          else
+            html << head
+          end
         end
 
         # https://github.com/IDPF/epubcheck/issues/631

data/lib/epuber/user_interface.rb

@@ -191,7 +191,13 @@ module Epuber
 
       comps = []
       comps << message.to_s
-      comps << "  (in file #{location.path} line #{location.lineno}" unless location.nil?
+      if !location.nil? && !(message.is_a?(Epuber::Compiler::Problem) || message.is_a?(Epuber::Checker::TextChecker::MatchProblem))
+        if location.lineno
+          comps << "  (in file #{location.path} line #{location.lineno})"
+        else
+          comps << "  (in file #{location.path})"
+        end
+      end
 
       comps.join("\n").ansi.send(_color_from_level(level))
     end

data/lib/epuber/version.rb

@@ -1,6 +1,6 @@
 
 module Epuber
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 
   HOME_URL = 'https://github.com/epuber-io/epuber'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -369,6 +369,7 @@ files:
 - lib/epuber/compiler/meta_inf_generator.rb
 - lib/epuber/compiler/nav_generator.rb
 - lib/epuber/compiler/opf_generator.rb
+- lib/epuber/compiler/problem.rb
 - lib/epuber/compiler/xhtml_processor.rb
 - lib/epuber/config.rb
 - lib/epuber/dsl/attribute.rb