id3tag 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae0e8d8a654a808950dc260c139c134a92553d15
-  data.tar.gz: cfcae0b936e24c4fb733987b2fc492d2e02d5064
+  metadata.gz: 8ccd7d09b5680224f517388b816869e337d1041e
+  data.tar.gz: 608e4d9b4072420b86b5c53fe85cc30d0c7be16f
 SHA512:
-  metadata.gz: 0964ce3767d4637b84450e6420017b9035994f9b9b28e86839d6ebea65cbb79c5be1dc932688b2cd7bea700553a7c833f1b2f3ce01a0d8e989b5860711f4adf6
-  data.tar.gz: ca5440480c9b10ed97fa33d2ca34dd78e1b67c8b1e95e7ea3cc710c21af50e3b6161895812ab9ade5c51bfda1470de94a5789ed723ebe77a55473466b2f42948
+  metadata.gz: a82c303f0abc81661f7cf9f8ec2197770ed3fcc9f85254d8680372817fd4569b709bc1942b7055de85e0cbc41f85ad04e15f20e35e52bef4157791d9cfeb503c
+  data.tar.gz: 77890b09ebe42028bc0f96ede27bc71727563ac56c87d31bc85d6a255a26843311688aac9f8b48ee606826aecd93325cb9a5d99a6995db8198346fda70fde26f

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
 rvm:
   - ruby-head
+  - 2.1.2
   - 2.0.0
   - 1.9.3
   - jruby-19mode
   - jruby-head
-  - rbx-19mode 
-  - rbx-2.1.1
+  - rbx-2
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    id3tag (0.6.0)
+    id3tag (0.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -13,16 +14,33 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.2)
+    docile (1.1.5)
+    ffi (1.9.3-x86-mingw32)
     json (1.8.1)
     json (1.8.1-java)
-    mime-types (2.0)
-    multi_json (1.8.4)
-    rake (10.1.1)
-    rdoc (3.12.2)
+    method_source (0.8.2)
+    mime-types (2.3)
+    multi_json (1.10.1)
+    netrc (0.7.7)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.0-x86-mingw32)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      win32console (~> 1.3)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rest-client (1.7.2-x86-mingw32)
+      ffi (~> 1.9)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -31,25 +49,29 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    tins (0.13.1)
+    slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.3.0)
+    win32console (1.3.2-x86-mingw32)
 
 PLATFORMS
   java
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   bundler (~> 1.3)
   coveralls
   id3tag!
+  pry
   rake
-  rdoc (~> 3.12)
+  rdoc (~> 4.1.1)
   rspec (~> 2.13.0)
   simplecov

data/README.md

@@ -21,7 +21,7 @@ Require the libary and read basic metadata:
 ```ruby
 require "id3tag"
 
-mp3_file = File.open('/path/to/your/favorite_song.mp3')
+mp3_file = File.open('/path/to/your/favorite_song.mp3', "rb")
 tag = ID3Tag.read(mp3_file)
 puts "#{tag.artist} - #{tag.title}"
 ```
@@ -34,7 +34,7 @@ There can be more than one `comments` frame in the tag. They differ by language,
 mp3s = Dir.entries("/some/dir").select { |filename| filename =~ /\.mp3/i }
 
 mp3s.each do |file|
-  ID3Tag.read(File.open(file)) do |tag|
+  ID3Tag.read(File.open(file, "rb")) do |tag|
     puts file
     puts tag.artist
     puts tag.title
@@ -75,7 +75,7 @@ end
 
 
 ## Contributing to id3tag
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.
@@ -90,8 +90,3 @@ end
 
 Copyright (c) 2013 Krists Ozols. See LICENSE.txt for
 further details.
-
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/krists/id3tag/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/id3tag.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rdoc", "~> 3.12"
+  s.add_development_dependency "rdoc", "~> 4.1.1"
   s.add_development_dependency "rspec", "~> 2.13.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'pry'
 end

data/lib/id3tag/audio_file.rb

@@ -10,8 +10,12 @@ module ID3Tag
     end
 
     def v1_tag_present?
-      @file.seek(-ID3V1_TAG_SIZE, IO::SEEK_END)
-      @file.read(3) == IDV1_TAG_IDENTIFIER
+      if @file.size >= ID3V1_TAG_SIZE
+        @file.seek(-ID3V1_TAG_SIZE, IO::SEEK_END)
+        @file.read(3) == IDV1_TAG_IDENTIFIER
+      else
+        false
+      end
     end
 
     def v2_tag_present?
@@ -20,7 +24,11 @@ module ID3Tag
     end
 
     def v1_tag_body
-      @file.seek(-ID3V1_TAG_SIZE + IDV1_TAG_IDENTIFIER.size, IO::SEEK_END)
+      if @file.size >= ID3V1_TAG_SIZE
+        @file.seek(-ID3V1_TAG_SIZE + IDV1_TAG_IDENTIFIER.size, IO::SEEK_END)
+      else
+        @file.rewind
+      end
       @file.read
     end
 

data/lib/id3tag/synchsafe_integer.rb

@@ -3,10 +3,10 @@ module ID3Tag
     class << self
       def encode(int)
         mask = 0x7F
-        while mask <= 0x7FFFFFFF do
+        while mask <= 0x7FFFFFFF
           out = int & ~mask
           out = out << 1
-          out = out | (int & mask)
+          out |= (int & mask)
           mask = ((mask + 1) << 8) - 1
           int = out
         end
@@ -16,9 +16,9 @@ module ID3Tag
       def decode(synchsafe_int)
         out = 0
         mask = 0x7F000000
-        while mask > 0 do
+        while mask > 0
           out = out >> 1
-          out = out | (synchsafe_int & mask)
+          out |= (synchsafe_int & mask)
           mask = mask >> 8
         end
         out

data/lib/id3tag/tag.rb

@@ -92,10 +92,10 @@ module ID3Tag
 
     def possible_frame_ids_by_name(name)
       ids = []
-      id = possible_v1_frame_id_by_name(name)
-      ids << id if id
       id = possible_v2_frame_id_by_name(name)
       ids << id if id
+      id = possible_v1_frame_id_by_name(name)
+      ids << id if id
       ids
     end
 

data/lib/id3tag/version.rb

@@ -1,3 +1,3 @@
 module ID3Tag
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/features/can_read_non_audio_files_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe 'can read any file and does not raise errors if no tag found' do
-  subject { ID3Tag.read(File.open('/dev/null')) }
+  subject { ID3Tag.read(Tempfile.new('fake_mp3')) }
 
   it 'should return blanks' do
     subject.title.should == nil

data/spec/lib/id3tag/tag_spec.rb

@@ -178,7 +178,7 @@ describe ID3Tag::Tag do
         audio_file.stub({
           :v1_tag_present? => true,
           :v2_tag_present? => true,
-          :v2_tag_body => File.read(mp3_fixture("signals_1.mp3.v2_3_tag_body")),
+          :v2_tag_body => mp3_fixture("signals_1.mp3.v2_3_tag_body").read,
           :v2_tag_major_version_number => 3
         })
       end
@@ -206,8 +206,8 @@ describe ID3Tag::Tag do
         audio_file.stub({
           :v1_tag_present? => true,
           :v2_tag_present? => true,
-          :v1_tag_body => File.read(mp3_fixture("pov_20131018-2100a.mp3.v1_tag_body")),
-          :v2_tag_body => File.read(mp3_fixture("pov_20131018-2100a.mp3.v2_3_tag_body")),
+          :v1_tag_body => mp3_fixture("pov_20131018-2100a.mp3.v1_tag_body").read,
+          :v2_tag_body => mp3_fixture("pov_20131018-2100a.mp3.v2_3_tag_body").read,
           :v2_tag_major_version_number => 3
         })
       end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ unless ENV['RUBY_VERSION'] =~ /rbx/
     require 'coveralls'
     Coveralls.wear!
   else
+    require 'pry'
     require 'simplecov'
     SimpleCov.start
   end

data/spec/support/mp3_fixtures.rb

@@ -1,4 +1,4 @@
 def mp3_fixture(filename)
   fixtures_dir = File.expand_path('../../fixtures', __FILE__)
-  File.open(File.join(fixtures_dir, filename))
+  File.open(File.join(fixtures_dir, filename), "rb")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Native Ruby ID3 tag reader that aims for 100% covarage of ID3v2.x and
   ID3v1.x standards
 email: krists@iesals.lv