mr_eko 0.5.3 → 0.6.0

data/README.md

@@ -26,6 +26,7 @@ Requirements:
 -------------
 * [ffmpeg](http://www.ffmpeg.org/download.html) in your path.
 * an [Echonest API token](http://developer.echonest.com/) which goes here: ~/.mreko/echonest_api.key
+* [Ruby 1.9.3](http://ruby-lang.org) or above
 
 TimedPlaylists:
 ---------------

data/lib/mr_eko/song.rb

@@ -109,7 +109,7 @@ class MrEko::Song < Sequel::Model
       song.md5            = md5
       song.tempo          = analysis.audio_summary.tempo
       song.duration       = analysis.audio_summary.duration
-      song.key            = analysis.audio_summary.key
+      song.key            = analysis.audio_summary['key']
       song.mode           = analysis.audio_summary.mode
       song.loudness       = analysis.audio_summary.loudness
       song.time_signature = analysis.audio_summary.time_signature
@@ -221,15 +221,15 @@ class MrEko::Song < Sequel::Model
   # @param [Array<ID3Lib::Tag>]
   # @return [Array<ID3Lib::Tag>]
   def self.clean_tags(tags)
-    ic = Iconv.new("utf-8", "ucs-2")
 
-    REQUIRED_ID3_TAGS.each do |rt|
-      decoded = begin
-        ic.iconv(tags.send(rt))
-      rescue Iconv::InvalidCharacter, Iconv::IllegalSequence
-        tags.send(rt)
+    (REQUIRED_ID3_TAGS + [:album]).each do |rt|
+      tag = tags.send(rt).to_s
+      if tag.encoding != Encoding::UTF_8
+        decoded = tag.encode
+      else
+        decoded = tag
       end
-      decoded = nil if decoded.blank?
+
       tags.send("#{rt}=", decoded)
     end
 

data/lib/mr_eko.rb

@@ -1,3 +1,5 @@
+Encoding.default_internal = Encoding::UTF_8
+
 require "rubygems"
 require "bundler"
 
@@ -10,7 +12,7 @@ require "digest/md5"
 require 'id3lib'
 require "echonest"
 begin
-  require 'ruby-debug'
+  require 'debugger'
 rescue LoadError
 end
 
@@ -20,7 +22,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
   USER_DIR = File.join(ENV['HOME'], ".mreko")
   FINGERPRINTS_DIR = File.join(USER_DIR, 'fingerprints')
   LOG_DIR = File.join(USER_DIR, 'logs')

data/mr_eko.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'mr_eko'
-  s.version           = '0.5.3'
-  s.date              = '2013-08-09'
+  s.version           = '0.6.0'
+  s.date              = '2013-08-13'
   s.rubyforge_project = 'mr_eko'
 
   ## Make sure your summary is short. The description may be as long
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha', "= 0.9.8")
   s.add_development_dependency('shoulda', "~> 2.11")
   s.add_development_dependency('test-unit', "~> 2.1")
-  s.add_development_dependency("ruby-debug")
+  s.add_development_dependency("debugger")
   s.add_development_dependency("autotest")
   s.add_development_dependency("pry")
   s.add_development_dependency("yard")

data/test/song_test.rb

@@ -104,8 +104,8 @@ class SongTest < Test::Unit::TestCase
 
       setup do
         @mp3 = MrEko::Song.parse_id3_tags(TAGLESS_MP3)
-        assert_nil @mp3.artist
-        assert_nil @mp3.title
+        assert_empty @mp3.artist
+        assert_empty @mp3.title
       end
 
       should 'return nil' do
@@ -132,10 +132,10 @@ class SongTest < Test::Unit::TestCase
     end
   end
 
-  context 'cleaning funky ID3 tags' do
+  context 'cleaning encoded ID3 tags' do
 
-    should "decode iTunes' crazy tags" do
-      dm = Iconv.conv('UTF-16', 'LATIN1', 'Dead Meadow')
+    should "decode iTunes' encoded tags" do
+      dm = 'Dead Meadow'.encode(Encoding::UCS_2BE, Encoding::UTF_8)
       tag_stub = OpenStruct.new(:artist => dm, :title => 'Good Moaning')
       ID3Lib::Tag.expects(:new).once.returns(tag_stub)
       parsed_tags = MrEko::Song.parse_id3_tags(TEST_MP3)
@@ -143,11 +143,14 @@ class SongTest < Test::Unit::TestCase
       assert_equal "Dead Meadow", parsed_tags.artist
     end
 
-    should "not blow up when there isn't any crazy encoding" do
+    should "not alter the tags when they aren't encoded" do
       tag_stub = OpenStruct.new(:artist => 'Dead Meadow', :title => 'Good Moaning')
       ID3Lib::Tag.expects(:new).once.returns(tag_stub)
 
-      assert_nothing_raised{ MrEko::Song.parse_id3_tags(TEST_MP3) }
+      parsed = MrEko::Song.parse_id3_tags(TEST_MP3)
+
+      assert_equal parsed.artist, 'Dead Meadow'
+      assert_equal parsed.title, 'Good Moaning'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_eko
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -298,6 +298,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2527726127632796201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: