discid 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f441af810cb786ff29ca6a8ce97f563feb671071
-  data.tar.gz: 7d8a7cb27691858ce104aa9ff5fcb725bca28284
+SHA256:
+  metadata.gz: fa1e17690165aeec4fbcbba04e78b7e24ceda6f44b409149d682e8a24b83692b
+  data.tar.gz: c8b61ae0fef04a93105e9e2d120fcc2b67281086696f22a6f3ee8f5c67395c76
 SHA512:
-  metadata.gz: 45d18463877605ece3ed62e5f33d1a8ba2540e5a8e7546d462690d22b3d38fd2e6720cc7d468d0d01c854c5a49421c22ccc2bbb33989334debb5a96bf0fc086d
-  data.tar.gz: 3d20253983f3aa7df9a97244f8f4bd80b15a0f2dce6de1359958c1320f5df24125f68e13c9833152581ade6fba22500e45a264bb4fdc09ba4126fa4ae72b594c
+  metadata.gz: 854bd221c4e17c2828a7ede9586f797715ef138f94fa5d039eae227f72e133913db01541e7f7f9f984dbd51dcf8f14c914b7a1b9752b4dc69400e55bca71b5f8
+  data.tar.gz: b4a832781ed273f892a6268cd2a79e2318619b4536e6c49a4b267f10537b9bbaf89d3b1cea64e141496f7b22ee42093f5be48cacd7c06a740da7d07a9fbbc1cb

data/CHANGES.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 1.3.2 (2017-12-19)
+* Fixed call to {DiscId::Disc#toc_string} with native implementation
+
 ## 1.3.1 (2017-02-16)
-* codeclimate-test-reporter is no longer a development depdendency
+* codeclimate-test-reporter is no longer a development dependency
 
 ## 1.3.0 (2016-02-19)
 * Add support for {DiscId::Disc#toc_string}. Will use the implementation from

data/lib/discid/disc.rb

@@ -145,13 +145,13 @@ module DiscId
     # @return [String] The TOC string or `nil` if no ID was yet read.
     def toc_string
       return nil if not @read
-      result = Lib.get_toc_string
+      result = Lib.get_toc_string @handle
       if not 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].gsub("+", " ")
+          result = match[1].tr("+", " ")
         else
           raise "can't get toc string from submission url"
         end

data/lib/discid/lib.rb

@@ -35,7 +35,7 @@ module DiscId
     rescue FFI::NotFoundError
       attach_function :legacy_read, :discid_read, [:pointer, :string], :int
 
-      def self.read(handle, device, features)
+      def self.read(handle, device, _features)
         legacy_read(handle, device)
       end
     end
@@ -73,7 +73,7 @@ module DiscId
     begin
       attach_function :get_mcn, :discid_get_mcn, [:pointer], :string
     rescue FFI::NotFoundError
-      def self.get_mcn(handle)
+      def self.get_mcn(_handle)
         return nil
       end
     end
@@ -81,7 +81,7 @@ module DiscId
     begin
       attach_function :get_track_isrc, :discid_get_track_isrc, [:pointer, :int], :string
     rescue FFI::NotFoundError
-      def self.get_track_isrc(handle, track)
+      def self.get_track_isrc(_handle, _track)
         return nil
       end
     end
@@ -109,17 +109,24 @@ module DiscId
     end
 
     def self.features_to_int(features)
-      feature_flag = 0
+      feature_flags = 0
       features.each do |feature|
         if feature.respond_to? :to_sym
           feature = feature.to_sym
-          feature_flag |= self::Features[feature] if
-            self::Features.symbols.include?(feature) and
-            self.has_feature(feature)
+          feature_flags = self.add_feature_to_flags(feature_flags, feature)
         end
       end
 
-      return feature_flag
+      return 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
     end
   end
 end

data/lib/discid/version.rb

@@ -16,5 +16,5 @@
 
 module DiscId
   # The version of ruby-discid.
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/test_disc.rb

@@ -85,4 +85,10 @@ class TestDisc < Test::Unit::TestCase
     assert_equal @fiction_lengths, disc.tracks.map{|t| t.sectors}
   end
 
+  def test_toc_string
+    disc = DiscId.put(@fiction_first_track, @fiction_sectors, @fiction_offsets)
+    expected_toc = '1 10 206535 150 18901 39738 59557 79152 100126 124833 147278 166336 182560'
+    assert_equal expected_toc, disc.toc_string
+  end
+
 end

data/test/test_lib.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2013-2014 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# 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_relative 'helper'
+require 'test/unit'
+require 'discid/lib'
+
+class TestTrack < Test::Unit::TestCase
+  def test_features_to_int
+    assert_equal 1, DiscId::Lib.features_to_int([:read])
+  end
+
+  def test_features_to_int_no_features
+    assert_equal 0, DiscId::Lib.features_to_int([])
+  end
+
+  def test_features_to_int_as_strings
+    assert_equal 1, DiscId::Lib.features_to_int(['read'])
+  end
+
+  def test_features_to_int_ignores_unknown
+    assert_equal 1, DiscId::Lib.features_to_int([:read, :fake])
+  end
+
+  def test_has_feature
+    assert_equal 1, DiscId::Lib.has_feature(:read)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discid
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Philipp Wolfer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -133,6 +133,7 @@ files:
 - test/helper.rb
 - test/test_disc.rb
 - test/test_discid.rb
+- test/test_lib.rb
 - test/test_track.rb
 homepage: https://github.com/phw/ruby-discid
 licenses:
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libdiscid >= 0.1.0
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for libdiscid
@@ -164,4 +165,5 @@ test_files:
 - test/helper.rb
 - test/test_disc.rb
 - test/test_discid.rb
+- test/test_lib.rb
 - test/test_track.rb