epuber 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d17540fe810ca7f516d68b3ce1e2e7cc177751f5642280a62e849c06538b548
-  data.tar.gz: d95c25089769b8c400fbde4da71ff87af30ee5d9c4c24a95043dac44fc794763
+  metadata.gz: 7d80c921e39a42f4b28674f6dda66ef56bab9b312ab3fc75bb4dbf5edfbdbcaa
+  data.tar.gz: 9f795d610ad9bdd2da76622cc1f0092976d026535d4b024c4eb93e376e1f20fa
 SHA512:
-  metadata.gz: 1d29fc3294f95370590d6cc325cece7375418ca80da33c023492fcae9cb565bd09af520d6fc13b1050cb351e32aab7995549d0a84ef74947a775f8d496ddb97c
-  data.tar.gz: 17c3e0eb6de4ce7cc736a19cb752b368592738c40121e592fe6e25e3c2bfed230b7d8740758137cae244ccfa94e023cdd93cfae6f4b54c5451dc2327075c5b49
+  metadata.gz: cab13905cd84cdb40179854ff843517980443a1d0d160d9f4bdb122d7fc7f7216db7c13d1f79fcaf51103d9c8e633417d50566ad524b0e502ea4cc6915687755
+  data.tar.gz: 5a13612e2a5e96e5ce38c5f4cbace79fa7cd052525a162650edde1400fe6bff3cdf8772ee916b36f8545f59b434b8ebc30e424deea78b0632b61f881099e1dcc

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/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.2'
 
   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.2
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport