epuber 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a67f5875818b18606d58bcf55c2095419e2a48b5f7766627d4196d7bf733c8
-  data.tar.gz: 99b80c62fe55f485d6da21d9be273891ea4ebb7383476099972902d8d8aae014
+  metadata.gz: 2899b08ccdd624b08c96377e111df6872f4c6b0871ee689e28d1264d42bf5294
+  data.tar.gz: 6391e4b90172bc5d06d7c3f903aafa52efab3917ee0daaaf406723f3ee2d381f
 SHA512:
-  metadata.gz: 0753d03cf0e27538cc09a95fccec5dac1299bcbec5e1d739e8718e59b870e91b523311627609fc303b0aa143b9fd0582925b8a1feb75f66b236943d6d975957a
-  data.tar.gz: 13efd113cdd854e03dc17d62786d17fab9e0d7b3554eeca8caa5ddd2e5062eba15ef6c73a65eb2c24b7173873b9481d1538dd6919ad43ac135a12cf471d4c727
+  metadata.gz: 7a2df3f599de46ca5c5e976154d32752981fa9d2a76e0a46754b91f5583c3e671c3ab77c777bc8511dbda09f23ea0a8534d16656a1dfce4748b762fa7d7c3947
+  data.tar.gz: b5d8d5556ce730d2215a6239405a56505f87e649fa1b06078cb2145f524c2d59e82d2789b21d0873c573079daa807ff9cc3d22b16bf26d85f4e223ac20ead502

data/Gemfile

@@ -5,4 +5,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in Epuber.gemspec
 gemspec
 
-gem 'coveralls', require: false
+gem 'ruby-debug-ide'
+gem 'debase'

data/README.md

@@ -1,6 +1,6 @@
 # Epuber
 
