easytag 0.2.0 → 0.3.0

data/lib/easytag/interfaces/mp4.rb

@@ -1,188 +1,20 @@
 # encoding: UTF-8
 
+require 'easytag/attributes/mp4'
+
 module EasyTag::Interfaces
   class MP4 < Base
-    # type of TagLib::MP4::Item
-    module ItemType
-      STRING         = 0 # not part of TagLib::MP4::Item, just for convenience
-      STRING_LIST    = 1
-      BOOL           = 2
-      INT            = 3
-      INT_PAIR       = 4
-      COVER_ART_LIST = 5
-    end
-
-    ITEM_LIST_KEY_MAP = {
-      :aart     => 'aART', # Album Artist
-      :akid     => 'akID',
-      :apid     => 'apID', # Apple ID
-      :atid     => 'atID',
-      :cnid     => 'cnID',
-      :covr     => 'covr', # Cover Art
-      :cpil     => 'cpil',
-      :cprt     => 'cprt',
-      :disk     => 'disk', # Disk [num, total]
-      :geid     => 'geID',
-      :pgap     => 'pgap',
-      :plid     => 'plID',
-      :purd     => 'purd', # Purchase Date
-      :rtng     => 'rtng',
-      :sfid     => 'sfID',
-      :stik     => 'stik',
-      :trkn     => 'trkn', # Track [num, total]
-      :art      => '©ART', # Track Artist
-      :alb      => '©alb', # Album
-      :cmt      => '©cmt', # Comments
-      :day      => '©day', # Release Date
-                           # (ex: 2006, 2004-08-10, 2007-11-27T08:00:00Z)
-      :gen      => '©gen', # Genre
-      :nam      => '©nam', # Title
-      :too      => '©too', # Encoder
-      :soaa     => 'soaa', # Sort Order - Album Artist
-      :soar     => 'soar', # Sort Order - Track Artist
-    }
-
     def initialize(file)
       @info = TagLib::MP4::File.new(file)
-      @tag = @info.tag
-    end
-
-    def title
-      obj_for_item_key(:nam, ItemType::STRING)
-    end
-
-    def title_sort_order
-      obj_for_item_key(:sonm, ItemType::STRING)
-    end
-
-    def artist
-      obj_for_item_key(:art, ItemType::STRING)
-    end
-
-    def artist_sort_order
-      obj_for_item_key(:soar, ItemType::STRING)
-    end
-
-    def album_artist
-      obj_for_item_key(:aart, ItemType::STRING)
-    end
-
-    def album_artist_sort_order
-      obj_for_item_key(:soaa, ItemType::STRING)
-    end
-
-    def album
-      obj_for_item_key(:alb, ItemType::STRING)
-    end
-
-    def album_sort_order
-      obj_for_item_key(:soal, ItemType::STRING)
-    end
-
-    def genre
-      obj_for_item_key(:gen, ItemType::STRING)
-    end
-
-    def comments
-      obj_for_item_key(:cmt, ItemType::STRING)
-    end
-
-    # because :day can be anything, including a year, or an exact date,
-    # we'll let #date do the parsing, and just grab the year from it
-    def year
-      date.nil? ? 0 : date.year
-    end
-
-    def date
-      return @date unless @date.nil?
-
-      date_str = obj_for_item_key(:day, ItemType::STRING)
-      @date ||= EasyTag::Utilities.get_datetime(date_str)
-    end
-
-    def album_art
-      return @album_art unless @album_art.nil?
-
-      @album_art = []
-      covers = obj_for_item_key(:covr, ItemType::COVER_ART_LIST) || []
-      covers.each do |cover|
-        @album_art << EasyTag::Image.new(cover.data)
-      end
-
-      @album_art
-    end
-
-    def apple_id
-      obj_for_item_key(:apid, ItemType::STRING)
-    end
-
-    def track_num
-      obj_for_item_key(:trkn, ItemType::INT_PAIR) || [0, 0]
-    end
-
-    def disc_num
-      obj_for_item_key(:disk, ItemType::INT_PAIR) || [0, 0]
-    end
-
-    def user_info
-      return @user_info unless @user_info.nil?
-
-      @user_info = {}
-      @tag.item_list_map.to_a.each do |key, value|
-        match_data = key.match(/\:com.apple.iTunes\:(.*)/)
-        if match_data
-          key = EasyTag::Utilities.normalize_string(match_data[1])
-          @user_info[key.to_sym] = value.to_string_list[0]
-        end
-      end
-
-      @user_info
-    end
-
-    def disc_subtitle
-      user_info[:discsubtitle]
-    end
-
-    def media
-      user_info[:media]
     end
 
-    def label
-      user_info[:label]
-    end
-
-    private
-    def lookup_item(key)
-      item_id = ITEM_LIST_KEY_MAP.fetch(key, nil)
-      @tag.item_list_map.fetch(item_id) unless item_id.nil?
-    end
-
-    def item_to_obj(item, item_type)
-      case item_type
-      when ItemType::STRING
-        item.to_string_list[0]
-      when ItemType::STRING_LIST
-        item.to_string_list
-      when ItemType::BOOL
-        item.to_bool
-      when ItemType::INT
-        item.to_int
-      when ItemType::INT_PAIR
-        item.to_int_pair
-      when ItemType::COVER_ART_LIST
-        item.to_cover_art_list
-      else
-        nil
+    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
 
-    def obj_for_item_key(item_key, item_type)
-      return nil if @tag.nil?
-
-      item = lookup_item(item_key)
-      o = item_to_obj(item, item_type) unless item.nil?
-
-      Base.obj_or_nil(o)
-    end
   end
 end

