Add Ruby 3.2 to CI and update RuboCop

.github/workflows/rake.yml

@@ -10,11 +10,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby-version: ['2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -30,7 +31,7 @@ jobs:
         ruby-version: ['3.0']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

.rubocop.yml

@@ -1,110 +1,55 @@
+require:
+  - rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.2
+  NewCops: enable
 
-Layout/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
+Gemspec/DevelopmentDependencies:
+  Enabled: false
 
-Layout/EmptyLineBetweenDefs:
-  Enabled: true
+Layout/LineLength:
+  Max: 80
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeSemicolon:
-  Enabled: true
-
-
-Lint/DuplicateMethods:
-  Enabled: true
-
-Lint/UnusedMethodArgument:
-  Enabled: true
+Layout/ParameterAlignment:
+  EnforcedStyle: with_fixed_indentation
 
+Lint/MissingSuper:
+  Exclude:
+    - lib/timezone/lookup/test.rb 
 
 Metrics/AbcSize:
   Enabled: false
 
 Metrics/ClassLength:
   Enabled: false
 
-# Offense count: 13
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 80
-
 Metrics/MethodLength:
   Enabled: false
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
   Max: 8
 
-
-Performance/RedundantBlockCall:
-  Enabled: true
-
-
-Naming/MethodName:
-  Enabled: true
-
-Naming/BinaryOperatorParameterName:
-  Enabled: true
-
-
-Style/ClassVars:
-  Enabled: true
-
-Style/Documentation:
-  Enabled: true
-
-Style/DoubleNegation:
-  Enabled: true
-
-Style/EmptyLiteral:
-  Enabled: true
-
-Style/GuardClause:
-  Enabled: true
-
-Style/HashSyntax:
-  Enabled: true
-
 Style/NumericLiterals:
   MinDigits: 5
 
-Style/PreferredHashMethods:
-  Enabled: true
-
-Style/RedundantReturn:
-  Enabled: true
+Style/OpenStructUse:
+  Enabled: false
 
-Style/RedundantSelf:
-  Enabled: true
+Style/RedundantInitialize:
+  Exclude:
+    - test/http_test_client.rb
+    - test/timezone/test_lookup.rb 
 
 Style/SingleLineMethods:
   Enabled: false
 
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
 
-Style/StringLiterals:
-  Enabled: true
-
-Style/TrivialAccessors:
-  Enabled: true
-
-Style/UnneededPercentQ:
-  Enabled: true
-
 Style/DateTime:
   Enabled: false

Rakefile

@@ -19,7 +19,7 @@ task(:utc) { ENV['TZ'] = 'UTC' }
 task default: %i[utc test rubocop]
 
 task parse: :utc do
-  path = ENV['TZPATH'] || File.join(ENV['HOME'], 'Downloads', 'tz')
+  path = ENV['TZPATH'] || File.join(Dir.home, 'Downloads', 'tz')
 
   require 'timezone/parser'
 

lib/timezone.rb

@@ -39,14 +39,14 @@ def self.[](name)
   #
   # @raise [Timezone::Error::InvalidZone] if the timezone is not found
   #   and a default value and block have not been provided
-  def self.fetch(name, default = :__block, &block)
+  def self.fetch(name, default = :__block)
     return ::Timezone::Zone.new(name) if Loader.valid?(name)
 
     if block_given? && default != :__block
       warn('warning: block supersedes default value argument')
     end
 
-    return block.call(name) if block_given?
+    return yield(name) if block_given?
     return default unless default == :__block
 
     raise ::Timezone::Error::InvalidZone

lib/timezone/loader.rb

@@ -2,10 +2,10 @@
 
 require 'timezone/error'
 
-module Timezone # rubocop:disable Style/Documentation
+module Timezone
   # Responsible for loading and parsing timezone data from files.
   module Loader
-    ZONE_FILE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../data')
+    ZONE_FILE_PATH = File.expand_path("#{File.dirname(__FILE__)}/../../data")
     SOURCE_BIT = 0
 
     @rules = {} # cache of loaded rules

lib/timezone/lookup.rb

@@ -9,7 +9,7 @@ module Timezone
   # Configure timezone lookups.
   module Lookup
     class << self
-      MISSING_LOOKUP = 'No lookup configured'.freeze
+      MISSING_LOOKUP = 'No lookup configured'
       private_constant :MISSING_LOOKUP
 
       # Returns the lookup object
@@ -45,7 +45,7 @@ class OptionSetter
         test: ::Timezone::Lookup::Test
       }.freeze
 
-      INVALID_LOOKUP = 'Invalid lookup specified'.freeze
+      INVALID_LOOKUP = 'Invalid lookup specified'
 
       attr_reader :config
 

lib/timezone/lookup/geonames.rb

@@ -38,7 +38,7 @@ def lookup(lat, long)
 
         return unless data['status']
 
-        return if NO_TIMEZONE_INFORMATION == data['status']['value']
+        return if data['status']['value'] == NO_TIMEZONE_INFORMATION
 
         raise(Timezone::Error::GeoNames, data['status']['message'])
       rescue StandardError => e
@@ -55,6 +55,7 @@ def get_timezone_id(data)
         return unless data['gmtOffset'].is_a? Numeric
 
         return 'Etc/UTC' if data['gmtOffset'].zero?
+
         "Etc/GMT#{format('%+d', -data['gmtOffset'])}"
       end
 

lib/timezone/lookup/google.rb

@@ -14,7 +14,7 @@ module Lookup
     class Google < ::Timezone::Lookup::Basic
       # Indicates that no time zone data could be found for the specified
       # <lat, lng>. This can occur if the query is incomplete or ambiguous.
-      NO_TIMEZONE_INFORMATION = 'ZERO_RESULTS'.freeze
+      NO_TIMEZONE_INFORMATION = 'ZERO_RESULTS'
 
       def initialize(config)
         if config.api_key.nil?
@@ -35,6 +35,7 @@ def lookup(lat, long)
         end
 
         return unless response.code =~ /^2\d\d$/
+
         data = JSON.parse(response.body)
 
         return if data['status'] == NO_TIMEZONE_INFORMATION

lib/timezone/parser.rb

@@ -9,7 +9,7 @@ class Parser
     MIN_YEAR = -500
     MAX_YEAR = 2039
 
-    LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([\+\-]*\d+)/
+    LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([+-]*\d+)/.freeze
 
     # Bookkeeping files that we do not want to parse.
     IGNORE = ['leapseconds', 'posixrules', 'tzdata.zi'].freeze
@@ -25,6 +25,7 @@ def perform
         next if File.directory?(file)
         next if file.end_with?('.tab')
         next if IGNORE.include?(File.basename(file))
+
         parse(file)
       end
     end
@@ -52,7 +53,7 @@ def initialize(config, file)
             .reject { |line| line.start_with?('TZ=') }
             .first
 
-        _date, _time, raw_offset, @name = first.split(' ')
+        _date, _time, raw_offset, @name = first.split
         @offset = parse_offset(raw_offset)
       end
 
@@ -65,7 +66,7 @@ def to_s
       def parse_offset(offset)
         arity = offset.start_with?('-') ? -1 : 1
 
-        match = offset.match(/^[\-\+](\d{2})$/)
+        match = offset.match(/^[-+](\d{2})$/)
         arity * match[1].to_i * 60 * 60
       end
     end
@@ -76,11 +77,11 @@ def parse_offset(offset)
     class Line
       attr_accessor :source, :name, :dst, :offset
 
-      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'.freeze
+      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'
 
       def initialize(match)
-        self.source = Time.strptime(match[1] + 'C', SOURCE_FORMAT).to_i
-        self.name = match[2].split(' ').last
+        self.source = Time.strptime("#{match[1]}C", SOURCE_FORMAT).to_i
+        self.name = match[2].split.last
         self.dst = match[3].to_i
         self.offset = match[4].to_i
       end

lib/timezone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timezone
-  VERSION = '1.3.23'.freeze
+  VERSION = '1.3.23'
 end

lib/timezone/zone.rb

@@ -6,7 +6,6 @@
 
 require 'timezone/loader'
 require 'timezone/error'
-require 'timezone/loader'
 
 module Timezone
   # This object represents a real-world timezone. Each instance provides
@@ -187,7 +186,7 @@ def sanitize(time)
     #
     # Each rule has a SOURCE bit which is the number of seconds, since the
     # Epoch, up to which the rule is valid.
-    def match?(seconds, rule) #:nodoc:
+    def match?(seconds, rule) # :nodoc:
       seconds <= rule[SOURCE_BIT]
     end
 

test/test_timezone.rb

@@ -3,7 +3,7 @@
 require 'timezone'
 require 'minitest/autorun'
 
-class TestTimezone < ::Minitest::Test
+class TestTimezone < Minitest::Test
   parallelize_me!
 
   def test_names
@@ -20,7 +20,12 @@ def test_get
 
   def test_fetch
     assert Timezone.fetch('Australia/Sydney').valid?
+
+    # Explicitly testing block syntax, so disable Cop
+    # rubocop:disable Style/RedundantFetchBlock
     assert_equal 'foo', Timezone.fetch('foo/bar') { 'foo' }
+    # rubocop:enable Style/RedundantFetchBlock
+
     assert_raises Timezone::Error::InvalidZone do
       Timezone.fetch('foo/bar')
     end

test/timezone/lookup/test_basic.rb

@@ -4,7 +4,7 @@
 require 'minitest/autorun'
 require 'ostruct'
 
-class BasicLookupTest < ::Minitest::Test
+class BasicLookupTest < Minitest::Test
   parallelize_me!
 
   def config