-[![Gem Version](https://badge.fury.io/rb/epuber.svg)](http://badge.fury.io/rb/epuber) [![Build Status](https://travis-ci.org/epuber-io/epuber.svg?branch=master)](https://travis-ci.org/epuber-io/epuber) [![Coverage Status](https://coveralls.io/repos/epuber-io/epuber/badge.svg?branch=master&service=github)](https://coveralls.io/github/epuber-io/epuber?branch=master) [![Inline docs](http://inch-ci.org/github/epuber-io/epuber.svg?branch=master)](http://inch-ci.org/github/epuber-io/epuber) [![Join the chat at https://gitter.im/epuber-io/epuber](https://badges.gitter.im/epuber-io/epuber.svg)](https://gitter.im/epuber-io/epuber?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gem Version](https://badge.fury.io/rb/epuber.svg)](http://badge.fury.io/rb/epuber) [![Build Status](https://github.com/epuber-io/epuber/actions/workflows/tests.yml/badge.svg)](https://github.com/epuber-io/epuber/actions) [![Coverage Status](https://coveralls.io/repos/epuber-io/epuber/badge.svg?branch=master&service=github)](https://coveralls.io/github/epuber-io/epuber?branch=master) [![Inline docs](https://inch-ci.org/github/epuber-io/epuber.svg?branch=master)](https://inch-ci.org/github/epuber-io/epuber)
 
 Epuber is simple tool to compile and pack source files into EPUB format. Offers to define multiple "targets" which allows to create multiple versions of the book by running only one command. Eliminates copying code and information, eliminates needs to use _git_ branches to differ ebook content.
 
@@ -46,37 +46,39 @@ end
 
 Except for paths to plugins `book.use`, every path could be only name of the file, even without extension. So you can rename them, move them, the correct path will always resolved. Only exception is when the same name has more then one file.
 
-           | Epuber
------------|------------------------------------------------------------
-:book:     | Creates seamless workflow for creating ebooks
-:monorail: | Defines different _targets_ for several book stores (iBookstore, Google Play store, ...)
-:wrench:   | Extend and customise the functionality with _plugins_
-:pencil2:  | Defines _constants_ so you can have link to related book in proper book store
-:pencil:   | Defines mechanisms to deal with duplicated 
-:tophat:   | Easy setup assistant to get started in a few minutes
-:ghost:    | Automatically validates generated text so you don't have to worry about typos and other mistakes
-:rocket:   | Saves you **hours** when developing new or updating existing book
-:page_with_curl: | Supports template engines, CSS preprocessors and standard EPUB formats at the same time
-:computer: | Have local development web server to iterate and experiment quickly
-:loop:     | Automatically refresh web browser when some source file changes
-:bomb:     | Quick jumping through pages with arrow keys on keyboard
-:closed_book: | Supports EPUB 2 and 3
+|                 | Epuber                                                                                           |
+|-----------------|------------------------------------------------------------------------------------------------- |
+|:book:           | Creates seamless workflow for creating ebooks                                                    |
+|:monorail:       | Defines different _targets_ for several book stores (iBookstore, Google Play store, ...)         |
+|:wrench:         | Extend and customise the functionality with _plugins_                                            |
+|:pencil2:        | Defines _constants_ so you can have link to related book in proper book store                    |
+|:pencil:         | Defines mechanisms to deal with duplicated                                                       |
+|:tophat:         | Easy setup assistant to get started in a few minutes                                             |
+|:ghost:          | Automatically validates generated text so you don't have to worry about typos and other mistakes |
+|:rocket:         | Saves you **hours** when developing new or updating existing book                                |
+|:page_with_curl: | Supports template engines, CSS preprocessors and standard EPUB formats at the same time          |
+|:computer:       | Have local development web server to iterate and experiment quickly                              |
+|:loop:           | Automatically refresh web browser when some source file changes                                  |
+|:bomb:           | Quick jumping through pages with arrow keys on keyboard                                          |
+|:closed_book:    | Supports EPUB 2 and 3                                                                            |
 
 
 ## Installation
 
 First of all Epuber uses [RMagick](https://github.com/rmagick/rmagick) which has several external dependencies, so you have to install that first:
 
-- ImageMagick
+- ImageMagick (only v6 for now)
 - pkg-config
 
 On OS X make sure you Xcode Command Line Tools installed:
     
     xcode-select --install
 
-And the easiest way to install prerequisites on OS X is to use [brew](http://brew.sh):
+And the easiest way to install prerequisites on macOS is to use [brew](http://brew.sh):
 
-    brew install imagemagick pkg-config
+    brew install imagemagick@6 node@12 pkg-config
+    brew link --force imagemagick@6
+    brew link --force --overwrite node@12
 
 On Ubuntu, you can run:
 
@@ -87,7 +89,7 @@ On Ubuntu, you can run:
 
 Then just type following line to terminal:
 
-    sudo gem install epuber
+    [sudo] gem install epuber
 
 If everything goes well, try running following line in terminal:
 

data/epuber.gemspec

@@ -14,14 +14,15 @@ Gem::Specification.new do |spec|
   spec.summary  = 'Epuber is simple tool to compile and pack source files into EPUB format.'
   spec.homepage = Epuber::HOME_URL
   spec.license  = 'MIT'
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.files         = Dir['bin/**/*'] + Dir['lib/**/*'] + %w(epuber.gemspec Gemfile LICENSE.txt README.md)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_runtime_dependency 'activesupport', '~> 6.0'
+  spec.add_runtime_dependency 'addressable', '~> 2.7'
   spec.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.2'
   spec.add_runtime_dependency 'mime-types', '~> 3.0'
   spec.add_runtime_dependency 'claide', '~> 1.0'
@@ -33,8 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sinatra-contrib', '~> 2.0'
   spec.add_runtime_dependency 'thin', '~> 1.6'
 
-  spec.add_runtime_dependency 'rmagick', '~> 2.14'
-  spec.add_runtime_dependency 'rubyzip', '~> 1.0'
+  spec.add_runtime_dependency 'rmagick', '~> 4.2'
+  spec.add_runtime_dependency 'rubyzip', '~> 2.3'
 
   spec.add_runtime_dependency 'epubcheck-ruby', '~> 4.0'
 
@@ -42,9 +43,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'coffee-script', '~> 2.4'
   spec.add_runtime_dependency 'bade', '~> 0.2.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
-  spec.add_development_dependency 'rake', '~> 12.2'
-  spec.add_development_dependency 'fakefs', '~> 0.6'
+  spec.add_development_dependency 'rubocop', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'fakefs', '~> 1.3'
 end

data/lib/epuber/book/target.rb

@@ -161,7 +161,6 @@ module Epuber
       attribute :epub_version,
                 required:     true,
                 inherited:    true,
-                types:        [Version],
                 auto_convert: { [String, Integer, Float] => Version },
                 default_value: 3.0
 

data/lib/epuber/book/toc_item.rb

@@ -11,7 +11,6 @@ module Epuber
       # @return [Epuber::Book::FileRequest]
       #
       attribute :file_request,
-                types:        [FileRequest],
                 auto_convert: { String => FileRequest },
                 inherited:    true
 

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/command.rb

@@ -74,5 +74,14 @@ module Epuber
         Epuber::Config.instance.save_lockfile
       end
     end
+
+    def pre_build_checks
+      Config.instance.warn_for_outdated_versions!
+
+      if !Config.instance.same_version_as_last_run? && File.exist?(Config.instance.working_path)
+        UI.warning('Using different version of Epuber or Bade, removing all build caches')
+        Config.instance.remove_build_caches
+      end
+    end
   end
 end

data/lib/epuber/command/build.rb

@@ -45,7 +45,7 @@ module Epuber
         verify_one_bookspec_exists!
         verify_all_targets_exists!
 
-        Config.instance.warn_for_outdated_versions!
+        pre_build_checks
       end
 
       def run

data/lib/epuber/command/server.rb

@@ -30,7 +30,7 @@ module Epuber
         super
         verify_one_bookspec_exists!
 
-        Config.instance.warn_for_outdated_versions!
+        pre_build_checks
       end
 
       def run

data/lib/epuber/compiler/file_resolver.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require_relative '../ruby_extensions/string'
 require 'active_support/core_ext/object/try'
 
 module Epuber

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,25 +86,18 @@ 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
             XHTMLProcessor.add_missing_root_elements(xhtml_doc, book.title, target.epub_version)
           end
 
-          UI.print_step_processing_time('adding default things') do
-            XHTMLProcessor.add_styles(xhtml_doc, default_styles(target, file_resolver))
-            XHTMLProcessor.add_scripts(xhtml_doc, default_scripts(target, file_resolver))
-
-            XHTMLProcessor.add_viewport(xhtml_doc, target.default_viewport) unless target.default_viewport.nil?
-          end
-
           # resolve links to files, add other linked resources and compute correct path
           UI.print_step_processing_time('resolving links') do
             XHTMLProcessor.resolve_links(xhtml_doc, destination_path, file_resolver.dest_finder)
@@ -119,6 +112,13 @@ module Epuber
             XHTMLProcessor.resolve_stylesheets(xhtml_doc, destination_path, file_resolver)
           end
 
+          UI.print_step_processing_time('adding default things') do
+            XHTMLProcessor.add_styles(xhtml_doc, default_styles(target, file_resolver))
+            XHTMLProcessor.add_scripts(xhtml_doc, default_scripts(target, file_resolver))
+
+            XHTMLProcessor.add_viewport(xhtml_doc, target.default_viewport) unless target.default_viewport.nil?
+          end
+
           XHTMLProcessor.resolve_mathml_namespace(xhtml_doc)
 
           UI.print_step_processing_time('investigating properties') do

data/lib/epuber/compiler/nav_generator.rb

@@ -121,7 +121,7 @@ module Epuber
           end
         end
 
-        if @target.epub_version >= 3 && toc_items.length > 0
+        if @target.epub_version >= 3 && toc_items.length > 0 && contains_item_with_title(toc_items)
           @xml.ol do
             iterate_lambda.call
           end
@@ -130,6 +130,10 @@ module Epuber
         end
       end
 
+      def contains_item_with_title(toc_items)
+        toc_items.any? { |a| a.title || contains_item_with_title(a.sub_items) }
+      end
+
       # @param toc_item [Epuber::Book::TocItem]
       #
       def visit_toc_item(toc_item)

data/lib/epuber/compiler/opf_generator.rb

@@ -257,18 +257,30 @@ module Epuber
       # @return [String]
       #
       def create_id_from_path(path)
-        path && path.gsub('/', '.')
+        return nil if path.nil?
+
+        path.gsub('/', '.').gsub(/^[0-9]*/, '')
       end
 
       # Creates proper mime-type for file
       #
-      # @param file [Epuber::Book::File]
+      # @param file [Epuber::Compiler::FileTypes::AbstractFile | String]
       #
       # @return [String]
       #
       def mime_type_for(file)
-        filename = file.destination_path
-        MIME::Types.of(filename).first.content_type
+        filename = if file.is_a?(String)
+                     file
+                   else
+                     file.destination_path
+                   end
+
+        case File.extname(filename)
+        when '.ttf', '.otf'
+          'application/vnd.ms-opentype'
+        else
+          MIME::Types.of(filename).first.content_type
+        end
       end
 
       # Creates hash of namespaces for root package element

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'nokogiri'
-require 'uri'
+require 'addressable'
 
 
 module Epuber
@@ -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
@@ -178,7 +208,7 @@ module Epuber
           uri = URI(path)
         rescue URI::InvalidURIError
           begin
-            uri = URI(URI::encode(path))
+            uri = URI(Addressable::URI.encode(path))
           rescue URI::InvalidURIError
             # skip not valid uri
             raise UnparseableLinkError, "Unparseable link `#{path}`"

data/lib/epuber/config.rb

@@ -123,14 +123,26 @@ module Epuber
 
     def warn_for_outdated_versions!
       if bookspec_lockfile.epuber_version > Epuber::VERSION
-        UI.warning('Warning: the running version of Epuber is older than the version that created the lockfile. We suggest you upgrade to the latest version of Epuber by running `gem install epuber`')
+        UI.warning('Warning: the running version of Epuber is older than the version that created the lockfile. We suggest you upgrade to the latest version of Epuber by running `gem install epuber`.')
       end
 
       if bookspec_lockfile.bade_version && bookspec_lockfile.bade_version > Bade::VERSION
-        UI.warning('Warning: the running version of Bade is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bade by running `gem install bade`')
+        UI.warning('Warning: the running version of Bade is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bade by running `gem install bade`.')
       end
     end
 
+    def same_version_as_last_run?
+      !(bookspec_lockfile.epuber_version != Epuber::VERSION ||
+          bookspec_lockfile.bade_version.nil? ||
+          bookspec_lockfile.bade_version != Bade::VERSION)
+    end
+
+    def remove_build_caches
+      FileUtils.rm_rf(File.join(working_path, 'build_cache'))
+      FileUtils.rm_rf(File.join(working_path, 'build'))
+      FileUtils.rm_rf(File.join(working_path, 'metadata'))
+    end
+
     # ---------------------------------------------------------------------------------------------------------------- #
 
     class << self

data/lib/epuber/dsl/attribute.rb

@@ -47,8 +47,10 @@ module Epuber
         @auto_convert  = auto_convert
         @types         = if !types.nil?
                            types
-                         elsif @default_value
+                         elsif @default_value && @auto_convert.empty?
                            [@default_value.class]
+                         elsif !@auto_convert.empty?
+                           [@auto_convert.values.first]
                          else
                            [String]
                          end
@@ -234,6 +236,8 @@ module Epuber
             return dest_class.call(value)
           elsif dest_class.respond_to?(:parse)
             return dest_class.parse(value)
+          elsif dest_class <= String
+            return value.to_s
           elsif dest_class.respond_to?(:new)
             return dest_class.new(value)
           else

data/lib/epuber/dsl/attribute_support.rb

@@ -66,12 +66,8 @@ module Epuber
             parent.send(key)
 
           elsif !attr.default_value.nil?
-            # write default value on first access to root object
-            root_obj = self.class.find_root(self) || self
-            root_obj.send(attr.writer_name, attr.default_value)
-
-            # and return the default value
-            attr.default_value
+            # just return the default value
+            attr.converted_value(attr.default_value)
           end
         end
 

data/lib/epuber/dsl/object.rb

@@ -19,11 +19,6 @@ module Epuber
         super
         @attributes_values = {}
         @file_path = nil
-
-        # iterate over all attributes to write default values
-        self.class.dsl_attributes.each do |key, _attr|
-          self.send(key)
-        end
       end
 
       # @return [String]

data/lib/epuber/server/pages/book.bade

@@ -71,7 +71,7 @@ mixin iterate_spine(toc_item)
 
 
 		+section('Targets')
-			- book.all_targets.each do |b_target|
+			- book.buildable_targets.each do |b_target|
 				p(class: 'target_selected' if target == b_target): a(href: "/change_target/#{b_target.name}")= b_target.name
 			- end
 

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.3'
+  VERSION = '0.6.0'
 
   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.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Roman Kříž
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -162,28 +176,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: epubcheck-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -250,16 +264,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -280,43 +294,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-description: 
+        version: '1.3'
+description:
 email:
 - samnung@gmail.com
 executables:
@@ -369,6 +383,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
@@ -379,7 +394,6 @@ files:
 - lib/epuber/lockfile.rb
 - lib/epuber/plugin.rb
 - lib/epuber/ruby_extensions/match_data.rb
-- lib/epuber/ruby_extensions/string.rb
 - lib/epuber/ruby_extensions/thread.rb
 - lib/epuber/server.rb
 - lib/epuber/server/auto_refresh/auto_refresh.coffee
@@ -538,7 +552,7 @@ homepage: https://github.com/epuber-io/epuber
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -546,16 +560,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Epuber is simple tool to compile and pack source files into EPUB format.
 test_files: []

data/lib/epuber/ruby_extensions/string.rb

@@ -1,16 +0,0 @@
-
-begin
-  require 'unicode_normalize'
-rescue LoadError
-  # silently fail
-
-  require 'active_support/multibyte/unicode'
-
-  class String
-    unless respond_to?(:unicode_normalize)
-      def unicode_normalize
-        ActiveSupport::Multibyte::Unicode.normalize(self)
-      end
-    end
-  end
-end