Support Sinatra v4

epuber.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'os', '~> 1.0'
   spec.add_dependency 'uuidtools', '~> 2.1'
 
-  spec.add_dependency 'sinatra', '>= 2.0', '< 4.0'
-  spec.add_dependency 'sinatra-contrib', '>= 2.0', '< 4.0'
+  spec.add_dependency 'sinatra', '>= 2.0', '< 5.0'
+  spec.add_dependency 'sinatra-contrib', '>= 2.0', '< 5.0'
   spec.add_dependency 'sinatra-websocket', '~> 0.3'
-  spec.add_dependency 'thin', '~> 1.6'
+  spec.add_dependency 'thin', '>= 1.6', '< 3.0'
 
   spec.add_dependency 'rmagick', '>= 4.2', '< 7.0'
   spec.add_dependency 'rubyzip', '~> 2.3'

lib/epuber/book/toc_item.rb

@@ -44,11 +44,7 @@ def linear?
           item.is_a?(Hash) && (item.include?(:linear) || item.include?('linear'))
         end.first
 
-        if first.nil?
-          true
-        else
-          first.values.first
-        end
+        first.nil? || first.values.first
       end
 
       # @return [String]

lib/epuber/compiler/problem.rb

@@ -66,10 +66,10 @@ def self.text_at(text, location)
         lines = text.split("\n")
 
         line = lines[line_index] || ''
-        matched_text = line[column_index...column_index + location.length] || ''
+        matched_text = line[column_index...(column_index + location.length)] || ''
 
         pre = (lines[0...line_index] + [line[0...column_index]]).join("\n")
-        post = ([line[column_index + location.length..line.length]] + (lines[location.line..lines.count] || []))
+        post = ([line[(column_index + location.length)..line.length]] + (lines[location.line..lines.count] || []))
                .join("\n")
 
         [pre, matched_text, post]

lib/epuber/from_file/opf_file.rb

@@ -132,7 +132,7 @@ def initialize(xml)
       @spine = @document.at_css('package spine')
 
       @manifest_items = @document.css('package manifest item')
-                                 .map { |node| ManifestItem.from_node(node) } # rubocop:disable Style/MapToHash
+                                 .map { |node| ManifestItem.from_node(node) }
                                  .to_h { |item| [item.id, item] }
       @spine_items = @document.css('package spine itemref')
                               .map { |node| SpineItem.from_node(node) }

lib/epuber/utils/logger/console_logger.rb

@@ -69,7 +69,7 @@ def _format_message(level, message, location: nil, backtrace: nil)
           path = location.path
 
           # calculate relative path when path is absolute and in project
-          path = path[Config.instance.project_path.size + 1..] if path.start_with?(Config.instance.project_path)
+          path = path[(Config.instance.project_path.size + 1)..] if path.start_with?(Config.instance.project_path)
 
           line_parts = [
             "  (in file #{path}",

spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'pp' # rubocop:disable Lint/RedundantRequireStatement
+require 'pp'
 require 'rspec'
 require 'claide'
 require 'fakefs/spec_helpers'