play 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    play (0.0.1)
+    play (0.0.2)
       SystemTimer
       activerecord
       mustache

data/lib/play.rb

@@ -26,7 +26,7 @@ require 'play/vote'
 
 module Play
   
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   # The path to your music library. All of the music underneath this directory
   # will be added to the internal library.

data/lib/play/app/api.rb

@@ -52,20 +52,13 @@ module Play
 
     post "/api/add_album" do
       api_authenticate
-      artist = Play::Artist.find_by_name(params[:artist_name])
-      if artist
-        album = artist.albums.find_by_name(params[:album_name])
-        if album
-          album.enqueue!(api_user)
-          {
-            'artist_name' => artist.name,
-            'album_name'  => album.name
-          }.to_json
-        else
-          error("Sorry, but we couldn't find that album.")
-        end
+      album = Play::Album.find_by_name(params[:name])
+      if album
+        album.enqueue!(api_user)
+        {:artist_name => album.artist.name,
+         :album_name => album.name}.to_json
       else
-        error("Sorry, but we couldn't find that artist.")
+        error("Sorry, but we couldn't find that album.")
       end
     end
 

data/play.gemspec

@@ -13,7 +13,7 @@ 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              = 'play'
-  s.version           = '0.0.2'
+  s.version           = '0.0.3'
   s.date              = '2011-05-06'
   s.rubyforge_project = 'play'
 

data/test/test_api.rb

@@ -68,6 +68,14 @@ context "Api" do
     assert_equal [@song.title], song[:song_titles]
   end
 
+  test "/api/add_album" do
+    post "/api/add_album", { :name => @album.name,
+                             :user_login => @user.login }
+    response = parse_json(last_response.body.strip)
+    assert_equal @artist.name, response[:artist_name]
+    assert_equal @album.name, response[:album_name]
+  end
+
   test "/api/remove" do
     post "/api/remove"
     resp = parse_json(last_response.body.strip)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: play
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Zach Holman