epuber 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d17540fe810ca7f516d68b3ce1e2e7cc177751f5642280a62e849c06538b548
-  data.tar.gz: d95c25089769b8c400fbde4da71ff87af30ee5d9c4c24a95043dac44fc794763
+  metadata.gz: 2c22c5e5a5820ba5dd1090ddc015276e877b4aa535d3b0cdd83c526a6604aa5b
+  data.tar.gz: c8ac2c195d24bfb1971656d64777b1849b1371d59506559942c00ac826b58963
 SHA512:
-  metadata.gz: 1d29fc3294f95370590d6cc325cece7375418ca80da33c023492fcae9cb565bd09af520d6fc13b1050cb351e32aab7995549d0a84ef74947a775f8d496ddb97c
-  data.tar.gz: 17c3e0eb6de4ce7cc736a19cb752b368592738c40121e592fe6e25e3c2bfed230b7d8740758137cae244ccfa94e023cdd93cfae6f4b54c5451dc2327075c5b49
+  metadata.gz: e5bbc9209f434dd869bbc6ca75ebaf0eca0945597665e6d1fb984cdf3e11193e3b59ee284c89c5eb46abc3fc3932b7168282dc73340e72afc2419422d8da9918
+  data.tar.gz: bb1fe4b5fbad4f79d69b1f357ca58c58aaa7abd504b8c9fec96dd7b6105060a3ef53a93db579b0ef6ddb1565433c1d8f30dc8afbd484817dd92839aafb88109f

data/Gemfile

@@ -15,5 +15,5 @@ gem 'rubocop', '~> 1.14'
 gem 'ruby-lsp', require: false
 
 group :dev, optional: true do
-  gem 'rubocop-rspec', require: false
+  gem 'rubocop-rspec', '~> 2.0', require: false
 end

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

@@ -22,7 +22,7 @@ module Epuber
           'src' => :font,
         }.freeze
 
-        URL_REGEXP = /url\((.+)\)/.freeze
+        URL_REGEXP = /url\((.+?)\)/.freeze
 
         # @param [Compiler::CompilationContext] compilation_context
         #
@@ -55,30 +55,29 @@ module Epuber
               # @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
+                decl_value.to_s.scan(URL_REGEXP) do
+                  url_function = Regexp.last_match(0)
+                  path = Regexp.last_match(1)
+                  if path.start_with?('"') && path.end_with?('"')
+                    path = path[1..-2]
+                    quote = '"'
+                  end
+                  if path.start_with?("'") && path.end_with?("'")
+                    path = path[1..-2]
+                    quote = "'"
+                  end
 
-                path = Regexp.last_match(1)
-                if path.start_with?('"') && path.end_with?('"')
-                  path = path[1..-2]
-                  quote = '"'
-                end
-                if path.start_with?("'") && path.end_with?("'")
-                  path = path[1..-2]
-                  quote = "'"
-                end
+                  next if path.start_with?('data:') || path.start_with?('http://') || path.start_with?('https://')
 
-                next if path.start_with?('data:') || path.start_with?('http://') || path.start_with?('https://')
+                  resource_group = DECLARATION_TO_FILE_GROUP_MAP[property]
+                  new_url = SourceFile.resolve_relative_file(destination_path,
+                                                             path,
+                                                             compilation_context.file_resolver,
+                                                             group: resource_group,
+                                                             location: self)
 
-                resource_group = DECLARATION_TO_FILE_GROUP_MAP[property]
-                new_url = SourceFile.resolve_relative_file(destination_path,
-                                                           path,
-                                                           compilation_context.file_resolver,
-                                                           group: resource_group,
-                                                           location: self)
-
-                content = content.gsub(value, "url(#{quote}#{new_url}#{quote})") if new_url
+                  content = content.gsub(url_function, "url(#{quote}#{new_url}#{quote})") if new_url
+                end
               end
             end
           end

data/lib/epuber/epubcheck.rb

@@ -36,25 +36,6 @@ module Epuber
       def error?
         level == :error || level == :fatal
       end
-
-      def self.from_json(json)
-        json_location = json['locations'].first
-
-        location = if json_location
-                     Epuber::Location.new(
-                       path: json_location['path'],
-                       lineno: json_location['line'],
-                       column: json_location['column'],
-                     )
-                   end
-
-        new(
-          level: json['severity'].downcase.to_sym,
-          code: json['ID'],
-          message: json['message'],
-          location: location,
-        )
-      end
     end
 
     class << self
@@ -76,14 +57,41 @@ module Epuber
         report
       end
 
+      # Parse json from epubcheck
+      #
       # @param [String] string json string
       # @return [Report]
       #
       def _parse_json(string)
         json = JSON.parse(string)
         messages = json['messages']
+        problems = messages
+                   .map { |msg| _parse_locations(msg) }
+                   .flatten
+
+        Report.new(problems: problems)
+      end
 
-        Report.new(problems: messages.map { |msg| Problem.from_json(msg) })
+      # Parse all problems from single message
+      #
+      # @param [Hash] json
+      # @return [Array<Problem>]
+      #
+      def _parse_locations(json)
+        json['locations'].map do |json_location|
+          location = Epuber::Location.new(
+            path: json_location['path'],
+            lineno: json_location['line'],
+            column: json_location['column'],
+          )
+
+          Problem.new(
+            level: json['severity'].downcase.to_sym,
+            code: json['ID'],
+            message: json['message'],
+            location: location,
+          )
+        end
       end
     end
   end

data/lib/epuber/server.rb

@@ -135,7 +135,7 @@ module Epuber
       if verbose
         Thin::Logging.logger = @default_thin_logger
       else
-        Thin::Logging.logger = Logger.new(nil)
+        Thin::Logging.logger = ::Logger.new(nil)
         Thin::Logging.logger.level = :fatal
       end
 

data/lib/epuber/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Epuber
-  VERSION = '0.10.1'
+  VERSION = '0.10.3'
 
   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.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -597,7 +597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Epuber is simple tool to compile and pack source files into EPUB format.