epuber 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 603ed8123e624a5756c2e66ef8e2561f76f60b7c2ba386040e62cc1bace24c52
-  data.tar.gz: bc9fd362419d5fd05444398221f8d0e9bbfa4675273635b893c3a160a3330048
+  metadata.gz: e7acd7fcb74da144389521daa83a8fb681015b82d5cc8a1da35de6058d26fec3
+  data.tar.gz: d61a1ac243fc871f6bf2a114d24936b123ed5a28666057b76fb3fc0da6109265
 SHA512:
-  metadata.gz: 5f04920782210213a3c5fb8e424d8b22e3a316d83187dae331057759d4bda04b61b81c163215086fa4cad4abd736de37db43c428b56b51472f8d93c9bbadb5e3
-  data.tar.gz: a683e1930bf8c58b8b9f64529ac55c50dbe0895af5acbb4d4820cf1f5d0559349e87cd3f02c0bf7a90c77b04d4a9a07acee849cb867f8f81a658484e74514e35
+  metadata.gz: 85a24b75e370556e3a028e0c118b4f4bc36395c4140472ddfde4be4c46fd95549fecf3d18c28d72bf545b13f9850d82394ea509b8a97d9e3f1078f678d28647e
+  data.tar.gz: 62483b8f634b572336cbede86754baa95d3627ac0c69d4f47e44ca701e57b201b53e0b9568a22fd7d4c3ebee6f345c1b132012be303f0ab73ed4db26d332deb3

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

@@ -40,8 +40,6 @@ module Epuber
         # @return [String]
         #
         def process_css(content, compilation_context)
-          file_resolver = compilation_context.file_resolver
-
           parser = UI.print_step_processing_time('css parsing') do
             parser = CssParser::Parser.new
             parser.load_string!(content)
@@ -69,27 +67,10 @@ module Epuber
                 next if path.start_with?('data:') || path.start_with?('http://') || path.start_with?('https://')
 
                 resource_group = DECLARATION_TO_FILE_GROUP_MAP[property]
-                dirname = File.dirname(destination_path)
-
-                begin
-                  new_path = file_resolver.dest_finder.find_file(path, groups: resource_group, context_path: dirname)
-                rescue FileFinders::FileNotFoundError, FileFinders::MultipleFilesFoundError
-                  new_path = XHTMLProcessor.resolved_link_to_file(path,
-                                                                  resource_group,
-                                                                  dirname,
-                                                                  file_resolver.source_finder).to_s
-                  pkg_abs_path = File.expand_path(new_path, dirname).unicode_normalize
-                  pkg_new_path = Pathname.new(pkg_abs_path)
-                                         .relative_path_from(Pathname.new(file_resolver.source_path))
-                                         .to_s
-
-                  file_class = FileResolver.file_class_for(File.extname(new_path))
-                  file = file_class.new(pkg_new_path)
-                  file.path_type = :manifest
-                  file_resolver.add_file(file)
-                end
-
-                new_url = FileResolver.renamed_file_with_path(new_path)
+                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})")
               end
             end

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

@@ -112,6 +112,37 @@ module Epuber
             MSG
           end
         end
+
+        def self.resolve_relative_file(destination_path, pattern, file_resolver, group: nil)
+          dirname = File.dirname(destination_path)
+
+          begin
+            new_path = file_resolver.dest_finder.find_file(pattern, groups: group, context_path: dirname)
+          rescue FileFinders::FileNotFoundError, FileFinders::MultipleFilesFoundError
+            begin
+              new_path = XHTMLProcessor.resolved_link_to_file(pattern,
+                                                              group,
+                                                              dirname,
+                                                              file_resolver.source_finder).to_s
+            rescue XHTMLProcessor::UnparseableLinkError,
+                   FileFinders::FileNotFoundError,
+                   FileFinders::MultipleFilesFoundError => e
+              UI.warning(e.to_s, location: img)
+            end
+          end
+
+          pkg_abs_path = File.expand_path(new_path, dirname).unicode_normalize
+          pkg_new_path = Pathname.new(pkg_abs_path)
+                                 .relative_path_from(Pathname.new(file_resolver.source_path))
+                                 .to_s
+
+          file_class = FileResolver.file_class_for(File.extname(new_path))
+          file = file_class.new(pkg_new_path)
+          file.path_type = :manifest
+          file_resolver.add_file(file)
+
+          FileResolver.renamed_file_with_path(new_path)
+        end
       end
     end
   end

data/lib/epuber/compiler/xhtml_processor.rb

@@ -342,34 +342,15 @@ module Epuber
       end
 
       def self.resolve_resources_in(node_css_query, attribute_name, resource_group, xhtml_doc, file_path, file_resolver)
-        dirname = File.dirname(file_path)
-
         xhtml_doc.css(node_css_query).each do |img|
           path = img[attribute_name]
           next if path.nil?
 
-          begin
-            new_path = file_resolver.dest_finder.find_file(path, groups: resource_group, context_path: dirname)
-          rescue UnparseableLinkError, FileFinders::FileNotFoundError, FileFinders::MultipleFilesFoundError
-            begin
-              new_path = resolved_link_to_file(path, resource_group, dirname, file_resolver.source_finder).to_s
-              pkg_abs_path = File.expand_path(new_path, dirname).unicode_normalize
-              pkg_new_path = Pathname.new(pkg_abs_path).relative_path_from(Pathname.new(file_resolver.source_path)).to_s
-
-              file_class = FileResolver.file_class_for(File.extname(new_path))
-              file = file_class.new(pkg_new_path)
-              file.path_type = :manifest
-              file_resolver.add_file(file)
-
-              new_path = FileResolver.renamed_file_with_path(new_path)
-            rescue UnparseableLinkError, FileFinders::FileNotFoundError, FileFinders::MultipleFilesFoundError => e
-              UI.warning(e.to_s, location: img)
-
-              next
-            end
-          end
-
-          img[attribute_name] = new_path
+          new_path = Compiler::FileTypes::SourceFile.resolve_relative_file(file_path,
+                                                                           path,
+                                                                           file_resolver,
+                                                                           group: resource_group)
+          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.0'
+  VERSION = '0.9.1'
 
   HOME_URL = 'https://github.com/epuber-io/epuber'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Roman Kříž