epuber 0.7.4 → 0.9.0

data/lib/epuber/user_interface.rb

@@ -8,7 +8,7 @@ require_relative 'command'
 
 module Epuber
   class UserInterface
-    Location = Struct.new(:path, :lineno)
+    Location = Struct.new(:path, :lineno, :column, keyword_init: true)
 
     class << self
       # @return [Epuber::Command]
@@ -35,7 +35,10 @@ module Epuber
     def self.error(message, location: nil)
       _clear_processing_line_for_new_output do
         $stdout.puts(_format_message(:error, message, location: location))
-        _print_backtrace(location.try(:backtrace_locations) || message.try(:backtrace_locations) || caller_locations, location: location) if current_command && current_command.verbose?
+        if current_command&.verbose?
+          _print_backtrace(location.try(:backtrace_locations) || message.try(:backtrace_locations) || caller_locations,
+                           location: location)
+        end
       end
     end
 
@@ -48,10 +51,6 @@ module Epuber
       end
     end
 
-
-
-
-
     # @param [#to_s] problem some problem, object just have to know to convert self into string with method #to_s
     #
     def self.print_processing_problem(problem)
@@ -63,16 +62,16 @@ module Epuber
     # @param [String] info_text
     #
     def self.print_processing_debug_info(info_text)
-      if current_command && current_command.verbose?
-        _clear_processing_line_for_new_output do
-          message = if @current_file.nil?
-                      "▸ #{info_text}"
-                    else
-                      "▸ #{@current_file.source_path}: #{info_text}"
-                    end
-
-          $stdout.puts(message.ansi.send(_color_from_level(:debug)))
-        end
+      return unless current_command&.verbose?
+
+      _clear_processing_line_for_new_output do
+        message = if @current_file.nil?
+                    "▸ #{info_text}"
+                  else
+                    "▸ #{@current_file.source_path}: #{info_text}"
+                  end
+
+        $stdout.puts(message.ansi.send(_color_from_level(:debug)))
       end
     end
 
@@ -107,14 +106,18 @@ module Epuber
       @current_file = nil
     end
 
+    def self.puts(message)
+      _clear_processing_line_for_new_output do
+        $stdout.puts(message)
+      end
+    end
+
     # @param [Compiler::FileTypes::AbstractFile] file
     # @param [String] step_name
     # @param [Fixnum] time
     #
     def self.print_step_processing_time(step_name, time = nil)
-      if !current_command || !current_command.debug_steps_times
-        return yield
-      end
+      return yield if !current_command || !current_command.debug_steps_times
 
       remove_processing_file_line
 
@@ -137,8 +140,6 @@ module Epuber
       returned_value
     end
 
-    private
-
     def self._clear_processing_line_for_new_output
       last_line = remove_processing_file_line
 
@@ -154,12 +155,12 @@ module Epuber
     #
     def self._color_from_level(level)
       case level
-        when :error;   :red
-        when :warning; :yellow
-        when :normal;  :white
-        when :debug;   :blue
-        else
-          raise "Unknown output level #{level}"
+      when :error then   :red
+      when :warning then :yellow
+      when :normal then  :white
+      when :debug then   :blue
+      else
+        raise "Unknown output level #{level}"
       end
     end
 
@@ -170,13 +171,13 @@ module Epuber
     def self._location_from_obj(obj)
       case obj
       when ::Thread::Backtrace::Location
-        Location.new(obj.path, obj.lineno)
+        Location.new(path: obj.path, lineno: obj.lineno)
       when ::Nokogiri::XML::Node
-        Location.new(obj.document.file_path, obj.line)
+        Location.new(path: obj.document.file_path, lineno: obj.line)
       when Location
         obj
       when Epuber::Compiler::FileTypes::AbstractFile
-        Location.new(obj.source_path, nil)
+        Location.new(path: obj.source_path)
       end
     end
 
@@ -191,12 +192,22 @@ module Epuber
 
       comps = []
       comps << message.to_s
-      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
+      message_already_formatted =
+        message.is_a?(Epuber::Compiler::Problem) || message.is_a?(Epuber::Checker::TextChecker::MatchProblem)
+
+      if !location.nil? && !message_already_formatted
+        path = location.path
+
+        # calculate relative path when path is absolute and in project
+        path = path[Config.instance.project_path.size + 1..-1] if path.start_with?(Config.instance.project_path)
+
+        line_parts = [
+          "  (in file #{path}",
+        ]
+        line_parts << "line #{location.lineno}" if location.lineno
+        line_parts << "column #{location.column}" if location.column
+
+        comps << "#{line_parts.join(' ')})"
       end
 
       comps.join("\n").ansi.send(_color_from_level(level))
@@ -209,13 +220,13 @@ module Epuber
     #
     def self._format_backtrace(locations, location: nil)
       index = locations.index(location) || 0
-      locations[index, locations.size].map { |loc| loc.to_s }
+      locations[index, locations.size].map(&:to_s)
     end
 
     # @param [Thread::Backtrace::Location] location location of the error
     #
     def self._print_backtrace(locations, location: nil)
-      puts(_format_backtrace(locations, location: location)) if current_command.verbose?
+      $stdout.puts(_format_backtrace(locations, location: location)) if current_command.verbose?
     end
   end
 

data/lib/epuber/vendor/hash_binding.rb

@@ -8,19 +8,26 @@ module Epuber
       @vars = vars
     end
 
+    # @return [Boolean]
+    #
+    def respond_to_missing?(name, _include_private = false)
+      @vars.key?(name) || super
+    end
+
     # @param [String] name
     #
     def method_missing(name)
       raise NameError, "Not found value for key #{name}" unless @vars.key?(name)
+
       @vars[name]
     end
 
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
 
     def get_binding
       binding
     end
 
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
   end
 end

data/lib/epuber/vendor/ruby_templater.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Lint/Eval
-
 require_relative 'hash_binding'
 
 module Epuber
@@ -18,7 +16,7 @@ module Epuber
     #
     attr_accessor :locals
 
-    # @param source [String]
+    # @param [String] source
     #
     # @return [self]
     #
@@ -29,7 +27,7 @@ module Epuber
       inst
     end
 
-    # @param file [String, File]
+    # @param [String, File] file
     #
     # @return [self]
     #
@@ -48,7 +46,7 @@ module Epuber
     # DSL methods
 
 
-    # @param locals [Hash]
+    # @param [Hash] locals
     #
     # @return [self]
     #
@@ -62,9 +60,7 @@ module Epuber
     def render
       hash_binding = HashBinding.new(locals)
       eval_string = %(%(#{source_text}))
-      eval(eval_string, hash_binding.get_binding)
+      eval(eval_string, hash_binding.get_binding) # rubocop:disable Security/Eval
     end
   end
 end
-
-# rubocop:enable Lint/Eval

data/lib/epuber/vendor/version.rb

@@ -2,7 +2,7 @@
 
 # Most of this code is taken from github.com/CocoaPods/Core/blob/master/lib/cocoapods-core/vendor/version.rb
 
-def is_number(other)
+def number?(other)
   other.is_a?(Numeric) || other.is_a?(Integer) || other.is_a?(Float)
 end
 
@@ -10,7 +10,7 @@ module Epuber
   class Version
     include Comparable
 
-    VERSION_RE ||= /\A[0-9]+(\.[0-9a-zA-Z]+)*\z/
+    VERSION_RE = /\A[0-9]+(\.[0-9a-zA-Z]+)*\z/.freeze
 
     # True if the +version+ string matches RubyGems' requirements.
     #
@@ -18,15 +18,13 @@ module Epuber
       version.to_s =~ VERSION_RE
     end
 
-    attr_reader :version, :segments
+    attr_reader :version
 
 
     # @param [String, Numeric] version input primitive value for version
     #
     def initialize(version)
-      unless self.class.correct?(version)
-        raise StandardError, "Malformed version number string #{version}"
-      end
+      raise StandardError, "Malformed version number string #{version}" unless self.class.correct?(version)
 
       @version = version.to_s.strip
     end
@@ -42,7 +40,7 @@ module Epuber
     # @return [String]
     #
     def to_s
-      "#{segments.join('.')}"
+      segments.join('.').to_s
     end
 
     # Compares this version with +other+ returning -1, 0, or 1 if the
@@ -53,7 +51,8 @@ module Epuber
     #
     def <=>(other)
       return unless other.is_a?(Version) || other.is_a?(String) || other.is_a?(Float) || other.is_a?(Integer)
-      other = other.is_a?(Version) ? other : Version.new(other)
+
+      other = Version.new(other) unless other.is_a?(Version)
 
       return 0 if @version == other.version
 
@@ -62,17 +61,18 @@ module Epuber
 
       lhsize = lhsegments.size
       rhsize = rhsegments.size
-      limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
+      limit  = [lhsize, rhsize].max - 1
 
       i = 0
 
       while i <= limit
-        lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
+        lhs = lhsegments[i] || 0
+        rhs = rhsegments[i] || 0
         i += 1
 
         next      if lhs == rhs
-        return -1 if lhs.is_a?(String) && is_number(rhs)
-        return  1 if is_number(lhs) && rhs.is_a?(String)
+        return -1 if lhs.is_a?(String) && number?(rhs)
+        return  1 if number?(lhs) && rhs.is_a?(String)
 
         return lhs <=> rhs
       end

data/lib/epuber/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Epuber
-  VERSION = '0.7.4'
+  VERSION = '0.9.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.7.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,27 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,33 +73,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: claide
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +154,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -243,25 +257,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: epuber-stylus
+  name: bade
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -277,87 +291,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: bade
+  name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.8'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: epuber-stylus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: 1.1.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.1.1
 description:
 email:
 - samnung@gmail.com
@@ -378,11 +350,13 @@ files:
 - lib/epuber/book/target.rb
 - lib/epuber/book/toc_item.rb
 - lib/epuber/checker.rb
+- lib/epuber/checker/bookspec_checker.rb
 - lib/epuber/checker/text_checker.rb
 - lib/epuber/checker_transformer_base.rb
 - lib/epuber/command.rb
 - lib/epuber/command/build.rb
 - lib/epuber/command/compile.rb
+- lib/epuber/command/from_file.rb
 - lib/epuber/command/init.rb
 - lib/epuber/command/server.rb
 - lib/epuber/compiler.rb
@@ -397,6 +371,7 @@ files:
 - lib/epuber/compiler/file_types/bade_file.rb
 - lib/epuber/compiler/file_types/coffee_script_file.rb
 - lib/epuber/compiler/file_types/container_xml_file.rb
+- lib/epuber/compiler/file_types/css_file.rb
 - lib/epuber/compiler/file_types/generated_file.rb
 - lib/epuber/compiler/file_types/ibooks_display_options_file.rb
 - lib/epuber/compiler/file_types/image_file.rb
@@ -418,6 +393,12 @@ files:
 - lib/epuber/dsl/attribute_support.rb
 - lib/epuber/dsl/object.rb
 - lib/epuber/dsl/tree_object.rb
+- lib/epuber/epubcheck.rb
+- lib/epuber/from_file/bookspec_generator.rb
+- lib/epuber/from_file/encryption_handler.rb
+- lib/epuber/from_file/from_file_executor.rb
+- lib/epuber/from_file/nav_file.rb
+- lib/epuber/from_file/opf_file.rb
 - lib/epuber/helper.rb
 - lib/epuber/lockfile.rb
 - lib/epuber/plugin.rb
@@ -432,10 +413,6 @@ files:
 - lib/epuber/server/basic.styl
 - lib/epuber/server/book_content.styl
 - lib/epuber/server/default_cover.png
-- lib/epuber/server/fonts/AvenirNext/AvenirNext-Bold.ttf
-- lib/epuber/server/fonts/AvenirNext/AvenirNext-BoldItalic.ttf
-- lib/epuber/server/fonts/AvenirNext/AvenirNext-Italic.ttf
-- lib/epuber/server/fonts/AvenirNext/AvenirNext-Regular.ttf
 - lib/epuber/server/handlers.rb
 - lib/epuber/server/keyboard_control.coffee
 - lib/epuber/server/pages/book.bade
@@ -588,6 +565,7 @@ files:
 - lib/epuber/third_party/bower/bower_components/uri.js/src/jquery.URI.min.js
 - lib/epuber/third_party/bower/bower_components/uri.js/src/punycode.js
 - lib/epuber/transformer.rb
+- lib/epuber/transformer/book_transformer.rb
 - lib/epuber/transformer/text_transformer.rb
 - lib/epuber/user_interface.rb
 - lib/epuber/vendor/hash_binding.rb
@@ -599,7 +577,8 @@ files:
 homepage: https://github.com/epuber-io/epuber
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -615,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Epuber is simple tool to compile and pack source files into EPUB format.