epuber 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94e989f6c4461b34fe954d6d60a7b09c573f1c53281bcab8ce0014b2311a47f
-  data.tar.gz: 12c22458537652c184dd1fdc054faa2cbb26d161cfbd6ed4ec45fe2ecd49c430
+  metadata.gz: cdced1dd2ebd0dc9d67e06757560ed5acd26d93303db343b53985b3c7aeebe20
+  data.tar.gz: e979d0957ff1a554bc4f29cb4e2bbe6cd0a113a83a42ed46a6e80c8f049e8008
 SHA512:
-  metadata.gz: ee04850fd4bcc3d2ce2ed97f4c9f14356b7dfffa25bac2decb4cf079ed8eeefc797cacb5ca891930d7da97c910d714bc1074e259b3afc4452b3af74b5753adbc
-  data.tar.gz: da0f454494fbe9964f71f0a3ca74aca9c586c4132846b6980c1f58f3499b0f7183164c31bda542698ff6ac1db1e7daa9b8077be83114c5f0bf10b6de1a062892
+  metadata.gz: b2ea5b2448b893e8c1c6cb47d4868cdfcd8e16aefeb54733c880c686107439ba51ec50aa89f0f571b6322998d5fe1d4862d4b8a4e78df003fbe4d1d849ebcbc9
+  data.tar.gz: 6492a8277ff6d0179a5fd91e3758cc0edc5ff73faf584237336395a52d151654a7c451085ddde6e40532010b3e6d5f9046a3f058237c7879b6da184141b63877

data/lib/epuber/compiler/file_resolver.rb

@@ -36,19 +36,19 @@ module Epuber
       attr_reader :destination_path
 
 
-      # @return [Array<FileTypes::Abstract>] all files that will be in spine
+      # @return [Array<Epuber::Compiler::FileTypes::AbstractFile>] all files that will be in spine
       #
       attr_reader :spine_files
 
-      # @return [Array<FileTypes::Abstract>] all files that has to be in manifest file (OPF)
+      # @return [Array<Epuber::Compiler::FileTypes::AbstractFile>] all files that has to be in manifest file (OPF)
       #
       attr_reader :manifest_files
 
-      # @return [Array<FileTypes::Abstract>] all files that will be copied to EPUB package
+      # @return [Array<Epuber::Compiler::FileTypes::AbstractFile>] all files that will be copied to EPUB package
       #
       attr_reader :package_files
 
-      # @return [Array<FileTypes::Abstract>] totally all files
+      # @return [Array<Epuber::Compiler::FileTypes::AbstractFile>] totally all files
       #
       attr_reader :files
 

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

@@ -27,9 +27,12 @@ module Epuber
         # @param [Compiler::CompilationContext] compilation_context
         #
         def process(compilation_context)
-          return if destination_file_up_to_date?
-
-          write_processed(process_css(File.read(abs_source_path), compilation_context))
+          if destination_file_up_to_date?
+            # HACK: for now, we need to process the file again, because we need to find linked files
+            process_css(File.read(final_destination_path), compilation_context)
+          else
+            write_processed(process_css(File.read(abs_source_path), compilation_context))
+          end
         end
 
         # Processes CSS file, resolves all linked files and adds them to file resolver
@@ -49,8 +52,10 @@ module Epuber
           # resolve links to files, add other linked resources and compute correct path
           UI.print_step_processing_time('resolving url()') do
             parser.each_rule_set do |rule_set, _media_types|
+              # @type [CssParser::RuleSet::Declarations]
               declarations = rule_set.instance_eval { @declarations }
               declarations.each do |property, decl_value|
+                # @type [String]
                 value = decl_value.to_s
                 next unless value =~ URL_REGEXP
 
@@ -70,8 +75,10 @@ module Epuber
                 new_url = SourceFile.resolve_relative_file(destination_path,
                                                            path,
                                                            compilation_context.file_resolver,
-                                                           group: resource_group)
-                content = content.gsub(value, "url(#{quote}#{new_url}#{quote})")
+                                                           group: resource_group,
+                                                           location: self)
+
+                content = content.gsub(value, "url(#{quote}#{new_url}#{quote})") if new_url
               end
             end
           end

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

@@ -36,6 +36,12 @@ module Epuber
           # do nothing
         end
 
+        # @return [Set<Symbol>] list of properties
+        #
+        def properties
+          file_request&.properties || super
+        end
+
         # Source file does not change from last build
         # @warning Using only this method can cause not updating files that are different for targets
         #
@@ -113,7 +119,7 @@ module Epuber
           end
         end
 
-        def self.resolve_relative_file(destination_path, pattern, file_resolver, group: nil)
+        def self.resolve_relative_file(destination_path, pattern, file_resolver, group: nil, location: nil)
           dirname = File.dirname(destination_path)
 
           begin
@@ -127,7 +133,8 @@ module Epuber
             rescue XHTMLProcessor::UnparseableLinkError,
                    FileFinders::FileNotFoundError,
                    FileFinders::MultipleFilesFoundError => e
-              UI.warning(e.to_s, location: img)
+              UI.warning(e.to_s, location: location)
+              return nil
             end
           end
 

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

@@ -11,7 +11,11 @@ module Epuber
         # @param [Compiler::CompilationContext] compilation_context
         #
         def process(compilation_context)
-          return if destination_file_up_to_date?
+          if destination_file_up_to_date?
+            # HACK: for now, we need to process the file again, because we need to find linked files
+            process_css(File.read(final_destination_path), compilation_context)
+            return
+          end
 
           Stylus.define('__is_debug', !compilation_context.release_build)
           Stylus.define('__is_verbose_mode', compilation_context.verbose?)

data/lib/epuber/compiler/opf_generator.rb

@@ -126,7 +126,10 @@ module Epuber
           cover_image = @target.cover_image
           unless cover_image.nil?
             cover_image_result = @file_resolver.file_from_request(cover_image)
-            @xml.meta(name: 'cover', content: create_id_from_path(pretty_path(cover_image_result)))
+            if cover_image_result
+              @xml.meta(name: 'cover',
+                        content: create_id_from_path(pretty_path(cover_image_result)))
+            end
           end
 
           if epub_version >= 3
@@ -164,8 +167,11 @@ module Epuber
 
             properties = file.properties
             if properties.length.positive? && @target.epub_version >= 3
-              pretty_properties = properties.to_a.map { |property| PROPERTIES_MAP[property] }.join(' ')
-              attrs['properties'] = pretty_properties
+              formatted = properties.to_a
+                                    .map { |prop| PROPERTIES_MAP[prop] }
+                                    .compact
+                                    .join(' ')
+              attrs['properties'] = formatted unless formatted.empty?
             end
 
             @xml.item(attrs)

data/lib/epuber/compiler/xhtml_processor.rb

@@ -351,7 +351,8 @@ module Epuber
           new_path = Compiler::FileTypes::SourceFile.resolve_relative_file(file_path,
                                                                            path,
                                                                            file_resolver,
-                                                                           group: resource_group)
+                                                                           group: resource_group,
+                                                                           location: img)
           img[attribute_name] = new_path if new_path
         end
       end

data/lib/epuber/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Epuber
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 
   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.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -594,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Epuber is simple tool to compile and pack source files into EPUB format.