discid 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e54ccf0358d9377e073c158bc10c972410446882
-  data.tar.gz: a29145b466deb26a8830d537cb5471a346fc51bd
+SHA256:
+  metadata.gz: 3b7eeb3a5b61f7c5a9068287a395c0b8f1981049ee7bc48c0de3eef2f35f36c5
+  data.tar.gz: a45eeb079ec088cbb3bc2fbd045a051e23cfcd4f25151c6349830373b928fc12
 SHA512:
-  metadata.gz: 0dfed6d0c5d3e631ee3333f02cb86e7b46239b9eb48a9211b5fc4b7952b0a27bac01f42eb548b973b8fef9c89295a3123343c4dba0479814ff1d6f1e566759f1
-  data.tar.gz: 0ca29384229a241332b53d19613583bc5c95bb80ae51a95154b8612d7e71ed72652a89f1bb701acf09d0c61c97c49e0ada88fd01cfbfdefd280855c2e79b31e1
+  metadata.gz: 6a12087cd902fcd32bb2ceb4846c305e4ae76187578bd0c47d88e73a7d037ecbb954dc046dcf690f4b0ba852998a1d21d3068208efb18f16e3ca1923f607bc47
+  data.tar.gz: d0c24a5f783f66cbcb886e158108d4c44c91f47ec0faab8e180f7d7f76531205564b6f5a680ebcca70a0cafd7f5861b87b93694f85ee65af6f6bf6d90985a599

data/CHANGES.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.5.0 (2023-12-27)
+* Added {DiscId::Track#to_h} for consistency with standard library. A backward
+  compatible alias {DiscId::Track#to_hash} is still available.
+* Removed support for Ruby 1.8
+
+## 1.4.1 (2021-09-23)
+* Fix Ruby 3 compatibility if {DiscId.tracks} gets called with a block
+
 ## 1.4.0 (2019-05-06)
 * Fixed {DiscId.put} handling of first_track being > 1
 * Added {DiscId.parse} to parse a TOC string

data/README.md

@@ -1,8 +1,7 @@
 # Ruby bindings for MusicBrainz libdiscid
-[![Build Status](https://travis-ci.org/phw/ruby-discid.svg?branch=master)](https://travis-ci.org/phw/ruby-discid)
-[![Code Climate](https://codeclimate.com/github/phw/ruby-discid.png)](https://codeclimate.com/github/phw/ruby-discid)
-[![Code Climate](https://codeclimate.com/github/phw/ruby-discid/coverage.png)](https://codeclimate.com/github/phw/ruby-discid)
 [![Gem Version](https://badge.fury.io/rb/discid.svg)](http://badge.fury.io/rb/discid)
+[![Maintainability](https://api.codeclimate.com/v1/badges/50e356f4260a127af75b/maintainability)](https://codeclimate.com/github/phw/ruby-discid/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/50e356f4260a127af75b/test_coverage)](https://codeclimate.com/github/phw/ruby-discid/test_coverage)
 
 ## About
 ruby-discid provides Ruby bindings for the MusicBrainz DiscID library [libdiscid](http://musicbrainz.org/doc/libdiscid).
@@ -15,7 +14,7 @@ ruby-discid will just return a default value. The version required for a feature
 is documented in the [API documentation](http://www.rubydoc.info/github/phw/ruby-discid/master).
 
 ## Requirements
-* Ruby >= 1.9.0
+* Ruby >= 2.0
 * RubyGems >= 1.3.6
 * Ruby-FFI >= 1.6.0
 * libdiscid >= 0.1.0
@@ -112,7 +111,7 @@ Please report any issues on the
 [issue tracker](https://github.com/phw/ruby-discid/issues).
 
 ## License
-ruby-discid Copyright (c) 2007-2019 by Philipp Wolfer <ph.wolfer@gmail.com>
+ruby-discid Copyright (c) 2007-2023 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/lib/discid/disc.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Philipp Wolfer
+# Copyright (C) 2013-2014, 2021 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
@@ -197,12 +197,12 @@ module DiscId
     #     instead iterates over the block calling the block with one argument.
     # @yieldreturn [nil]
     # @return [Array<Track>] Array of {Track} objects.
-    def tracks
+    def tracks(&block)
       if @read
         read_tracks if @tracks.nil?
 
-        if block_given?
-          @tracks.each(&Proc.new)
+        if block
+          @tracks.each(&block)
           return nil
         else
           return @tracks

data/lib/discid/track.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008 - 2013 Philipp Wolfer
+# Copyright (C) 2008-2023 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
@@ -117,7 +117,7 @@ module DiscId
     # Converts the Track into a Hash.
     #
     # @return [Hash]
-    def to_hash
+    def to_h
       {
         :number       => number,
         :sectors      => sectors,
@@ -130,5 +130,6 @@ module DiscId
       }
     end
 
+    alias_method :to_hash, :to_h
   end
 end

data/lib/discid/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Philipp Wolfer
+# Copyright (C) 2013-2023 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.4.0"
+  VERSION = "1.5.0"
 end

data/test/test_discid.rb

@@ -63,15 +63,16 @@ class TestDiscId < Test::Unit::TestCase
     disc = DiscId.put(3, @fiction_sectors,
                       [150, 18901, 39738, 59557, 79152, 100126,
                        124833, 147278, 166336, 182560])
+    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
   end
 
   def test_put_invalid_track_count
-    assert_raise(DiscId::DiscError) {
-      disc = DiscId.put(1, @fiction_sectors, Array.new(101) {|i| i + 150 })
-    }
+    assert_raise(DiscId::DiscError) do
+      DiscId.put(1, @fiction_sectors, Array.new(101) {|i| i + 150 })
+    end
   end
 
   # Test the tracks method and TrackInfo objects

data/test/test_track.rb

@@ -43,17 +43,20 @@ class TestTrack < Test::Unit::TestCase
 
   def test_to_hash
     track = DiscId::Track.new @number, @offset, @length, @isrc
-    hash = track.to_hash
 
-    assert_equal track.number, hash[:number]
-    assert_equal track.offset, hash[:offset]
-    assert_equal track.sectors, hash[:sectors]
-    assert_equal track.isrc, hash[:isrc]
+    for f in %i(to_h to_hash) do
+      hash = track.send(f)
 
-    assert_equal track.end_sector, hash[:end_sector]
-    assert_equal track.seconds, hash[:seconds]
-    assert_equal track.start_time, hash[:start_time]
-    assert_equal track.end_time, hash[:end_time]
+      assert_equal track.number, hash[:number]
+      assert_equal track.offset, hash[:offset]
+      assert_equal track.sectors, hash[:sectors]
+      assert_equal track.isrc, hash[:isrc]
+
+      assert_equal track.end_sector, hash[:end_sector]
+      assert_equal track.seconds, hash[:seconds]
+      assert_equal track.start_time, hash[:start_time]
+      assert_equal track.end_time, hash[:end_time]
+    end
   end
 
   def test_selector_access

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discid
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Philipp Wolfer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -98,16 +98,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 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.
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -158,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements:
 - libdiscid >= 0.1.0
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for libdiscid