data/lib/easytag/version.rb

@@ -1,7 +1,7 @@
 module EasyTag
   class Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
   end
  

data/test/test_consistency.rb

@@ -15,11 +15,13 @@ class TestConsistencyMP301 < Test::Unit::TestCase
     assert_equal('Artist Name Here',    @mp3.artist)
     assert_equal('Album Artist Here',   @mp3.album_artist)
     assert_equal('Album Name Here',     @mp3.album)
-    assert_equal('This is my comment.', @mp3.comments)
+    assert_equal('This is my comment.', @mp3.comment)
     assert_equal('Polka',               @mp3.genre)
     assert_equal(1941,                  @mp3.year)
     assert_equal([5, 0],                @mp3.track_num)
     assert_equal([3, 0],                @mp3.disc_num)
+    assert_equal(false,                 @mp3.compilation?)
+    assert_equal(0,                     @mp3.bpm)
   end
 
   def test_date
@@ -95,7 +97,7 @@ class TestConsistencyMP302 < Test::Unit::TestCase
       #[nil,                             @mp3.album_artist_sort_order],
       ['Speakerboxxx / The Love Below', @mp3.album],
       [nil,                             @mp3.album_sort_order],
-      [nil,                             @mp3.comments],
+      [[],                             @mp3.comments],
       [nil,                             @mp3.genre],
       [2003,                            @mp3.year],
       [[8, 21],                         @mp3.track_num],
@@ -103,6 +105,8 @@ class TestConsistencyMP302 < Test::Unit::TestCase
       ['The Love Below',                @mp3.disc_subtitle],
       ['CD',                            @mp3.media],
       ['Arista',                        @mp3.label],
+      [true,                            @mp3.compilation?],
+      [0,                               @mp3.bpm],
     ]
 
     cases.each do |c|
@@ -157,6 +161,8 @@ class TestConsistency02 < Test::Unit::TestCase
       :disc_subtitle,
       :media,
       :label,
+      :compilation?,
+      :bpm,
     ]
 
     cases.each do |c|

data/test/test_mp3.rb

@@ -10,17 +10,17 @@ class TestID3v1OnlyMP3 < Test::Unit::TestCase
   end
 
   def test_tags
-    assert_equal('Track Title',       @f.title)
-    assert_equal('Track Artist',      @f.artist)
-    assert_equal('Album Name',        @f.album)
-    assert_equal('this is a comment', @f.comments)
-    assert_equal('Swing',             @f.genre)
-    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([3, 0],              @f.track_num)
-    assert_equal([0, 0],              @f.disc_num)
+    assert_equal('Track Title',         @f.title)
+    assert_equal('Track Artist',        @f.artist)
+    assert_equal('Album Name',          @f.album)
+    assert_equal(['this is a comment'], @f.comments)
+    assert_equal('Swing',               @f.genre)
+    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([3, 0],                @f.track_num)
+    assert_equal([0, 0],                @f.disc_num)
 
   end
 end
@@ -34,7 +34,7 @@ class TestID3v2OnlyMP3 < Test::Unit::TestCase
     assert_equal('Track Title',       @f.title)
     assert_equal('Track Artist',      @f.artist)
     assert_equal('Album Name',        @f.album)
-    assert_equal('this is a comment', @f.comments)
+    assert_equal('this is a comment', @f.comment)
     assert_equal('Swing',             @f.genre)
     assert_equal(1988,                @f.year)
     assert_equal(1988,                @f.date.year)
@@ -56,7 +56,7 @@ class TestNoTagsMP3 < Test::Unit::TestCase
     assert_equal(nil,  @f.artist)
     assert_equal(nil,  @f.album)
     assert_equal(nil,  @f.album_artist)
-    assert_equal(nil,  @f.comments)
+    assert_equal([],  @f.comments)
     assert_equal(nil,  @f.genre)
     assert_equal(0,    @f.year)
     assert_equal(nil,  @f.date)

data/test/test_mp4.rb

@@ -14,7 +14,7 @@ class TestNoTagsMP4 < Test::Unit::TestCase
     assert_equal(nil,    @f.artist)
     assert_equal(nil,    @f.album)
     assert_equal(nil,    @f.album_artist)
-    assert_equal(nil,    @f.comments)
+    assert_equal([],     @f.comments)
     assert_equal(nil,    @f.genre)
     assert_equal(0,      @f.year)
     assert_equal(nil,    @f.date)

data/test/test_util.rb

@@ -31,6 +31,11 @@ class TestUtilities < Test::Unit::TestCase
     assert_equal(7, date.day)
   end
 
+  def test_get_datetime04
+    date = EasyTag::Utilities.get_datetime('')
+    assert_equal(nil, date)
+  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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -66,8 +66,10 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  EasyTag is an abstraction layer to the TagLib audio tagging library. It is designed to provide a simple and consistent API regardless of file format being read.
+description: |2
+      EasyTag is an abstraction layer to the TagLib audio tagging library.
+      It is designed to provide a simple and consistent API regardless
+      of file format being read.
 email:
 - chris@chrisjlucas.com
 executables: []
@@ -81,6 +83,10 @@ files:
 - Rakefile
 - easytag.gemspec
 - lib/easytag.rb
+- lib/easytag/attributes.rb
+- lib/easytag/attributes/base.rb
+- lib/easytag/attributes/mp3.rb
+- lib/easytag/attributes/mp4.rb
 - lib/easytag/base.rb
 - lib/easytag/file.rb
 - lib/easytag/image.rb
@@ -132,4 +138,3 @@ test_files:
 - test/test_mp3.rb
 - test/test_mp4.rb
 - test/test_util.rb
-has_rdoc: