epuber 0.8.0 → 0.9.1

data/lib/epuber/server.rb

@@ -179,8 +179,8 @@ module Epuber
       self.class.build_path
     end
 
-    # @param level [Symbol]
-    # @param message [String]
+    # @param [Symbol] level
+    # @param [String] message
     #
     # @return nil
     #
@@ -208,7 +208,7 @@ module Epuber
 
     # @!group Helpers
 
-    # @param pattern [String]
+    # @param [String] pattern
     #
     # @return [String] path to file
     #
@@ -217,7 +217,7 @@ module Epuber
       finder.find_files(pattern).first
     end
 
-    # @param index [Fixnum]
+    # @param [Fixnum] index
     # @return [Epuber::Book::File, nil]
     #
     def spine_file_at(index)
@@ -257,8 +257,8 @@ module Epuber
       add_script_to_head(html_doc, source)
     end
 
-    # @param html_doc [Nokogiri::HTML::Document]
-    # @param script_text [String]
+    # @param [Nokogiri::HTML::Document] html_doc
+    # @param [String] script_text
     #
     def add_script_to_head(html_doc, script_text)
       script_node = html_doc.create_element('script', script_text, type: 'text/javascript')
@@ -272,7 +272,7 @@ module Epuber
       head.add_child(script_node)
     end
 
-    # @param html_doc [Nokogiri::HTML::Document]
+    # @param [Nokogiri::HTML::Document] html_doc
     #
     def add_auto_refresh_script(html_doc)
       add_file_to_head(:js, html_doc, 'auto_refresh/reloader.coffee')
@@ -282,7 +282,7 @@ module Epuber
       add_script_to_head(html_doc, 'var auto_refresh = new AutoRefresh(window, console);')
     end
 
-    # @param html_doc [Nokogiri::HTML::Document]
+    # @param [Nokogiri::HTML::Document] html_doc
     #
     def add_keyboard_control_script(html_doc, previous_path, next_path)
       add_script_file_to_head(html_doc, 'keyboard_control.coffee',
@@ -290,7 +290,7 @@ module Epuber
                               '$next_path' => next_path)
     end
 
-    # @param html_doc [Nokogiri::HTML::Document]
+    # @param [Nokogiri::HTML::Document] html_doc
     #
     def add_file_to_head(type, html_doc, file_path)
       head = html_doc.at_css('head')
@@ -310,9 +310,9 @@ module Epuber
       head.add_child(node)
     end
 
-    # @param html_doc [Nokogiri::HTML::Document]
-    # @param key [String]
-    # @param value [String]
+    # @param [Nokogiri::HTML::Document] html_doc
+    # @param [String] key
+    # @param [String] value
     #
     def add_meta_to_head(name, content, html_doc, force: false)
       head = html_doc.at_css('head')
@@ -368,7 +368,7 @@ module Epuber
       @compilation_thread.join
     end
 
-    # @param message [String]
+    # @param [String] message
     #
     def self.send_to_clients(message)
       _log :info, "sending message to clients #{message.inspect}"
@@ -378,7 +378,7 @@ module Epuber
       end
     end
 
-    # @param type [Symbol]
+    # @param [Symbol] type
     def self.notify_clients(type, data = nil)
       _log :info, "Notifying clients with type #{type.inspect}"
       raise "Not known type `#{type}`" unless %i[styles reload compile_start compile_end].include?(type)
@@ -401,9 +401,9 @@ module Epuber
       files_paths.select { |file| file_resolver.file_with_source_path(file) || book.file_path == file }
     end
 
-    # @param modified [Array<String>]
-    # @param added [Array<String>]
-    # @param removed [Array<String>]
+    # @param [Array<String>] modified
+    # @param [Array<String>] added
+    # @param [Array<String>] removed
     #
     def self.changes_detected(modified, added, removed)
       all_changed = (modified + added + removed).uniq.map(&:unicode_normalize)

data/lib/epuber/transformer/book_transformer.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require_relative '../transformer'
+
+module Epuber
+  class Transformer
+    class BookTransformer < Transformer
+      # @return [Book]
+      #
+      attr_accessor :book
+
+      # @return [CompilationContext]
+      #
+      attr_accessor :compilation_context
+
+      # @param [Epuber::Book] book
+      # @param [Epuber::Compiler::CompilationContext] compilation_context
+      #
+      def call(book, compilation_context)
+        @book = book
+        @compilation_context = compilation_context
+
+        @block.call(self, @book, @compilation_context)
+
+        @book = nil
+        @compilation_context = nil
+      end
+
+      # Find file in source or destination paths
+      #
+      # @param [String] pattern
+      # @param [Thread::Backtrace::Location] location
+      #
+      # @return [Epuber::Compiler::FileTypes::AbstractFile, nil]
+      #
+      def find_file(pattern, location: caller_locations.first)
+        return pattern if pattern.is_a?(Compiler::FileTypes::AbstractFile)
+
+        UI.error!("Pattern for finding file can't be nil", location: location) if pattern.nil?
+
+        begin
+          path = @compilation_context.file_resolver.source_finder.find_file(pattern)
+          @compilation_context.file_resolver.file_with_source_path(path)
+        rescue Compiler::FileFinders::FileNotFoundError
+          begin
+            path = @compilation_context.file_resolver.dest_finder.find_file(pattern)
+            @compilation_context.file_resolver.file_with_destination_path(path)
+          rescue Compiler::FileFinders::FileNotFoundError
+            nil
+          end
+        end
+      end
+
+      # Find files destination paths
+      #
+      # @param [String] pattern
+      # @param [Thread::Backtrace::Location] location
+      #
+      # @return [Array<Epuber::Compiler::FileTypes::AbstractFile>]
+      #
+      def find_destination_files(pattern, location: caller_locations.first)
+        UI.error!("Pattern for finding file can't be nil", location: location) if pattern.nil?
+
+        paths = @compilation_context.file_resolver.dest_finder.find_files(pattern)
+        paths.map { |path| @compilation_context.file_resolver.file_with_destination_path(path) }
+      end
+
+      # Find file and raise exception if not found
+      #
+      # @param [String] pattern
+      # @param [Thread::Backtrace::Location] location
+      #
+      # @return [Epuber::Compiler::FileTypes::AbstractFile]
+      #
+      def get_file(pattern, location: caller_locations.first)
+        file = find_file(pattern, location: location)
+        UI.error!("File with pattern #{pattern} not found", location: location) unless file
+
+        file
+      end
+
+      # Read file from destination path (raises exception if not found)
+      #
+      # @param [String] pattern
+      # @param [Thread::Backtrace::Location] location
+      #
+      # @return [String]
+      #
+      def read_destination_file(pattern, location: caller_locations.first)
+        file = get_file(pattern, location: location)
+        File.read(file.final_destination_path)
+      end
+
+      # Write file to destination path (raises exception if not found)
+      #
+      # @param [String] pattern
+      # @param [String] content
+      # @param [Thread::Backtrace::Location] location
+      #
+      # @return [void]
+      #
+      def write_destination_file(pattern, content, location: caller_locations.first)
+        file = get_file(pattern, location: location)
+        Compiler::FileTypes::AbstractFile.write_to_file(content, file.final_destination_path)
+      end
+    end
+  end
+end

data/lib/epuber/transformer.rb

@@ -5,6 +5,7 @@ require_relative 'checker_transformer_base'
 module Epuber
   class Transformer < CheckerTransformerBase
     require_relative 'transformer/text_transformer'
+    require_relative 'transformer/book_transformer'
 
     # @return [Hash<Symbol, Class>]
     #
@@ -12,6 +13,7 @@ module Epuber
       {
         result_text_xhtml_string: TextTransformer,
         source_text_file: TextTransformer,
+        after_all_text_files: BookTransformer,
       }.merge(super)
     end
   end

data/lib/epuber/user_interface.rb

@@ -192,9 +192,9 @@ module Epuber
 
       comps = []
       comps << message.to_s
-      message_already_formatted = (
+      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
 

data/lib/epuber/vendor/ruby_templater.rb

@@ -16,7 +16,7 @@ module Epuber
     #
     attr_accessor :locals
 
-    # @param source [String]
+    # @param [String] source
     #
     # @return [self]
     #
@@ -27,7 +27,7 @@ module Epuber
       inst
     end
 
-    # @param file [String, File]
+    # @param [String, File] file
     #
     # @return [self]
     #
@@ -46,7 +46,7 @@ module Epuber
     # DSL methods
 
 
-    # @param locals [Hash]
+    # @param [Hash] locals
     #
     # @return [self]
     #

data/lib/epuber/vendor/version.rb

@@ -10,7 +10,7 @@ module Epuber
   class Version
     include Comparable
 
-    VERSION_RE ||= /\A[0-9]+(\.[0-9a-zA-Z]+)*\z/.freeze
+    VERSION_RE = /\A[0-9]+(\.[0-9a-zA-Z]+)*\z/.freeze
 
     # True if the +version+ string matches RubyGems' requirements.
     #
@@ -52,7 +52,7 @@ 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
 
@@ -61,7 +61,7 @@ module Epuber
 
       lhsize = lhsegments.size
       rhsize = rhsegments.size
-      limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
+      limit  = [lhsize, rhsize].max - 1
 
       i = 0
 

data/lib/epuber/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Epuber
-  VERSION = '0.8.0'
+  VERSION = '0.9.1'
 
   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.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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
@@ -277,87 +291,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: epuber-stylus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: fakefs
+  name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: epuber-stylus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: 1.1.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.1.1
 description:
 email:
 - samnung@gmail.com
@@ -384,6 +356,7 @@ files:
 - 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
@@ -398,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
@@ -420,6 +394,11 @@ files:
 - 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
@@ -586,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
@@ -597,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: