mp3file 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mp3file (0.0.1)
+    mp3file (0.0.3)
       bindata
 
 GEM

data/lib/mp3file/mp3_file.rb

@@ -1,4 +1,6 @@
 module Mp3file
+  class InvalidMP3FileError < Mp3fileError; end
+
   class MP3File
     attr_reader(:file, :file_size, :audio_size)
     attr_reader(:first_header_offset, :first_header)
@@ -146,6 +148,7 @@ module Mp3file
       end
 
       header = nil
+      initial_header_offset = file.tell
       header_offset = file.tell
 
       while header.nil?
@@ -154,8 +157,12 @@ module Mp3file
           header_offset = file.tell - 4
         rescue InvalidMP3HeaderError => e
           header_offset += 1
-          file.seek(header_offset, IO::SEEK_SET)
-          retry
+          if header_offset - initial_header_offset > 4096
+            raise InvalidMP3FileError, "Could not find a valid MP3 header in the first 4096 bytes."
+          else
+            file.seek(header_offset, IO::SEEK_SET)
+            retry
+          end
         end
 
         # byte = file.readbyte

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mp3file.rb

@@ -3,7 +3,7 @@ require 'pathname'
 require 'rubygems'
 require 'bindata'
 
-class Mp3fileError < StandardError; end
+class Mp3file::Mp3fileError < StandardError; end
 
 require 'mp3file/mp3_file'
 require 'mp3file/mp3_header'

data/spec/mp3file/mp3_file_spec.rb

@@ -87,4 +87,11 @@ describe Mp3file::MP3File do
     its(:length) { should == 5 }
     its(:vbr?) { should == false }
   end
+
+  describe "A file consisting only of zeroes" do
+    it "raises an error" do
+      lambda { Mp3file::MP3File.new(fixture_file('zeroes.mp3')) }.
+        should(raise_error(Mp3file::InvalidMP3FileError))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000 -04:00
+date: 2011-08-02 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19138680 !ruby/object:Gem::Requirement
+  requirement: &12396020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19138680
+  version_requirements: *12396020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19138260 !ruby/object:Gem::Requirement
+  requirement: &12395600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19138260
+  version_requirements: *12395600
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &19137840 !ruby/object:Gem::Requirement
+  requirement: &12432520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19137840
+  version_requirements: *12432520
 description: Reads MP3 headers and returns their information.
 email:
 - ahwatts@gmail.com
@@ -80,6 +80,7 @@ files:
 - spec/files/bret_id3v1.mp3
 - spec/files/bret_id3v2.mp3
 - spec/files/bret_vbr_6.mp3
+- spec/files/zeroes.mp3
 - spec/mp3file/id3v1_tag_spec.rb
 - spec/mp3file/id3v2/bit_padded_int_spec.rb
 - spec/mp3file/id3v2/frame_header_spec.rb