discid 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae925c303f14de241eebff682190b227727b346b7dc76097e3dc20bcdbe5f39
-  data.tar.gz: b84d1b0fa5e8d969733f10355de43566860159c865804b5d600e251d35bb4eb5
+  metadata.gz: '09ccbdacc1ec0d20245f42d21311e6b7bd75ce43ccd2fcdc7b6b3463284f0530'
+  data.tar.gz: f7b0d5305393de17cc753962b9978cb90bb0f5a2d2261b3eee39cc1dd87f7df0
 SHA512:
-  metadata.gz: db68c94984e8a1cbfcf5f1d2ef94b551bf32872135ea1eaab6a0926c6ad60826decaf755656448d416e8430a1c84b64211ea0c22633092c3852641dd7fe66245
-  data.tar.gz: e3bd9acd6790228bb2c3b30911cc4f6a750c655ab4f44ac905694ec4845c8f03433a6aae9010e6c6599481f80d4f29aa7e3148ae69527e5ca2997477d4c78181
+  metadata.gz: 681a9f92ac740b9c759bf33311446fbb4ccdc02273c820597853719454ffcafc8e29e0d881e633cc67387ed3bf513b4a001e61664837444c135fd2be48fcb254
+  data.tar.gz: 7ba59ea8196c6429604d591e621f3dc82f937bc7a3a8162d9c6282dedf680329b2a6f0d6e9023ca7d75c746423206b178d575bd62ee88f59191700686f21958b

data/CHANGES.md

@@ -1,4 +1,11 @@
 # Changelog
+## 1.7.0 (2026-08-13)
+* Rename {DiscId.has_feature?} to {DiscId.feature?} ({DiscId.has_feature?} is still
+  provided as an alias, but deprecated)
+* Fix fallback implementation of {DiscId::Disc#toc_string} for libdiscid < 0.6
+* Clarify license in gemspec to be LGPL-3.0-or-later
+* Code style cleanup for examples
+
 ## 1.6.0 (2025-05-09)
 * Drop support for Ruby < 2.1
 * Fixed license name in gemspec
@@ -10,7 +17,7 @@
 * Removed support for Ruby 1.9
 
 ## 1.4.1 (2021-09-23)
-* Fix Ruby 3 compatibility if {DiscId.tracks} gets called with a block
+* Fix Ruby 3 compatibility if {DiscId::Disc#tracks} gets called with a block
 
 ## 1.4.0 (2019-05-06)
 * Fixed {DiscId.put} handling of first_track being > 1

data/README.md

@@ -4,7 +4,7 @@
 [![Test Coverage](https://phw.srht.site/ruby-discid/coverage/coverage_badge_total.svg)](https://phw.srht.site/ruby-discid/coverage/)
 
 ## About
-ruby-discid provides Ruby bindings for the MusicBrainz DiscID library [libdiscid](http://musicbrainz.org/doc/libdiscid).
+ruby-discid provides Ruby bindings for the MusicBrainz DiscID library [libdiscid](https://musicbrainz.org/doc/libdiscid).
 It allows calculating DiscIDs (MusicBrainz and freedb) for Audio CDs. Additionally
 the library can extract the MCN/UPC/EAN and the ISRCs from disc.
 
@@ -21,7 +21,7 @@ is documented in the [API documentation](https://www.rubydoc.info/gems/discid/).
 
 ## Installation
 Before installing ruby-discid make sure you have libdiscid installed. See
-http://musicbrainz.org/doc/libdiscid for more information on how to do this.
+https://musicbrainz.org/doc/libdiscid for more information on how to do this.
 For Windows see also the notes below.
 
 ### Installing with RubyGems
@@ -29,12 +29,6 @@ Installing ruby-discid is best done using RubyGems:
 
     gem install discid
 
-### Installing from package repository
-For some Linux distributions packages are available:
-
-* [Arch Linux AUR package](https://aur.archlinux.org/packages/ruby-discid/)
-* [Ubuntu PPA](https://launchpad.net/~musicbrainz-developers/+archive/ubuntu/stable)
-
 ### Install from source
 You can also install from source. This requires RubyGems and Bundler installed.
 First make sure you have installed bundler:
@@ -72,7 +66,7 @@ require 'discid'
 
 # Specifying the device is optional. If omitted a platform
 # specific default will be used.
-device = "/dev/cdrom"
+device = '/dev/cdrom'
 disc = DiscId.read(device)
 puts disc.id
 ```
@@ -82,7 +76,7 @@ puts disc.id
 ```ruby
 require 'discid'
 
-device = "/dev/cdrom"
+device = '/dev/cdrom'
 disc = DiscId.read(device, :mcn, :isrc)
 
 # Print information about the disc:
@@ -94,9 +88,11 @@ puts "MCN         : #{disc.mcn}"
 # Print information about individual tracks:
 disc.tracks do |track|
   puts "Track ##{track.number}"
-  puts "  Length: %02d:%02d (%i sectors)" %
-      [track.seconds / 60, track.seconds % 60, track.sectors]
-  puts "  ISRC  : %s" % track.isrc
+  puts format('  Length: %<minutes>02d:%<seconds>02d (%<sectors>i sectors)',
+              minutes: track.seconds / 60,
+              seconds: track.seconds % 60,
+              sectors: track.sectors)
+  puts "  ISRC  : #{track.isrc}"
 end
 ```
 
@@ -111,7 +107,7 @@ Please report any issues on the
 [issue tracker](https://todo.sr.ht/~phw/discid-bindings).
 
 ## License
-ruby-discid Copyright (c) 2007-2025 by Philipp Wolfer <ph.wolfer@gmail.com>
+ruby-discid Copyright (c) 2007-2026 by Philipp Wolfer <ph.wolfer@gmail.com>
 
 ruby-discid is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

data/examples/discfromtoc.rb

@@ -9,16 +9,17 @@
 
 # Just make sure we can run this example from the command
 # line even if DiscId is not yet installed properly.
-$: << 'lib/' << 'ext/' << '../ext/' << '../lib/'
+$LOAD_PATH << 'lib/' << 'ext/' << '../ext/' << '../lib/'
 
 require 'discid'
 
-offsets = [150, 44942, 61305, 72755, 96360, 130485, 147315, 164275, 190702, 205412, 220437]
+offsets = [150, 44_942, 61_305, 72_755, 96_360, 130_485, 147_315, 164_275,
+           190_702, 205_412, 220_437]
 
-disc = DiscId.put(1, 242457, offsets)
+disc = DiscId.put(1, 242_457, offsets)
 
 
-print <<EOF
+print <<OUT
 
 Device      : #{disc.device}
 DiscID      : #{disc.id}
@@ -30,4 +31,4 @@ Total length: #{disc.seconds} seconds
 Sectors     : #{disc.sectors}
 
 Submit via #{disc.submission_url}
-EOF
+OUT

data/examples/discidinfo.rb

@@ -11,13 +11,13 @@
 
 # Just make sure we can run this example from the command
 # line even if DiscId is not yet installed properly.
-$: << 'lib/' << 'ext/' << '../ext/' << '../lib/'
+$LOAD_PATH << 'lib/' << 'ext/' << '../ext/' << '../lib/'
 
 require 'discid'
 
 # Print information about libdiscid
-print <<EOF
+print <<OUT
 Version           : #{DiscId::LIBDISCID_VERSION}
 Default device    : #{DiscId.default_device}
 Supported features: #{DiscId.feature_list.join(', ')}
-EOF
+OUT

data/examples/parsetoc.rb

@@ -9,7 +9,7 @@
 
 # Just make sure we can run this example from the command
 # line even if DiscId is not yet installed properly.
-$: << 'lib/' << 'ext/' << '../ext/' << '../lib/'
+$LOAD_PATH << 'lib/' << 'ext/' << '../ext/' << '../lib/'
 
 require 'discid'
 
@@ -17,7 +17,7 @@ toc = '1 11 242457 150 44942 61305 72755 96360 130485 147315 164275 190702 20541
 
 disc = DiscId.parse(toc)
 
-print <<EOF
+print <<OUT
 
 Device      : #{disc.device}
 DiscID      : #{disc.id}
@@ -29,4 +29,4 @@ Total length: #{disc.seconds} seconds
 Sectors     : #{disc.sectors}
 
 Submit via #{disc.submission_url}
-EOF
+OUT

data/examples/readdiscid.rb

@@ -11,12 +11,12 @@
 
 # Just make sure we can run this example from the command
 # line even if DiscId is not yet installed properly.
-$: << 'lib/' << 'ext/' << '../ext/' << '../lib/'
+$LOAD_PATH << 'lib/' << 'ext/' << '../ext/' << '../lib/'
 
 require 'discid'
 
 # Read the device name from the command line or use the default.
-device = $*[0] ? $*[0] : DiscId.default_device
+device = ARGV[0] || DiscId.default_device
 
 # Create a new DiscID object and read the disc information.
 # In case of errors exit the application.
@@ -25,14 +25,14 @@ begin
   disc = DiscId.read(device, :isrc, :mcn)
 
   # Instead of reading from a device we could set the TOC directly:
-  #disc = DiscId.put(1, 82255, [150, 16157, 35932, 57527])
+  # disc = DiscId.put(1, 82255, [150, 16157, 35932, 57527])
 rescue DiscId::DiscError => e
   puts e
   exit(1)
 end
 
 # Print information about the disc:
-print <<EOF
+print <<OUT
 
 Device      : #{disc.device}
 DiscID      : #{disc.id}
@@ -42,21 +42,27 @@ First track : #{disc.first_track_number}
 Last track  : #{disc.last_track_number}
 Total length: #{disc.seconds} seconds
 Sectors     : #{disc.sectors}
-EOF
+OUT
 
-puts "MCN         : #{disc.mcn}" if DiscId.has_feature?(:mcn)
+puts "MCN         : #{disc.mcn}" if DiscId.feature?(:mcn)
 puts
 
 # Print information about individual tracks:
 disc.tracks do |track|
   puts "Track ##{track.number}"
-  puts "  Length: %02d:%02d (%i sectors)" %
-      [track.seconds / 60, track.seconds % 60, track.sectors]
-  puts "  Start : %02d:%02d (sector %i)" %
-      [track.start_time / 60, track.start_time % 60, track.offset]
-  puts "  End   : %02d:%02d (sector %i)" %
-      [track.end_time / 60, track.end_time % 60, track.end_sector]
-  puts "  ISRC  : %s" % track.isrc if DiscId.has_feature?(:isrc)
+  puts format('  Length: %<minutes>02d:%<seconds>02d (%<sectors>i sectors)',
+              minutes: track.seconds / 60,
+              seconds: track.seconds % 60,
+              sectors: track.sectors)
+  puts format('  Start : %<minutes>02d:%<seconds>02d (sector %<sector>i)',
+              minutes: track.start_time / 60,
+              seconds: track.start_time % 60,
+              sector: track.offset)
+  puts format('  End   : %<minutes>02d:%<seconds>02d (sector %<sector>i)',
+              minutes: track.end_time / 60,
+              seconds: track.end_time % 60,
+              sector: track.end_sector)
+  puts "  ISRC  : #{track.isrc}" if DiscId.feature?(:isrc)
 end
 
 # Print a submission URL that can be used to submit

data/lib/discid/disc.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, 2021 Philipp Wolfer
+# Copyright (C) 2013-2014, 2021, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -18,7 +18,6 @@ require 'discid/disc_error'
 require 'discid/lib'
 require 'discid/track'
 
-#
 module DiscId
   # This class holds information about a disc (TOC, MCN, ISRCs).
   #
@@ -41,7 +40,7 @@ module DiscId
       @read = false
       device = DiscId.default_device if device.nil?
 
-      if not device.respond_to? :to_s
+      unless device.respond_to? :to_s
         raise TypeError, 'wrong argument type (expected String)'
       end
 
@@ -49,11 +48,9 @@ module DiscId
       flags = Lib.features_to_int features
       result = Lib.read @handle, @device, flags
 
-      if result == 0
-        raise DiscError, Lib.get_error_msg(@handle)
-      else
-        @read = true
-      end
+      raise DiscError, Lib.get_error_msg(@handle) if result == 0
+
+      @read = true
     end
 
     # @private
@@ -70,11 +67,9 @@ module DiscId
         p.write_array_of_int(([sectors] + offsets)[0, 100])
         result = Lib.put @handle, first_track, last_track, p
 
-        if result == 0
-          raise DiscError, Lib.get_error_msg(@handle)
-        else
-          @read = true
-        end
+        raise DiscError, Lib.get_error_msg(@handle) if result == 0
+
+        @read = true
       end
     end
 
@@ -82,35 +77,35 @@ module DiscId
     #
     # @return [String] The DiscID or `nil` if no ID was yet read.
     def id
-      return Lib.get_id @handle if @read
+      Lib.get_id @handle if @read
     end
 
     # The FreeDB DiscID.
     #
     # @return [String] The DiscID or  `nil` if no ID was yet read.
     def freedb_id
-      return Lib.get_freedb_id @handle if @read
+      Lib.get_freedb_id @handle if @read
     end
 
     # The number of the first track on this disc.
     #
     # @return [Integer] The number of the first track or `nil` if no ID was yet read.
     def first_track_number
-      return Lib.get_first_track_num @handle if @read
+      Lib.get_first_track_num @handle if @read
     end
 
     # The number of the last track on this disc.
     #
     # @return [Integer] The number of the last track or `nil` if no ID was yet read.
     def last_track_number
-      return Lib.get_last_track_num @handle if @read
+      Lib.get_last_track_num @handle if @read
     end
 
     # The length of the disc in sectors.
     #
     # @return [Integer] Sectors or `nil` if no ID was yet read.
     def sectors
-      return Lib.get_sectors @handle if @read
+      Lib.get_sectors @handle if @read
     end
 
     # The length of the disc in seconds.
@@ -127,11 +122,11 @@ module DiscId
     #
     # @note libdiscid >= 0.3.0 required. Older versions will always return nil.
     #     Not available on all platforms, see
-    #     {http://musicbrainz.org/doc/libdiscid#Feature_Matrix}.
+    #     {https://musicbrainz.org/doc/libdiscid#Feature_Matrix}.
     #
     # @return [String] MCN or `nil` if no ID was yet read.
     def mcn
-      return Lib.get_mcn @handle if @read
+      Lib.get_mcn @handle if @read
     end
 
     # Return a string representing CD Table Of Contents (TOC).
@@ -151,20 +146,20 @@ module DiscId
     #                       could not get extracted from {Disc#submission_url}
     # @return [String] The TOC string or `nil` if no ID was yet read.
     def toc_string
-      return nil if not @read
+      return nil unless @read
+
       result = Lib.get_toc_string @handle
-      if not result
+      unless result
         # probably an old version of libdiscid (< 0.6.0)
         # gather toc string from submission_url
-        match = /toc=([0-9+]+)/.match self.submission_url
-        if match
-          result = match[1].tr("+", " ")
-        else
-          raise "can't get toc string from submission url"
-        end
+        match = /toc=([0-9+]+)/.match submission_url
+
+        raise "can't get toc string from submission url" unless match
+
+        result = match[1].tr('+', ' ')
       end
 
-      return result
+      result
     end
 
     # An URL for submitting the DiscID to MusicBrainz.
@@ -175,7 +170,7 @@ module DiscId
     #
     # @return [String] Submission URL
     def submission_url
-      return Lib.get_submission_url @handle if @read
+      Lib.get_submission_url @handle if @read
     end
 
     # DiscID to String conversion. Same as calling the method {#id} but guaranteed
@@ -198,25 +193,23 @@ module DiscId
     # @yieldreturn [nil]
     # @return [Array<Track>] Array of {Track} objects.
     def tracks(&block)
-      if @read
-        read_tracks if @tracks.nil?
-
-        if block
-          @tracks.each(&block)
-          return nil
-        else
-          return @tracks
-        end
-      end
+      return unless @read
+
+      read_tracks if @tracks.nil?
+
+      return @tracks unless block
+
+      @tracks.each(&block)
+      nil
     end
 
     private
 
     def read_tracks
-      track_number = self.first_track_number - 1
+      track_number = first_track_number - 1
       @tracks = []
 
-      while track_number < self.last_track_number do
+      while track_number < last_track_number
         track_number += 1
         isrc = Lib.get_track_isrc(@handle, track_number)
         offset = Lib.get_track_offset(@handle, track_number)

data/lib/discid/lib.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Philipp Wolfer
+# Copyright (C) 2013, 2025-2026 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -13,9 +13,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "ffi"
+require 'ffi'
 
-#
 module DiscId
 
   # This module encapsulates the C interface for libdiscid using FFI.
@@ -32,16 +31,16 @@ module DiscId
     attach_function :free, :discid_free, [:pointer], :void
 
     begin
-      attach_function :read, :discid_read_sparse, [:pointer, :string, :uint], :int
+      attach_function :read, :discid_read_sparse, %i[pointer string uint], :int
     rescue FFI::NotFoundError
-      attach_function :legacy_read, :discid_read, [:pointer, :string], :int
+      attach_function :legacy_read, :discid_read, %i[pointer string], :int
 
       def self.read(handle, device, _features)
         legacy_read(handle, device)
       end
     end
 
-    attach_function :put, :discid_put, [:pointer, :int, :int, :pointer], :int
+    attach_function :put, :discid_put, %i[pointer int int pointer], :int
 
     attach_function :get_error_msg, :discid_get_error_msg, [:pointer], :string
 
@@ -59,15 +58,15 @@ module DiscId
 
     attach_function :get_sectors, :discid_get_sectors, [:pointer], :int
 
-    attach_function :get_track_offset, :discid_get_track_offset, [:pointer, :int], :int
+    attach_function :get_track_offset, :discid_get_track_offset, %i[pointer int], :int
 
-    attach_function :get_track_length, :discid_get_track_length, [:pointer, :int], :int
+    attach_function :get_track_length, :discid_get_track_length, %i[pointer int], :int
 
     begin
       attach_function :get_toc_string, :discid_get_toc_string, [:pointer], :string
     rescue FFI::NotFoundError
-      def self.get_toc_string
-        return nil
+      def self.get_toc_string(_handle)
+        nil
       end
     end
 
@@ -75,15 +74,15 @@ module DiscId
       attach_function :get_mcn, :discid_get_mcn, [:pointer], :string
     rescue FFI::NotFoundError
       def self.get_mcn(_handle)
-        return nil
+        nil
       end
     end
 
     begin
-      attach_function :get_track_isrc, :discid_get_track_isrc, [:pointer, :int], :string
+      attach_function :get_track_isrc, :discid_get_track_isrc, %i[pointer int], :string
     rescue FFI::NotFoundError
       def self.get_track_isrc(_handle, _track)
-        return nil
+        nil
       end
     end
 
@@ -94,19 +93,23 @@ module DiscId
     begin
       attach_function :has_feature, :discid_has_feature, [:feature], :int
     rescue FFI::NotFoundError
+      # rubocop:disable Naming/PredicatePrefix
       def self.has_feature(feature)
-        return feature.to_sym == :read ? 1 : 0
+        feature.to_sym == :read ? 1 : 0
       end
+      # rubocop:enable Naming/PredicatePrefix
     end
 
-    #attach_function :get_feature_list, :discid_get_feature_list, [:pointer], :void
+    # attach_function :get_feature_list, :discid_get_feature_list, [:pointer], :void
 
     begin
       attach_function :get_version_string, :discid_get_version_string, [], :string
     rescue FFI::NotFoundError
+      # rubocop:disable Naming/AccessorMethodName
       def self.get_version_string
-        return "libdiscid < 0.4.0"
+        'libdiscid < 0.4.0'
       end
+      # rubocop:enable Naming/AccessorMethodName
     end
 
     def self.features_to_int(features)
@@ -114,20 +117,19 @@ module DiscId
       features.each do |feature|
         if feature.respond_to? :to_sym
           feature = feature.to_sym
-          feature_flags = self.add_feature_to_flags(feature_flags, feature)
+          feature_flags = add_feature_to_flags(feature_flags, feature)
         end
       end
 
-      return feature_flags
+      feature_flags
     end
 
-    private
-
     def self.add_feature_to_flags(flags, feature)
       flags |= self::Features[feature] if
-        self::Features.symbols.include?(feature) and
-        self.has_feature(feature)
-      return flags
+        self::Features.symbols.include?(feature) && has_feature(feature)
+      flags
     end
+
+    private_class_method :add_feature_to_flags
   end
 end

data/lib/discid/track.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2023 Philipp Wolfer
+# Copyright (C) 2008-2023, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -59,7 +59,7 @@ module DiscId
     #
     # @note libdiscid >= 0.3.0 required. Older versions will always return nil.
     #     Not available on all platforms, see
-    #     {http://musicbrainz.org/doc/libdiscid#Feature_Matrix}.
+    #     {https://musicbrainz.org/doc/libdiscid#Feature_Matrix}.
     #
     # @return [String]
     attr_reader :isrc
@@ -108,8 +108,8 @@ module DiscId
     #     puts track.sectors   # 16007
     #     puts track[:sectors] # 16007
     def [](key)
-      if [:number, :sectors, :offset, :end_sector,
-          :seconds, :start_time, :end_time, :isrc].include?(key.to_sym)
+      if %i[number sectors offset end_sector
+            seconds start_time end_time isrc].include?(key.to_sym)
         method(key).call
       end
     end
@@ -119,17 +119,17 @@ module DiscId
     # @return [Hash]
     def to_h
       {
-        :number       => number,
-        :sectors      => sectors,
-        :offset       => offset,
-        :end_sector   => end_sector,
-        :seconds      => seconds,
-        :start_time   => start_time,
-        :end_time     => end_time,
-        :isrc         => isrc,
+        number: number,
+        sectors: sectors,
+        offset: offset,
+        end_sector: end_sector,
+        seconds: seconds,
+        start_time: start_time,
+        end_time: end_time,
+        isrc: isrc
       }
     end
 
-    alias_method :to_hash, :to_h
+    alias to_hash to_h
   end
 end

data/lib/discid/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2023 Philipp Wolfer
+# Copyright (C) 2013-2023, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -16,5 +16,5 @@
 #
 module DiscId
   # The version of ruby-discid.
-  VERSION = "1.6.0"
+  VERSION = '1.7.0'.freeze
 end

data/lib/discid.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017, 2019 Philipp Wolfer
+# Copyright (C) 2013-2017, 2019, 2025-2026 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -28,9 +28,9 @@ require 'discid/version'
 #
 # Depending on the version of libdiscid and the operating system used
 # additional features like reading the MCN or ISRCs from the disc
-# might be available. You can check for supported features with {has_feature?}.
+# might be available. You can check for supported features with {feature?}.
 #
-# @see http://musicbrainz.org/doc/libdiscid#Feature_Matrix
+# @see https://musicbrainz.org/doc/libdiscid#Feature_Matrix
 #
 # @example Read the TOC, MCN and ISRCs
 #     require 'discid'
@@ -63,7 +63,7 @@ require 'discid/version'
 #
 # @example Check for supported MCN feature
 #     disc = DiscId.read(nil, :mcn)
-#     puts "MCN: #{disc.mcn}" if DiscId.has_feature?(:mcn)
+#     puts "MCN: #{disc.mcn}" if DiscId.feature?(:mcn)
 module DiscId
 
   # Read the disc in the given CD-ROM/DVD-ROM drive extracting only the
@@ -85,7 +85,7 @@ module DiscId
   #
   # @note libdiscid >= 0.5.0 is required for the feature selection to work.
   #       Older versions will allways read MCN and ISRCs when supported. See
-  #       {http://musicbrainz.org/doc/libdiscid#Feature_Matrix} for a list of
+  #       {https://musicbrainz.org/doc/libdiscid#Feature_Matrix} for a list of
   #       supported features by version and platform.
   #
   # @raise [TypeError] `device` can not be converted to a String.
@@ -99,7 +99,7 @@ module DiscId
   def self.read(device = nil, *features)
     disc = Disc.new
     disc.read device, *features
-    return disc
+    disc
   end
 
   # Provides the TOC of a known CD.
@@ -117,21 +117,20 @@ module DiscId
   def self.put(first_track, sectors, offsets)
     disc = Disc.new
     disc.put first_track, sectors, offsets
-    return disc
+    disc
   end
 
   # Parses a TOC string and returns a [Disc] instance for it.
   #
   # This function can be used if you already have a TOC string like e.g.
-  # `1 11 242457 150 44942 61305 72755 96360 130485 147315 164275 190702 205412 220437`
+  # `1 4 78615 150 20971 36350 54056`.
   #
   # @raise [DiscError] The TOC string was invalid and could not be parsed.
-  # @param toc [String] A TOC string in the format `1 11 242457 150 44942 61305 72755 96360 130485 147315 164275 190702 205412 220437`.
+  # @param toc [String] A TOC string in the format `1 4 78615 150 20971 36350 54056`.
   # @return [Disc]
   def self.parse(toc)
-    if toc.nil? || toc.empty?
-      raise DiscError, "Invalid TOC #{toc.inspect}"
-    end
+    raise DiscError, "Invalid TOC #{toc.inspect}" if toc.nil? || toc.empty?
+
     begin
       parts = toc.split(' ')
       first_track = Integer(parts[0])
@@ -140,7 +139,7 @@ module DiscId
     rescue ArgumentError, TypeError => e
       raise DiscError, e
     end
-    return self.put(first_track, sectors, offsets)
+    put(first_track, sectors, offsets)
   end
 
   # Return the name of the default disc drive for this operating system.
@@ -157,13 +156,24 @@ module DiscId
   # @note libdiscid >= 0.5.0 required. Older versions will return `true`
   #     for `:read` and `false` for anything else.
   #
+  # @note Before version 1.7 this method was called `has_feature?`, which is
+  #     deprecated but still available as an alias.
+  #
+  # @since 1.7
+  #
   # @param feature [:read, :mcn, :isrc]
   # @return [Boolean] True if the feature is implemented and false if not.
-  def self.has_feature?(feature)
+  def self.feature?(feature)
     feature = feature.to_sym if feature.respond_to? :to_sym
-    return self.feature_list.include? feature
+    feature_list.include? feature
   end
 
+  # Provide has_feature? for backward compatibility
+  #
+  # @deprecated Use {#feature?} instead.
+  # @!scope module
+  singleton_class.alias_method :has_feature?, :feature?
+
   # A list of features supported by the current platform.
   #
   # Currently the following features are available:
@@ -176,7 +186,7 @@ module DiscId
   #
   # @return [Array<Symbol>]
   def self.feature_list
-    return Lib::Features.symbols.select {|f| Lib.has_feature(f) == 1}
+    Lib::Features.symbols.select { |f| Lib.has_feature(f) == 1 }
   end
 
   # Converts sectors to seconds.
@@ -187,7 +197,7 @@ module DiscId
   # @param sectors [Integer] Number of sectors
   # @return [Integer] The seconds
   def self.sectors_to_seconds(sectors)
-    return (sectors.to_f / 75).truncate
+    (sectors.to_f / 75).truncate
   end
 
   # The libdiscid version.

data/test/helper.rb

@@ -17,12 +17,14 @@ begin
   require 'simplecov'
   require 'simplecov_small_badge'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCovSmallBadge::Formatter
-  ])
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+    [
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCovSmallBadge::Formatter
+    ]
+  )
   SimpleCov.start do
-    add_filter "/test/"
+    add_filter '/test/'
   end
 rescue LoadError
   puts 'WARNING: simplecov not available, no code coverage reported.'

data/test/test_disc.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Philipp Wolfer
+# Copyright (C) 2013-2014, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -24,15 +24,12 @@ class TestDisc < Test::Unit::TestCase
     @fiction_disc_id     = 'Wn8eRBtfLDfM0qjYPdxrz.Zjs_U-'
     @fiction_first_track = 1
     @fiction_last_track  = 10
-    @fiction_sectors     = 206535
+    @fiction_sectors     = 206_535
     @fiction_seconds     = 2753
-    @fiction_offsets     = [150, 18901, 39738, 59557, 79152, 100126,
-                            124833, 147278, 166336, 182560]
-    @fiction_lengths     = [18751, 20837, 19819, 19595, 20974,
-                            24707, 22445, 19058, 16224, 23975]
-  end
-
-  def teardown
+    @fiction_offsets     = [150, 18_901, 39_738, 59_557, 79_152, 100_126,
+                            124_833, 147_278, 166_336, 182_560]
+    @fiction_lengths     = [18_751, 20_837, 19_819, 19_595, 20_974,
+                            24_707, 22_445, 19_058, 16_224, 23_975]
   end
 
   def test_empty_disc
@@ -54,7 +51,7 @@ class TestDisc < Test::Unit::TestCase
   # Test calculation of the disc id if the TOC information
   # gets set by the put method.
   # All attributes should be nil after a failure, even if there was a
-  # successfull put before.
+  # successful put before.
   def test_put
     disc = DiscId::Disc.new
 
@@ -70,7 +67,7 @@ class TestDisc < Test::Unit::TestCase
     assert_equal nil, disc.seconds
     assert_equal nil, disc.tracks
 
-    # Second successfull put
+    # Second successful put
     assert_nothing_raised do
       disc = DiscId.put(@fiction_first_track, @fiction_sectors,
                         @fiction_offsets)
@@ -81,8 +78,8 @@ class TestDisc < Test::Unit::TestCase
     assert_equal @fiction_last_track, disc.last_track_number
     assert_equal @fiction_sectors, disc.sectors
     assert_equal @fiction_seconds, disc.seconds
-    assert_equal @fiction_offsets, disc.tracks.map{|t| t.offset}
-    assert_equal @fiction_lengths, disc.tracks.map{|t| t.sectors}
+    assert_equal(@fiction_offsets, disc.tracks.map { |t| t.offset })
+    assert_equal(@fiction_lengths, disc.tracks.map { |t| t.sectors })
   end
 
   def test_toc_string

data/test/test_discid.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Philipp Wolfer
+# Copyright (C) 2013-2014, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -22,8 +22,7 @@ class NotAString
 
   private
 
-  def to_s
-  end
+  def to_s; end
 
 end
 
@@ -36,20 +35,17 @@ class TestDiscId < Test::Unit::TestCase
     @fiction_last_track  = 10
     @fiction_sectors     = 206535
     @fiction_seconds     = 2753
-    @fiction_offsets     = [150, 18901, 39738, 59557, 79152, 100126,
-                            124833, 147278, 166336, 182560]
-    @fiction_lengths     = [18751, 20837, 19819, 19595, 20974,
-                            24707, 22445, 19058, 16224, 23975]
-  end
-
-  def teardown
+    @fiction_offsets     = [150, 18_901, 39_738, 59_557, 79_152, 100_126,
+                            124_833, 147_278, 166_336, 182_560]
+    @fiction_lengths     = [18_751, 20_837, 19_819, 19_595, 20_974,
+                            24_707, 22_445, 19_058, 16_224, 23_975]
   end
 
   # Test reading the disc id from a device.
   # We would need some kind of small test data to do this.
-  #def test_read
-  #  assert false, "Not implemented yet"
-  #end
+  # def test_read
+  #   assert false, "Not implemented yet"
+  # end
 
   # Test how read reacts on different arguments.
   # Those reads should all fail, but they must never cause a segmentation fault.
@@ -61,9 +57,9 @@ class TestDiscId < Test::Unit::TestCase
 
   def test_put_first_track_not_one
     disc = DiscId.put(3, @fiction_sectors,
-                      [150, 18901, 39738, 59557, 79152, 100126,
-                       124833, 147278, 166336, 182560])
-    assert_equal "ByBKvJM1hBL7XtvsPyYtIjlX0Bw-", disc.id
+                      [150, 18_901, 39_738, 59_557, 79_152, 100_126,
+                       124_833, 147_278, 166_336, 182_560])
+    assert_equal 'ByBKvJM1hBL7XtvsPyYtIjlX0Bw-', disc.id
     assert_equal 3, disc.first_track_number
     assert_equal 12, disc.last_track_number
     assert_equal 10, disc.tracks.size
@@ -71,7 +67,7 @@ class TestDiscId < Test::Unit::TestCase
 
   def test_put_invalid_track_count
     assert_raise(DiscId::DiscError) do
-      DiscId.put(1, @fiction_sectors, Array.new(101) {|i| i + 150 })
+      DiscId.put(1, @fiction_sectors, Array.new(101) { |i| i + 150 })
     end
   end
 
@@ -91,7 +87,7 @@ class TestDiscId < Test::Unit::TestCase
 
       assert_equal @fiction_offsets[number], track.offset
       assert_equal @fiction_lengths[number], track.sectors
-      assert_equal @fiction_offsets[number]+ @fiction_lengths[number],
+      assert_equal @fiction_offsets[number] + @fiction_lengths[number],
                    track.end_sector
 
       assert_equal(DiscId.sectors_to_seconds(@fiction_offsets[number]),
@@ -99,8 +95,8 @@ class TestDiscId < Test::Unit::TestCase
       assert_equal(DiscId.sectors_to_seconds(@fiction_lengths[number]),
                    track.seconds)
       assert_equal(DiscId.sectors_to_seconds(
-                   @fiction_offsets[number]+ @fiction_lengths[number]),
-                   track.end_time)
+                     @fiction_offsets[number] + @fiction_lengths[number]
+                   ), track.end_time)
 
       number += 1
     end
@@ -147,17 +143,17 @@ class TestDiscId < Test::Unit::TestCase
   end
 
   def test_parse_invalid_empty
-    assert_raise(DiscId::DiscError) { DiscId.parse("") }
+    assert_raise(DiscId::DiscError) { DiscId.parse('') }
     assert_raise(DiscId::DiscError) { DiscId.parse(nil) }
   end
 
   def test_parse_invalid_nan
-    assert_raise(DiscId::DiscError) { DiscId.parse("1 2 242457 150 a") }
+    assert_raise(DiscId::DiscError) { DiscId.parse('1 2 242457 150 a') }
   end
 
   def test_parse_invalid_not_enough_elements
-    assert_raise(DiscId::DiscError) { DiscId.parse("1 2 242457") }
-    assert_raise(DiscId::DiscError) { DiscId.parse("1 242457") }
+    assert_raise(DiscId::DiscError) { DiscId.parse('1 2 242457') }
+    assert_raise(DiscId::DiscError) { DiscId.parse('1 242457') }
   end
 
   # Test the conversion from sectors to seconds
@@ -166,35 +162,37 @@ class TestDiscId < Test::Unit::TestCase
     assert_equal @fiction_seconds,
                  DiscId.sectors_to_seconds(@fiction_sectors)
     assert_equal 1, DiscId.sectors_to_seconds(75)
-    assert_equal 1, DiscId.sectors_to_seconds(75+74)
-    assert_equal 2, DiscId.sectors_to_seconds(75+75)
+    assert_equal 1, DiscId.sectors_to_seconds(75 + 74)
+    assert_equal 2, DiscId.sectors_to_seconds(75 + 75)
   end
 
   def test_has_feature
-    assert(DiscId.has_feature?(:read),
-           "Feature :read should be supported")
-    assert(DiscId.has_feature?("read"),
-           "Feature 'read' should be supported")
-    assert(!DiscId.has_feature?(:notafeature),
-           "Feature :notafeature should not be supported")
-    assert(!DiscId.has_feature?("notafeature"),
-           "Feature 'notafeature' should not be supported")
+    %i[has_feature? feature?].each do |f|
+      assert(DiscId.send(f, :read),
+             'Feature :read should be supported')
+      assert(DiscId.send(f, 'read'),
+             "Feature 'read' should be supported")
+      assert(!DiscId.send(f, :notafeature),
+             'Feature :notafeature should not be supported')
+      assert(!DiscId.send(f, 'notafeature'),
+             "Feature 'notafeature' should not be supported")
+    end
   end
 
   def test_feature_list_must_contain_read
     assert(DiscId.feature_list.include?(:read),
-           "Feature :read should be supported")
+           'Feature :read should be supported')
   end
 
   def test_libdiscid_version_should_start_with_libdiscid
     version = DiscId::LIBDISCID_VERSION
-    assert version.kind_of?(String)
-    assert version.start_with?("libdiscid")
+    assert version.is_a?(String)
+    assert version.start_with?('libdiscid')
   end
 
   def test_default_device_is_a_string
     device = DiscId.default_device
-    assert device.kind_of?(String)
+    assert device.is_a?(String)
   end
 
 end

data/test/test_lib.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Philipp Wolfer
+# Copyright (C) 2013-2014, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -31,7 +31,7 @@ class TestTrack < Test::Unit::TestCase
   end
 
   def test_features_to_int_ignores_unknown
-    assert_equal 1, DiscId::Lib.features_to_int([:read, :fake])
+    assert_equal 1, DiscId::Lib.features_to_int(%i[read fake])
   end
 
   def test_has_feature

data/test/test_track.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Philipp Wolfer
+# Copyright (C) 2013-2014, 2025 Philipp Wolfer
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -23,8 +23,8 @@ class TestTrack < Test::Unit::TestCase
   def setup
     @number = 3
     @offset = 1035
-    @length = 23643
-    @isrc = "US4E40731510"
+    @length = 23_643
+    @isrc = 'US4E40731510'
   end
 
   def test_init_track_info
@@ -44,7 +44,7 @@ class TestTrack < Test::Unit::TestCase
   def test_to_hash
     track = DiscId::Track.new @number, @offset, @length, @isrc
 
-    for f in %i(to_h to_hash) do
+    %i[to_h to_hash].each do |f|
       hash = track.send(f)
 
       assert_equal track.number, hash[:number]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: discid
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Philipp Wolfer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,14 +29,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +50,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,76 +60,79 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: simplecov-small-badge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: ruby-discid provides Ruby bindings for the MusicBrainz DiscID library
   libdiscid. It allows calculating DiscIDs (MusicBrainz and freedb) for Audio CDs.
   Additionally the library can extract the MCN/UPC/EAN and the ISRCs from disc.
@@ -153,9 +164,9 @@ files:
 - test/test_track.rb
 homepage: https://git.sr.ht/~phw/ruby-discid
 licenses:
-- LGPL-3.0
+- LGPL-3.0-or-later
 metadata: {}
-post_install_message: Please make sure you have libdiscid (http://musicbrainz.org/doc/libdiscid)
+post_install_message: Please make sure you have libdiscid (https://musicbrainz.org/doc/libdiscid)
   installed.
 rdoc_options: []
 require_paths:
@@ -172,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements:
 - libdiscid >= 0.1.0
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby bindings for libdiscid
 test_files: