mp3file 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef86469a77e1c7d0557d66f5a1b03315aa4cb0aa
-  data.tar.gz: 416bd6e21a1888607c6582924b099439082a5ea1
+  metadata.gz: cea56455b0c3fcd4691734fd996aa92b2e70c5bc
+  data.tar.gz: 577dad17813c5d17ff6f23db687ea98857f60e45
 SHA512:
-  metadata.gz: 0d4ffe9eca9cd71ad5119532c5e72aa13b3c09e6b29543e82c098898553e26d9b25daa7eefc6d6a25992d5c04fe9adb2ef6060189bbe03e10ee36d27c76919f2
-  data.tar.gz: b829fc5d498773401fdf771377ae4e4f8f8b3be9a2891d38627c34d3014e0e0ea479f655fad10b8c7c7cd2a2a9b3c5e1440ceb3494a95e4f6a5175944e5dfd13
+  metadata.gz: d06cbe98cbb7c9b86c13e3e0dc2ec2de5dabec8907145f9bf6860d35dcdaca0517e57a8d56d5596bf32f18c98fc535ca6e0b9c47e45de79173c80581efcd38fb
+  data.tar.gz: fcb827f6846adbac1a2f98186906875e30a8a44023baa01e0bb50018493a9a52e03bcd89490212cf3302cb4b2cdbaae0be2e0dac605ed740302f7601561f5315

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.1.6
+  - 2.1.9
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1

data/lib/mp3file/mp3_file.rb

@@ -200,15 +200,23 @@ module Mp3file
         end
         @num_frames = frame_headers.size
       else
-        # Use the Xing header to make the VBR / CBR call. Assume that
-        # Xing headers, when present in a CBR file, are called "Info".
-        @vbr = @xing_header.nil? || @xing_header.name == "Xing"
+        # Use the presence and name of the Xing header to make the VBR
+        # / CBR call. Assume that Xing headers, when present in a CBR
+        # file, are called "Info".
+        @vbr = !@xing_header.nil? && @xing_header.name == "Xing"
       end
 
+      # puts "@num_frames = #{@num_frames.inspect}"
+      # puts "@xing_header = #{@xing_header.inspect}"
+      # puts "@audio_size = #{@audio_size.inspect}"
+      # puts "@first_header size = #{@first_header.frame_size.inspect}"
+
       # Find the number of frames. Prefer the actual frame count we
       # did (if we scanned all the frames) over the Xing
       # header. Prefer the Xing header over file size math.
-      @num_frames = @num_frames || (@xing_header && @xing_header.frames) || (@audio_size / @first_header.frame_size)
+      @num_frames = @num_frames ||
+        (@xing_header && (@xing_header.frames + 1)) ||
+        (@audio_size / @first_header.frame_size)
 
       # Figure out the total samples and the time duration.
       @total_samples = @num_frames * @first_header.samples
@@ -221,6 +229,9 @@ module Mp3file
         @bitrate = ((@xing_header && @xing_header.bytes) || @audio_size) / @length.to_f * 8 / 1000
       end
 
+      # puts "@vbr = #{@vbr.inspect}"
+      # puts "@bitrate = #{@bitrate.inspect}"
+
       @file.close
     end
 

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/mp3file/id3v2/frame_header_spec.rb

@@ -10,7 +10,8 @@ describe Mp3file::ID3v2::FrameHeader do
     describe("A 15-byte long TT2 frame header.") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TT2\x00\x00\x0f"), tag) }
       its(:frame_id) { should == 'TT2' }
-      its(:size) { should == 15 }
+      its(:size) { should == 21 }
+      its(:frame_size) { should == 15 }
       its(:preserve_on_altered_tag) { should == false }
       its(:preserve_on_altered_file) { should == false }
       its(:read_only) { should == false }
@@ -37,7 +38,8 @@ describe Mp3file::ID3v2::FrameHeader do
     describe("A 9-byte TIT2 frame header.") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TIT2\x00\x00\x00\x09\x00\x00"), tag) }
       its(:frame_id) { should == 'TIT2' }
-      its(:size) { should == 9 }
+      its(:size) { should == 19 }
+      its(:frame_size) { should == 9 }
       its(:preserve_on_altered_tag) { should == false }
       its(:preserve_on_altered_file) { should == false }
       its(:read_only) { should == false }
@@ -52,7 +54,8 @@ describe Mp3file::ID3v2::FrameHeader do
     describe("A TIT2 header with all of its flags set") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TIT2\x00\x00\x00\x09\x00\x00"), tag) }
       its(:frame_id) { should == 'TIT2' }
-      its(:size) { should == 9 }
+      its(:size) { should == 19 }
+      its(:frame_size) { should == 9 }
       its(:preserve_on_altered_tag) { should == false }
       its(:preserve_on_altered_file) { should == false }
       its(:read_only) { should == false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Andrew Watts
@@ -82,6 +82,7 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile