kanye 0.1.1 → 0.1.2

data/Gemfile

@@ -3,6 +3,7 @@ gem 'httparty', ">= 0.7.4"
 gem 'sqlite3'
 gem 'nokogiri'
 gem 'ruby-mp3info', '0.6.14'
+gem 'rb-appscript', '0.6.1'
 
 group :development do
   gem "rspec", ">= 2"

data/History

@@ -0,0 +1,3 @@
+== 0.1.2 2011-06-06
+* major enhancements
+  * Added rb-appscript and iTunes class so tracks can be added to playlists

data/README.rdoc

@@ -13,6 +13,12 @@ The first time you run +kanye+, it will ask you for your user name.
   It appears Kanye hasn't been configured yet.
   What is your hype user name?
 
-This will output to +~/.kanye_rc+ some YAML options. Your downloads will now begin.
+This will output options to <tt>~/.kanye_rc</tt>. Your downloads will now begin.
 
 Now that you've configured it, just run +kanye+ any time to go over your latest favorites.
+
+== iTunes integration
+
+By adding the following to your <tt>~/.kanye_rc</tt> file, Kanye will add tracks to your iTunes library and add them to a playlist named for the current month and year (ie."June 2011")
+
+    playlist: true

data/Rakefile

@@ -15,7 +15,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "kanye"
   gem.homepage = "http://github.com/samvincent/kanye"
   gem.license = "MIT"
-  gem.summary = %Q{Ruby HypeM utility}
+  gem.summary = %Q{Ruby H-Y-P-E utility}
   gem.description = %Q{Lyrical genius, voice of a generation.}
   gem.email = "sam.vincent@mac.com"
   gem.authors = ["Sam Vincent"]
@@ -25,6 +25,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'sqlite3'
   gem.add_runtime_dependency 'nokogiri', '> 1.4.0'
   gem.add_runtime_dependency 'ruby-mp3info', '0.6.14'
+  gem.add_runtime_dependency 'rb-appscript', '0.6.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/kanye

@@ -4,6 +4,9 @@ $:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
 require 'rubygems'
 require 'kanye'
 
+require 'shellwords'
+include Shellwords
+
 KANYE_GLASSES = <<-GLASSES
 
                                                                 ..:ccCCO888@@@@@@@@@@@@@@@@@@@@@@88Coc:                                               
@@ -56,13 +59,14 @@ if File.exist?(Kanye::DEFAULT_CONFIGURATION_PATH)
   config = load_configuration(Kanye::DEFAULT_CONFIGURATION_PATH)
 else
   puts "It appears Kanye doesn't know who you are yet."
-  print "What is your hype name?"
+  print "What is your h-y-p-e name?"
   name = gets.chomp
   File.open(Kanye::DEFAULT_CONFIGURATION_PATH, "w") do |f|
     f.write "username: #{name}\n"
     f.write "pages: 5\n"
     f.write "path: #{Kanye::DEFAULT_DOWNLOAD_PATH}\n"
     f.write "db: #{Kanye::DEFAULT_DB_PATH}\n"
+    f.write "playlist: false\n"
   end
   config = load_configuration(Kanye::DEFAULT_CONFIGURATION_PATH)
 end
@@ -81,8 +85,24 @@ unless File.exists? config["db"]
 end
 
 # Grab as many pages as configured
+pages = []
 (1..(config["pages"])).each do |page|
   user = config["username"]
-  kanye = Kanye.new(user, page)
-  kanye.download_all!
+  page = Kanye::Page.new(user, page)
+  pages << page
+  
+  page.download_all!
+end
+
+if config["playlist"].to_s == "true"
+  itunes = Kanye::ITunes.new
+  pages.reverse.each do |page|
+    page.tracks.reverse.each do |track|
+      begin
+        itunes.add_to_playlist track.filename, Time.now.strftime("%B %Y")
+        `mv #{shellescape track.filename} ~/.Trash`
+      rescue MacTypes::FileNotFoundError
+      end
+    end
+  end
 end

data/kanye.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kanye}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Vincent"]
-  s.date = %q{2011-06-17}
+  s.date = %q{2011-06-30}
   s.default_executable = %q{kanye}
   s.description = %q{Lyrical genius, voice of a generation.}
   s.email = %q{sam.vincent@mac.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     "Gemfile",
+    "History",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -29,8 +30,12 @@ Gem::Specification.new do |s|
     "kanye.gemspec",
     "lib/kanye.rb",
     "lib/kanye/history.rb",
+    "lib/kanye/itunes.rb",
+    "lib/kanye/page.rb",
     "lib/kanye/track.rb",
     "spec/data/sample.html",
+    "spec/data/super.mp3",
+    "spec/kanye/itunes_spec.rb",
     "spec/kanye/track_spec.rb",
     "spec/kanye_spec.rb",
     "spec/spec_helper.rb"
@@ -39,8 +44,9 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Ruby HypeM utility}
+  s.summary = %q{Ruby H-Y-P-E utility}
   s.test_files = [
+    "spec/kanye/itunes_spec.rb",
     "spec/kanye/track_spec.rb",
     "spec/kanye_spec.rb",
     "spec/spec_helper.rb"
@@ -54,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+      s.add_runtime_dependency(%q<rb-appscript>, ["= 0.6.1"])
       s.add_development_dependency(%q<rspec>, [">= 2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -61,11 +68,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, ["> 1.4.0"])
       s.add_runtime_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+      s.add_runtime_dependency(%q<rb-appscript>, ["= 0.6.1"])
     else
       s.add_dependency(%q<httparty>, [">= 0.7.4"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+      s.add_dependency(%q<rb-appscript>, ["= 0.6.1"])
       s.add_dependency(%q<rspec>, [">= 2"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -73,12 +82,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<nokogiri>, ["> 1.4.0"])
       s.add_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+      s.add_dependency(%q<rb-appscript>, ["= 0.6.1"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0.7.4"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+    s.add_dependency(%q<rb-appscript>, ["= 0.6.1"])
     s.add_dependency(%q<rspec>, [">= 2"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -86,6 +97,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<nokogiri>, ["> 1.4.0"])
     s.add_dependency(%q<ruby-mp3info>, ["= 0.6.14"])
+    s.add_dependency(%q<rb-appscript>, ["= 0.6.1"])
   end
 end
 

data/lib/kanye.rb

@@ -3,68 +3,24 @@ require 'nokogiri'
 require 'mp3info'
 require 'sqlite3'
 
+require 'kanye/page'
 require 'kanye/track'
 require 'kanye/history'
+require 'kanye/itunes'
 
-class Kanye
-  attr_reader :html, :response, :tracks
-  
+module Kanye
   DEFAULT_CONFIGURATION_PATH = File.expand_path("~/.kanye_rc")
   DEFAULT_DOWNLOAD_PATH = File.expand_path("~/Music/Kanye/")
   DEFAULT_DB_PATH = File.expand_path("~/Music/Kanye/.history.db")
-  
-  def initialize(path, page=1)
-    @response = HTTParty.get url(path, page)
-    @tracks   = []
-    @cookie   = @response.headers['set-cookie']
-    @html     = @response.parsed_response    
-    parse_response
-  end
-  
-  def download_all!
-    while tracks.size > 0
-      current_track = tracks.pop
-      history = History.new(DEFAULT_DB_PATH)
-      unless history.exists?(current_track)
-        current_track.download! 
-        history.insert(current_track)
-        puts "\tInserted song into db"
-      end
+  BASE_URL = 'h' + 'y' + 'p' + 'e' + 'm' + '.com'
+
+  class << self
+    def download_path
+      @@download_path ||= DEFAULT_DOWNLOAD_PATH
     end
-  end
-  
-  def url(path, page=1)
-    "http://hypem.com/"+path+"/"+page.to_s+"?ax=1&ts="+timestamp
-  end
-  
-  def self.download_path
-    @@download_path ||= DEFAULT_DOWNLOAD_PATH
-  end
-  
-  def self.db_path
-    @@db_path ||= DEFAULT_DB_PATH
-  end
-  
-  protected
-  
-  def parse_response
-    html_doc = Nokogiri::HTML(@html)
-    ids      = @html.scan /\tid:\'(\w*)\'/
-    keys     = @html.scan /\tkey:\s+?\'([\d\w]*)\'/
-    artists  = html_doc.css('.track_name .artist').map     { |node| node.content.strip }
-    titles   = html_doc.css('.track_name .artist + a').map { |node| node.content.strip }
-    [ids, keys, titles, artists].each(&:flatten!)
-    
-    ids.each_with_index do |id, i|
-      @tracks << Track.new(:id  => ids[i], 
-                           :key => keys[i], 
-                           :title  => titles[i],
-                           :artist => artists[i], 
-                           :cookie => @cookie)
+
+    def db_path
+      @@db_path ||= DEFAULT_DB_PATH
     end
   end
-  
-  def timestamp
-    ("%10.10f" % Time.now.utc.to_f).gsub('.','')
-  end
 end

data/lib/kanye/history.rb

@@ -1,14 +1,16 @@
-class History
-  attr_reader :db
-  def initialize(db_file)
-    @db = SQLite3::Database.new(db_file)
-  end
+module Kanye
+  class History
+    attr_reader :db
+    def initialize(db_file)
+      @db = SQLite3::Database.new(db_file)
+    end
   
-  def insert(track)
-    db.execute("insert into tracks values (?, ?)", [nil, track.id])
-  end
+    def insert(track)
+      db.execute("insert into tracks values (?, ?)", [nil, track.id])
+    end
   
-  def exists?(track)
-    db.execute("select * from tracks where key=?", track.id).any?
+    def exists?(track)
+      db.execute("select * from tracks where key=?", track.id).any?
+    end
   end
-end
+end

data/lib/kanye/itunes.rb

@@ -0,0 +1,28 @@
+require 'appscript'
+
+module Kanye
+  class ITunes
+    include Appscript
+    
+    def add_to_playlist(file, playlist_name)
+      list = playlist(playlist_name) || create_playlist(playlist_name)
+      raise "Playlist could not be found or created" unless list
+      track = itunes.add MacTypes::Alias.path(file)
+      track.duplicate(:to => list)
+    end
+    
+    def playlist(name)
+      itunes.user_playlists[its.name.eq(name)].get.first
+    end
+    
+    def create_playlist(name)
+      itunes.make(:new => :user_playlist, :with_properties => {:name => name})
+    end
+    
+    private
+    
+    def itunes
+      app('iTunes')
+    end
+  end
+end

data/lib/kanye/page.rb

@@ -0,0 +1,57 @@
+module Kanye
+  class Page
+    attr_reader :html, :response, :tracks
+
+
+    def initialize(path, page=1)
+      @response = HTTParty.get url(path, page)
+      @tracks   = []
+      @cookie   = @response.headers['set-cookie']
+      @html     = @response.parsed_response    
+      parse_response
+    end
+
+    def download_all!
+      tracks.each do |current_track|
+        history = History.new(DEFAULT_DB_PATH)
+        unless history.exists?(current_track)
+          begin
+            current_track.download! 
+          rescue Mp3InfoError => e
+            print e.message
+          end
+            
+          history.insert(current_track)
+          puts "\tInserted song into db"
+        end
+      end
+    end
+
+    def url(path, page=1)
+      "http://#{BASE_URL}/"+path+"/"+page.to_s+"?ax=1&ts="+timestamp
+    end
+
+    protected
+
+    def parse_response
+      html_doc = Nokogiri::HTML(@html)
+      ids      = @html.scan /\tid:\'(\w*)\'/
+      keys     = @html.scan /\tkey:\s+?\'([\d\w]*)\'/
+      artists  = html_doc.css('.track_name .artist').map     { |node| node.content.strip }
+      titles   = html_doc.css('.track_name .artist + a').map { |node| node.content.strip }
+      [ids, keys, titles, artists].each { |a| a.flatten!; a.reverse! }
+
+      ids.each_with_index do |id, i|
+        @tracks << Track.new(:id  => ids[i], 
+                             :key => keys[i], 
+                             :title  => titles[i],
+                             :artist => artists[i], 
+                             :cookie => @cookie)
+      end
+    end
+
+    def timestamp
+      ("%10.10f" % Time.now.utc.to_f).gsub('.','')
+    end
+  end
+end

data/lib/kanye/track.rb

@@ -1,53 +1,57 @@
-class NoKeyError < StandardError; end
+module Kanye
+  class NoKeyError < StandardError; end
 
-class Track
-  def initialize(params={})
-    @id     = params[:id]
-    @key    = params[:key]
-    @title  = params[:title]
-    @artist = params[:artist]
-    @cookie = params[:cookie]
-  end
+  class Track
+    def initialize(params={})
+      @id     = params[:id]
+      @key    = params[:key]
+      @title  = params[:title]
+      @artist = params[:artist]
+      @cookie = params[:cookie]
+    end
   
-  attr_reader :id, :key, :title, :artist, :cookie
+    attr_reader :id, :key, :title, :artist, :cookie
   
-  def url
-    'http://hypem.com/serve/play/'+ id + '/' + key + ".mp3"
-  end
+    def url
+      "http://#{BASE_URL}/serve/source/" + id + '/' + key
+    end
   
-  def download!
-    raise(NoKeyError, "Couldn't find :key for '#{self}'") if key.blank?
-    response = HTTParty.get(url, :headers => {'cookie' => cookie})
+    def download!
+      raise(NoKeyError, "Couldn't find :key for '#{self}'") if key.blank?
     
-    print "Attempting to download ", self
-    puts "\n\tDownloading song..."
+      response = HTTParty.get(url, :headers => {'cookie' => cookie})
+      raise "Response Code '#{response.code}' - Something has changed." unless response.code == 200
     
-    File.open(filename, "wb") do |f|
-      f.write(response.parsed_response)
-    end
     
-    set_id3_tags!
-  end
+      print "Attempting to download ", self
+      puts "\n\tDownloading song..."
     
-  def to_s
-    "(" + [key, title, artist].join(", ") +  ")"
-  end
+      mp3_url = response.parsed_response["url"]
+      mp3_response = HTTParty.get(mp3_url)
+    
+      File.open(filename, "wb") do |f|
+        f.write(mp3_response.parsed_response)
+      end
+    
+      set_id3_tags!
+    end
+    
+    def to_s
+      "(" + [key, title, artist].join(", ") +  ")"
+    end
   
-  def filename
-    name = [artist,title].join('-').gsub(/[ \/]/, "-").downcase
-    File.join(Kanye.download_path, name + ".mp3")
-  end
+    def filename
+      name = [artist,title].join('-').gsub(/[ \/]/, "-").downcase
+      File.join(Kanye.download_path, name + ".mp3")
+    end
   
-  private
+    private
   
-  def set_id3_tags!
-    begin
-      Mp3Info.open(filename, :encoding => 'utf-8') do |mp3|
+    def set_id3_tags!
+      Mp3Info.open(filename) do |mp3|
         mp3.tag.artist = artist
         mp3.tag.title  = title
       end
-    rescue Mp3InfoError => e
-      print e.message
     end
   end
-end
+end

data/spec/data/sample.html

@@ -11,7 +11,7 @@
 	    
     <div class="message-push" id="flash-warning" style="display: none">
         <div id="message-intro">
-            <p>You seem to be missing <a href="http://www.adobe.com/support/flashplayer/downloads.html">Adobe's Flash Player</a>, please install it before attempting to listen to music on the Machine.</p>
+            <p>You seem to be missing <a href="http://www.adobe.com/support/flashplayer/downloads.html">Adobe's Flash Player</a>, please install it before attempting to listen to music on the .</p>
         </div>
     </div>
 
@@ -69,7 +69,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Rusko - search hype machine for this artist" href="/artist/Rusko">
+			  <a class="artist" title="Rusko - search   for this artist" href="/artist/Rusko">
 		Rusko</a>
 			 - 
 		
@@ -170,7 +170,7 @@
 				  href="http://www.melophobe.com/concert-reviews/rusko-doorly-sir-kutz-roseland-theater-portland-or1/" 
 				  title="Read this post: Rusko + Doorly + Sir Kutz – Ros&hellip;">
             Posted 4 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/images/albumart2.gif
+				http://static-ak.m.net/images/albumart2.gif
 				);"></span></a>
 
     </p>
@@ -198,7 +198,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Rusko - search hype machine for this artist" href="/artist/Rusko">
+			  <a class="artist" title="Rusko - search   for this artist" href="/artist/Rusko">
 		Rusko</a>
 			 - 
 		
@@ -299,7 +299,7 @@
 				  href="http://www.earmilk.com/2011/04/18/rusko-everyday-the-remixes/" 
 				  title="Read this post: Rusko – Everyday [The Remixes]">
             Posted 3 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/3/1459123.png
+				http://static-ak.m.net/thumbs/3/1459123.png
 		);"></span></a>
 
     </p>
@@ -327,7 +327,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Washed Out feat. Caroline Polachek - search hype machine for this artist" href="/artist/Washed Out feat. Caroline Polachek">
+			  <a class="artist" title="Washed Out feat. Caroline Polachek - search   for this artist" href="/artist/Washed Out feat. Caroline Polachek">
 		Washed Out feat. Caroline Polachek</a>
 			 - 
 		
@@ -428,7 +428,7 @@
 				  href="http://www.tiltmag.com/2011/04/washed-out-signs-to-sub-pop.html" 
 				  title="Read this post: Washed Out Signs to Sub Pop">
             Posted 14 hrs ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/6/1461916.png
+				http://static-ak.m.net/thumbs/6/1461916.png
 		);"></span></a>
 
     </p>
@@ -456,7 +456,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Le Castle Vania - search hype machine for this artist" href="/artist/Le Castle Vania">
+			  <a class="artist" title="Le Castle Vania - search   for this artist" href="/artist/Le Castle Vania">
 		Le Castle Vania</a>
 			 - 
 		
@@ -557,7 +557,7 @@
 				  href="http://www.themusicninja.com/electro-dj-falcon-thomas-bangalter-together-le-castle-vania-computer-clubs-summer-bootleg-mix/" 
 				  title="Read this post: [Electro] DJ Falcon + Thomas Bang&hellip;">
             Posted 9 hrs ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/7/1462247.png
+				http://static-ak.m.net/thumbs/7/1462247.png
 		);"></span></a>
 
     </p>
@@ -585,7 +585,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Earl Da Grey - search hype machine for this artist" href="/artist/Earl Da Grey">
+			  <a class="artist" title="Earl Da Grey - search   for this artist" href="/artist/Earl Da Grey">
 		Earl Da Grey</a>
 			 - 
 		
@@ -682,7 +682,7 @@
 				  href="http://www.ilictronix.com/2011/04/not-my-cup-of-tea.html" 
 				  title="Read this post: Not My Cup of Tea">
             Posted 5 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/3/1457903.png
+				http://static-ak.m.net/thumbs/3/1457903.png
 		);"></span></a>
 
     </p>
@@ -710,7 +710,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="Earl Da Grey - search hype machine for this artist" href="/artist/Earl Da Grey">
+					<a class="artist" title="Earl Da Grey - search   for this artist" href="/artist/Earl Da Grey">
 		Earl Da Grey		</a> - 
 				<a title="Heavenly Motion - go to page for this track" href="/item/1ar7k/Earl+Da+Grey+-+Heavenly+Motion">
 		Heavenly Motion	</a> 
@@ -789,7 +789,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="Earl Da Grey - search hype machine for this artist" href="/artist/Earl Da Grey">
+					<a class="artist" title="Earl Da Grey - search   for this artist" href="/artist/Earl Da Grey">
 		Earl Da Grey		</a> - 
 				<a title="Millionaire Radio - go to page for this track" href="/item/1ar7g/Earl+Da+Grey+-+Millionaire+Radio">
 		Millionaire Radio	</a> 
@@ -868,7 +868,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="Earl Da Grey - search hype machine for this artist" href="/artist/Earl Da Grey">
+					<a class="artist" title="Earl Da Grey - search   for this artist" href="/artist/Earl Da Grey">
 		Earl Da Grey		</a> - 
 				<a title="Taboo - go to page for this track" href="/item/1ar7h/Earl+Da+Grey+-+Taboo">
 		Taboo	</a> 
@@ -941,14 +941,14 @@
 </div><!-- same-post -->
 
 </div><!-- section-player -->
-</div><a class="notice" onclick="if(! document.getElementById('box') ) { Lightbox.init(); } Lightbox.showBoxByAJAX('/inc/lb_signup.php', 330, 510);return false;" href=""><span>Customize the Machine with the music YOU <em>Love</em> &bull; <strong>Sign Up Now &raquo;</strong></span></a>
+</div><a class="notice" onclick="if(! document.getElementById('box') ) { Lightbox.init(); } Lightbox.showBoxByAJAX('/inc/lb_signup.php', 330, 510);return false;" href=""><span>Customize the  with the music YOU <em>Love</em> &bull; <strong>Sign Up Now &raquo;</strong></span></a>
                 <div class="section section-track section-odd">
                 <div class="section-player" >
 
     
 
   <h3 class="track_name">
-			  <a class="artist" title="James Varnish - search hype machine for this artist" href="/artist/James Varnish">
+			  <a class="artist" title="James Varnish - search   for this artist" href="/artist/James Varnish">
 		James Varnish</a>
 			 - 
 		
@@ -1045,7 +1045,7 @@
 				  href="http://www.vacayvitamins.com/electro/together-boston-2011-music-arts-technology/" 
 				  title="Read this post: Together Boston 2011 (Music, Arts&hellip;">
             Posted 4 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/5/1458305.png
+				http://static-ak.m.net/thumbs/5/1458305.png
 		);"></span></a>
 
     </p>
@@ -1073,7 +1073,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Jamaica - search hype machine for this artist" href="/artist/Jamaica">
+			  <a class="artist" title="Jamaica - search   for this artist" href="/artist/Jamaica">
 		Jamaica</a>
 			 - 
 		
@@ -1174,7 +1174,7 @@
 				  href="http://allthingsgomusic.com/interview-jamaica" 
 				  title="Read this post: Interview: Jamaica">
             Posted 4 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/6/1458346.png
+				http://static-ak.m.net/thumbs/6/1458346.png
 		);"></span></a>
 
     </p>
@@ -1202,7 +1202,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Radiohead - search hype machine for this artist" href="/artist/Radiohead">
+			  <a class="artist" title="Radiohead - search   for this artist" href="/artist/Radiohead">
 		Radiohead</a>
 			 - 
 		
@@ -1303,7 +1303,7 @@
 				  href="http://tympanogram.com/music/stream-radiohead-supercollider/" 
 				  title="Read this post: [stream] Radiohead // Supercollid&hellip;">
             Posted 14 hrs ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/0/1461900.png
+				http://static-ak.m.net/thumbs/0/1461900.png
 		);"></span></a>
 
     </p>
@@ -1331,7 +1331,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Dillon Francis - search hype machine for this artist" href="/artist/Dillon Francis">
+			  <a class="artist" title="Dillon Francis - search   for this artist" href="/artist/Dillon Francis">
 		Dillon Francis</a>
 			 - 
 		
@@ -1432,7 +1432,7 @@
 				  href="http://www.tiltmag.com/2011/04/la-dubstep-takeover-ooah-love-i-need.html" 
 				  title="Read this post: L.A. DUBSTEP TAKEOVER! OOAH - The&hellip;">
             Posted yesterday&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/1/1461131.png
+				http://static-ak.m.net/thumbs/1/1461131.png
 		);"></span></a>
 
     </p>
@@ -1460,7 +1460,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="The Human League - search hype machine for this artist" href="/artist/The Human League">
+			  <a class="artist" title="The Human League - search   for this artist" href="/artist/The Human League">
 		The Human League</a>
 			 - 
 		
@@ -1561,7 +1561,7 @@
 				  href="http://www.vacayvitamins.com/electro/mix-monday-alex-metric-bbc-radio-1-essential-mix/" 
 				  title="Read this post: Mix Monday – Alex Metric BBC Ra&hellip;">
             Posted 3 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/0/1458840.png
+				http://static-ak.m.net/thumbs/0/1458840.png
 		);"></span></a>
 
     </p>
@@ -1589,7 +1589,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="His Majesty Andre - search hype machine for this artist" href="/artist/His Majesty Andre">
+					<a class="artist" title="His Majesty Andre - search   for this artist" href="/artist/His Majesty Andre">
 		His Majesty Andre		</a> - 
 				<a title="Clubs - go to page for this track" href="/item/1as5w/His+Majesty+Andre+-+Clubs">
 		Clubs	</a> 
@@ -1668,7 +1668,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="Cassian - search hype machine for this artist" href="/artist/Cassian">
+					<a class="artist" title="Cassian - search   for this artist" href="/artist/Cassian">
 		Cassian		</a> - 
 				<a title="Getting High (Original Mix) - go to page for this track" href="/item/1as5v/Cassian+-+Getting+High+Original+Mix+">
 		Getting High (Original Mix)	</a> 
@@ -1747,7 +1747,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="Les Rythmes Digitales - search hype machine for this artist" href="/artist/Les Rythmes Digitales">
+					<a class="artist" title="Les Rythmes Digitales - search   for this artist" href="/artist/Les Rythmes Digitales">
 		Les Rythmes Digitales		</a> - 
 				<a title="About Funk - go to page for this track" href="/item/1as5z/Les+Rythmes+Digitales+-+About+Funk">
 		About Funk	</a> 
@@ -1826,7 +1826,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="BeatauCue - search hype machine for this artist" href="/artist/BeatauCue">
+					<a class="artist" title="BeatauCue - search   for this artist" href="/artist/BeatauCue">
 		BeatauCue		</a> - 
 				<a title="Behold - go to page for this track" href="/item/1873c/BeatauCue+-+Behold">
 		Behold	</a> 
@@ -1906,14 +1906,14 @@
 </div><!-- same-post -->
 
 </div><!-- section-player -->
-</div><a class="notice" onclick="if(! document.getElementById('box') ) { Lightbox.init(); } Lightbox.showBoxByAJAX('/inc/lb_signup.php', 330, 510);return false;" href=""><span>Customize the Machine with the music YOU <em>Love</em> &bull; <strong>Sign Up Now &raquo;</strong></span></a>
+</div><a class="notice" onclick="if(! document.getElementById('box') ) { Lightbox.init(); } Lightbox.showBoxByAJAX('/inc/lb_signup.php', 330, 510);return false;" href=""><span>Customize the  with the music YOU <em>Love</em> &bull; <strong>Sign Up Now &raquo;</strong></span></a>
                 <div class="section section-track section-even">
                 <div class="section-player" >
 
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Toddla T - search hype machine for this artist" href="/artist/Toddla T">
+			  <a class="artist" title="Toddla T - search   for this artist" href="/artist/Toddla T">
 		Toddla T</a>
 			 - 
 		
@@ -2014,7 +2014,7 @@
 				  href="http://schitzpopinov.com/blog/words-with-doorly" 
 				  title="Read this post: Words with Doorly">
             Posted yesterday&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/4/1461244.png
+				http://static-ak.m.net/thumbs/4/1461244.png
 		);"></span></a>
 
     </p>
@@ -2042,7 +2042,7 @@
     
 
   <h3 class="track_name">
-			  <a class="artist" title="Danger Granger - search hype machine for this artist" href="/artist/Danger Granger">
+			  <a class="artist" title="Danger Granger - search   for this artist" href="/artist/Danger Granger">
 		Danger Granger</a>
 			 - 
 		
@@ -2131,7 +2131,7 @@
         title="See other tracks posted by this blog" 
         href="/blog/earmilk/11067">
           earmilk</a> 			
-				&ldquo;Mashup Monday – We’re going to melt you faces off with enough mashed up music to make you wanna slap&hellip;&rdquo; 
+				&ldquo;Mashup Monday going to melt you faces off with enough mashed up music to make you wanna slap&hellip;&rdquo; 
 				<a 
 				  class="readpost" 
 				  target="_blank" 
@@ -2139,7 +2139,7 @@
 				  href="http://www.earmilk.com/2011/04/18/mashup-monday-week-20/" 
 				  title="Read this post: Mashup Monday – Week 20">
             Posted 3 days ago&nbsp;&raquo;<span style="background:url(
-				http://static-ak.hypem.net/thumbs/9/1459019.png
+				http://static-ak.m.net/thumbs/9/1459019.png
 		);"></span></a>
 
     </p>
@@ -2167,7 +2167,7 @@
 
 <div class="same-post section-track" >
 	<h3 class="track_name">
-					<a class="artist" title="DEFEP - search hype machine for this artist" href="/artist/DEFEP">
+					<a class="artist" title="DEFEP - search   for this artist" href="/artist/DEFEP">
 		DEFEP		</a> - 
 				<a title="Rolling it Right (Afrojack vs Adele) - go to page for this track" href="/item/1asae/DEFEP+-+Rolling+it+Right+Afrojack+vs+Adele+">
 		Rolling it Right (Afrojack vs Adele)	</a> 

data/spec/kanye/itunes_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'appscript'
+
+describe Kanye::ITunes do
+  include Appscript
+  KANYE_TEST = 'KANYE_TEST'
+  
+  describe :add_to_playlist do
+    let(:list) { Kanye::ITunes.new.playlist(KANYE_TEST) }
+    after  { begin app('iTunes').delete(list); rescue; end }
+    
+    context "when file found" do
+      context "and playlist is June" do
+        let(:file) { File.expand_path('spec/data/super.mp3') }
+        
+        before do
+          Kanye::ITunes.new.add_to_playlist(file, KANYE_TEST)
+        end
+        
+        it "should add song to playlist" do
+          tracks = app('iTunes').user_playlists[its.name.eq(KANYE_TEST)].first.tracks.name.get
+          tracks.should include('super')
+        end
+      end
+    end
+  end
+  
+  describe :playlist do
+    let(:list) { Kanye::ITunes.new.create_playlist(KANYE_TEST) }
+    before { list }
+    after  { begin app('iTunes').delete(list); rescue; end }
+    
+    context "playlist is found" do
+      it "should return appscript reference" do
+        Kanye::ITunes.new.playlist(KANYE_TEST).class.should == Appscript::Reference 
+      end
+    end
+    
+    context "playlist can not be found" do
+      before  { app('iTunes').delete list }
+      it "should return nil" do
+        Kanye::ITunes.new.playlist(KANYE_TEST).should be_nil
+      end
+    end
+  end
+end

data/spec/kanye/track_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Track do
+describe Kanye::Track do
   before do
-    @track = Track.new(:id => 'id', :key => 'key', :artist => 'Alan Braxe', :title => 'Rubicon', :cookie => 'cookie')
+    @track = Kanye::Track.new(:id => 'id', :key => 'key', :artist => 'Alan Braxe', :title => 'Rubicon', :cookie => 'cookie')
   end
   
   describe "url" do
     it "should contain contain :id and :key" do
-      @track.url.should == "http://hypem.com/serve/play/id/key.mp3"
+      @track.url.should == "http://#{Kanye::BASE_URL}/serve/source/id/key"
     end
   end
   
@@ -19,12 +19,12 @@ describe Track do
   
   describe "download!" do
     before do
-      HTTParty.stub!(:get)
+      HTTParty.stub!(:get) { mock(:response, :parsed_response => {}, :code => 200) }
       File.stub!(:open)
       Mp3Info.stub!(:open)
     end
     
-    it "should request mp3 from hypem with cookie" do
+    it "should request mp3 with cookie" do
       HTTParty.should_receive(:get).with(@track.url, {:headers => {"cookie" => @track.cookie}})
       @track.download!
     end

data/spec/kanye_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kanye do
+describe Kanye::Page do
   describe '#parse_response' do
     let(:html) { File.open('spec/data/sample.html', 'r').read }
     
@@ -12,7 +12,7 @@ describe Kanye do
       HTTParty.stub!(:get).and_return(resp)
     end
     
-    let(:kanye) { Kanye.new('test') }
+    let(:kanye) { Kanye::Page.new('test') }
     
     describe 'format strings' do
       results = [
@@ -37,7 +37,7 @@ describe Kanye do
         ["Danger Granger","Daniel is a Wild Cat (Porter Robinson vs Bat For Lashes)","1asad","65257400b1a1266adb3173f029bbb1a8","yesplease"],
         ["DEFEP","Rolling it Right (Afrojack vs Adele)","1asae","63cbcb3a740e1ad0cb7163b23e33a9d6","yesplease"]
       ]
-      results.each_with_index do |track, index|
+      results.reverse!.each_with_index do |track, index|
         describe "track No. #{index+1}" do
           subject { kanye.tracks[index] }
           its(:artist) { should == results[index][0] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kanye
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sam Vincent
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -07:00
+date: 2011-06-30 00:00:00 -07:00
 default_executable: kanye
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,9 +79,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rb-appscript
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,11 +107,11 @@ dependencies:
         - 2
         version: "2"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,11 +123,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -123,11 +139,11 @@ dependencies:
         - 2
         version: 1.5.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,11 +155,11 @@ dependencies:
         - 4
         version: 0.7.4
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,11 +169,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -169,11 +185,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: ruby-mp3info
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -185,7 +201,23 @@ dependencies:
         - 14
         version: 0.6.14
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rb-appscript
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id013
 description: Lyrical genius, voice of a generation.
 email: sam.vincent@mac.com
 executables: 
@@ -198,6 +230,7 @@ extra_rdoc_files:
 files: 
 - .document
 - Gemfile
+- History
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -206,8 +239,12 @@ files:
 - kanye.gemspec
 - lib/kanye.rb
 - lib/kanye/history.rb
+- lib/kanye/itunes.rb
+- lib/kanye/page.rb
 - lib/kanye/track.rb
 - spec/data/sample.html
+- spec/data/super.mp3
+- spec/kanye/itunes_spec.rb
 - spec/kanye/track_spec.rb
 - spec/kanye_spec.rb
 - spec/spec_helper.rb
@@ -244,8 +281,9 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Ruby HypeM utility
+summary: Ruby H-Y-P-E utility
 test_files: 
+- spec/kanye/itunes_spec.rb
 - spec/kanye/track_spec.rb
 - spec/kanye_spec.rb
 - spec/spec_helper.rb