easytag 0.3.1 → 0.4.0

data/lib/easytag/interfaces/mp4.rb

@@ -1,20 +1,14 @@
-# encoding: UTF-8
-
 require 'easytag/attributes/mp4'
 
 module EasyTag::Interfaces
   class MP4 < Base
+    ATTRIB_ARGS  = EasyTag::Attributes::MP4_ATTRIB_ARGS
+    ATTRIB_CLASS = EasyTag::Attributes::MP4Attribute
+    
     def initialize(file)
       @info = TagLib::MP4::File.new(file)
     end
 
-    EasyTag::Attributes::MP4_ATTRIB_ARGS.each do |attrib_args|
-      attrib = EasyTag::Attributes::MP4Attribute.new(attrib_args)
-      define_method(attrib.name) do
-        instance_variable_get(attrib.ivar) || 
-          instance_variable_set(attrib.ivar, attrib.call(self))
-      end
-    end
-
+    self.build_attributes(ATTRIB_CLASS, ATTRIB_ARGS)
   end
 end

data/lib/easytag/util.rb

@@ -2,6 +2,9 @@ require 'date'
 
 module EasyTag
   module Utilities
+    YEAR_RE   = /(1[89]|20)\d{2}/ # 1800-2099
+    MONTH_RE  = /(0[1-9]|1[0-2])/ # 01-12
+    DAY_RE    = /(0[1-9]|[12][0-9]|3[01])/ # matches 01-31
 
     # get_datetime
     #
@@ -9,13 +12,19 @@ module EasyTag
     def self.get_datetime(date_str)
       return nil if date_str.nil?
 
+      # DateTime can't handle 00, so replace days/months that are 00 with 01
+      #   (currently only works with YYYY-MM-DD)
+      until date_str[/\-(00)\-?/].nil?
+        date_str[/\-(00)\-?/, 1] = '01'
+      end
+
       # check for known possible formats
       case date_str
-      when /^\d{4}$/ # YYYY
+      when /^#{YEAR_RE}$/
         datetime = DateTime.strptime(date_str, '%Y')
-      when /^\d{4}\-\d{2}$/ # YYYY-MM
+      when /^#{YEAR_RE}\-#{MONTH_RE}$/ # YYYY-MM
         datetime = DateTime.strptime(date_str, '%Y-%m')
-      when /^\d{4}[0-3]\d[0-1]\d$/ # YYYYDDMM (TYER+TDAT)
+      when /^#{YEAR_RE}#{DAY_RE}#{MONTH_RE}$/ # YYYYDDMM (TYER+TDAT)
         datetime = DateTime.strptime(date_str, '%Y%d%m')
       else
         datetime = nil
@@ -30,6 +39,12 @@ module EasyTag
         end
       end
 
+      # try to get the year at the least (don't attempt if date_str is a year)
+      if datetime.nil? && !date_str.match(YEAR_RE).to_s.eql?(date_str)
+        warn 'Falling back to year-only parsing'
+        datetime = get_datetime(date_str.match(YEAR_RE).to_s)
+      end
+
       datetime
     end
 
@@ -51,6 +66,7 @@ module EasyTag
     end
 
     def self.normalize_string(str)
+      str = str.to_s
       # downcase string
       str.downcase!
       # we want snakecase
@@ -59,5 +75,19 @@ module EasyTag
       str.gsub(/\W/, '')
     end
 
+    def self.normalize_object(object)
+      if object.is_a?(String)
+        normalize_string(object)
+      elsif object.is_a?(Symbol)
+        normalize_string(object.to_s).to_sym
+      elsif object.is_a?(Array)
+        new_array = []
+        object.each { |item| new_array << normalize_object(item) }
+        new_array
+      else
+          object
+      end
+    end
+
   end
 end

data/lib/easytag/version.rb

@@ -1,8 +1,8 @@
 module EasyTag
   class Version
     MAJOR = 0
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
   end
  
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].join('.')

data/test/test_consistency.rb

@@ -90,15 +90,15 @@ class TestConsistencyMP302 < Test::Unit::TestCase
   def test_tags
     cases = [
       ['She Lives in My Lap',           @mp3.title],
-      [nil,                             @mp3.title_sort_order],
+      ['',                             @mp3.title_sort_order],
       ['OutKast feat. Rosario Dawson',  @mp3.artist],
       ['OutKast feat. Dawson, Rosario', @mp3.artist_sort_order],
       ['OutKast',                       @mp3.album_artist],
-      #[nil,                             @mp3.album_artist_sort_order],
+      ['',                             @mp3.album_artist_sort_order],
       ['Speakerboxxx / The Love Below', @mp3.album],
-      [nil,                             @mp3.album_sort_order],
+      ['',                             @mp3.album_sort_order],
       [[],                             @mp3.comments],
-      [nil,                             @mp3.genre],
+      ['',                             @mp3.genre],
       [2003,                            @mp3.year],
       [[8, 21],                         @mp3.track_num],
       [[2, 2],                          @mp3.disc_num],
@@ -107,7 +107,7 @@ class TestConsistencyMP302 < Test::Unit::TestCase
       ['Arista',                        @mp3.label],
       [true,                            @mp3.compilation?],
       [0,                               @mp3.bpm],
-      ['B0000AGWFX',                    @mp3.user_info[:asin]],
+      ['B0000AGWFX',                    @mp3.asin],
     ]
 
     cases.each do |c|
@@ -126,6 +126,26 @@ class TestConsistencyMP302 < Test::Unit::TestCase
     assert_equal(23,    @mp3.original_date.day)
   end
 
+  def test_musicbrainz_data
+    cases = [
+      [['album'], @mp3.musicbrainz_album_type],
+      ['73fdb566-a9b1-494c-9f32-51768ec9fd27',
+        @mp3.musicbrainz_album_artist_id],
+      [["73fdb566-a9b1-494c-9f32-51768ec9fd27",
+        "9facf8dc-df23-4561-85c5-ece75d692f21"], @mp3.musicbrainz_artist_id],
+      ['468cd19e-d55c-46a2-a5a6-66292d2f0a90', @mp3.musicbrainz_album_id],
+      ['fa64febd-61e0-346e-aaa2-04564ed4f0a3', 
+        @mp3.musicbrainz_release_group_id],
+      ['US', @mp3.musicbrainz_album_release_country],
+      ['official', @mp3.musicbrainz_album_status],
+    ]
+
+    cases.each do |c|
+      expected, actual = c
+      assert_equal(expected, actual)
+    end
+  end
+
   def test_album_art
     assert_equal(1, @mp3.album_art.count)
 
@@ -164,14 +184,17 @@ class TestConsistency02 < Test::Unit::TestCase
       :label,
       :compilation?,
       :bpm,
+      :asin,
+      :conductor,
+      :remixer,
+      :mood,
     ]
 
     cases.each do |c|
-      puts c
+      #puts c
       assert_equal(@mp3.send(c), @mp4.send(c))
     end
 
-    assert_equal(@mp3.user_info[:asin], @mp4.user_info[:asin])
   end
 
   def test_date
@@ -188,5 +211,23 @@ class TestConsistency02 < Test::Unit::TestCase
     assert_equal(img_mp3.data, img_mp4.data)
   end
 
+  def test_musicbrainz_data
+    cases = [
+      :musicbrainz_album_artist_id,
+      :musicbrainz_album_id,
+      :musicbrainz_album_release_country,
+      :musicbrainz_album_status,
+      :musicbrainz_album_type,
+      :musicbrainz_artist_id,
+      :musicbrainz_release_group_id,
+      :musicbrainz_track_id,
+    ]
+
+    cases.each do |c|
+      #puts c
+      assert_equal(@mp3.send(c), @mp4.send(c))
+    end
+  end
+
 end
 

data/test/test_mp3.rb

@@ -18,7 +18,7 @@ class TestID3v1OnlyMP3 < Test::Unit::TestCase
     assert_equal(1988,                  @f.year)
     assert_equal(1988,                  @f.date.year)
     assert_equal(true,                  @f.album_art.empty?)
-    assert_equal(nil,                   @f.apple_id)
+    assert_equal('',                    @f.apple_id)
     assert_equal([3, 0],                @f.track_num)
     assert_equal([0, 0],                @f.disc_num)
 
@@ -39,7 +39,7 @@ class TestID3v2OnlyMP3 < Test::Unit::TestCase
     assert_equal(1988,                @f.year)
     assert_equal(1988,                @f.date.year)
     assert_equal(true,                @f.album_art.empty?)
-    assert_equal(nil,                 @f.apple_id)
+    assert_equal('',                  @f.apple_id)
     assert_equal([3, 0],              @f.track_num)
     assert_equal([0, 0],              @f.disc_num)
 
@@ -52,18 +52,47 @@ class TestNoTagsMP3 < Test::Unit::TestCase
   end
 
   def test_tags
-    assert_equal(nil,  @f.title)
-    assert_equal(nil,  @f.artist)
-    assert_equal(nil,  @f.album)
-    assert_equal(nil,  @f.album_artist)
+    assert_equal('',  @f.title)
+    assert_equal('',  @f.artist)
+    assert_equal('',  @f.album)
+    assert_equal('',  @f.album_artist)
     assert_equal([],  @f.comments)
-    assert_equal(nil,  @f.genre)
+    assert_equal('',  @f.genre)
     assert_equal(0,    @f.year)
     assert_equal(nil,  @f.date)
     assert_equal(true, @f.album_art.empty?)
-    assert_equal(nil,  @f.apple_id)
+    assert_equal('',   @f.apple_id)
     assert_equal([0, 0],  @f.track_num)
     assert_equal([0, 0],  @f.disc_num)
+    assert_equal('',  @f.conductor)
+    assert_equal('',  @f.remixer)
+    assert_equal('',  @f.mood)
+  end
+
+  def test_musicbrainz_data
+    assert_equal('', @f.musicbrainz_album_artist_id)
+    assert_equal('', @f.musicbrainz_album_status)
+    assert_equal('', @f.musicbrainz_release_group_id)
+    assert_equal('', @f.musicbrainz_album_id)
+    assert_equal([], @f.musicbrainz_album_type)
+    assert_equal('', @f.musicbrainz_track_id)
+    assert_equal('', @f.musicbrainz_album_release_country)
+    assert_equal([], @f.musicbrainz_artist_id)
+  end
+
+  def test_aliases
+    assert_equal(@f.length, @f.duration)
+  end
+
+  def test_audio_properties
+    assert_equal(4,     @f.duration)
+    assert_equal(74,    @f.bitrate)
+    assert_equal(44100, @f.sample_rate)
+    assert_equal(2,     @f.channels)
+    assert_equal(true,  @f.original?)
+    assert_equal(3,     @f.layer)
+    assert_equal(false, @f.copyrighted?)
+    assert_equal(false, @f.protection_enabled?)
   end
 
 end

data/test/test_mp4.rb

@@ -10,18 +10,40 @@ class TestNoTagsMP4 < Test::Unit::TestCase
   end
 
   def test_tags
-    assert_equal(nil,    @f.title)
-    assert_equal(nil,    @f.artist)
-    assert_equal(nil,    @f.album)
-    assert_equal(nil,    @f.album_artist)
+    assert_equal('',    @f.title)
+    assert_equal('',    @f.artist)
+    assert_equal('',    @f.album)
+    assert_equal('',    @f.album_artist)
     assert_equal([],     @f.comments)
-    assert_equal(nil,    @f.genre)
+    assert_equal('',    @f.genre)
     assert_equal(0,      @f.year)
     assert_equal(nil,    @f.date)
     assert_equal(true,   @f.album_art.empty?)
-    assert_equal(nil,    @f.apple_id)
+    assert_equal('',    @f.apple_id)
     assert_equal([0, 0], @f.track_num)
     assert_equal([0, 0], @f.disc_num)
+    assert_equal('',    @f.conductor)
+    assert_equal('',    @f.remixer)
+    assert_equal('',    @f.mood)
+  end
+  
+  def test_musicbrainz_data
+    assert_equal('', @f.musicbrainz_album_artist_id)
+    assert_equal('', @f.musicbrainz_album_status)
+    assert_equal('', @f.musicbrainz_release_group_id)
+    assert_equal('', @f.musicbrainz_album_id)
+    assert_equal([], @f.musicbrainz_album_type)
+    assert_equal('', @f.musicbrainz_track_id)
+    assert_equal('', @f.musicbrainz_album_release_country)
+    assert_equal([], @f.musicbrainz_artist_id)
+  end
+
+  def test_audio_properties
+    assert_equal(4,     @f.duration)
+    assert_equal(176,   @f.bitrate)
+    assert_equal(44100, @f.sample_rate)
+    assert_equal(2,     @f.channels)
+    assert_equal(16,    @f.bits_per_sample)
   end
 
 end

data/test/test_util.rb

@@ -24,18 +24,33 @@ class TestUtilities < Test::Unit::TestCase
     assert_equal(7, date.day)
   end
 
-  def test_get_datetime03
+  def test_get_datetime04
     date = EasyTag::Utilities.get_datetime('19880711')
     assert_equal(1988, date.year)
     assert_equal(11, date.month)
     assert_equal(7, date.day)
   end
 
-  def test_get_datetime04
+  def test_get_datetime05
     date = EasyTag::Utilities.get_datetime('')
     assert_equal(nil, date)
   end
 
+  def test_get_datetime06
+    date = EasyTag::Utilities.get_datetime('2000-00-00')
+    assert_equal(2000, date.year)
+    assert_equal(1, date.month)
+    assert_equal(1, date.day)
+  end
+
+  def test_get_datetime07
+    date = EasyTag::Utilities.get_datetime('2006-99-99')
+    assert_equal(2006, date.year)
+    assert_equal(1, date.month)
+    assert_equal(1, date.day)
+  end
+
+
   def test_get_int_pair
     assert_equal([0, 0],  EasyTag::Utilities.get_int_pair(''))
     assert_equal([0, 0],  EasyTag::Utilities.get_int_pair(nil))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easytag
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-      EasyTag is an abstraction layer to the TagLib audio tagging library.
+      EasyTag is an abstract interface to the TagLib audio tagging library.
       It is designed to provide a simple and consistent API regardless
       of file format being read.
 email: