jberkel-spotify-api 0.0.1

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2009, Jan Berkel
+All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of spotify-api nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+ 
+THIS SOFTWARE IS PROVIDED BY Jan Berkel 'AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL David R. MacIver BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,91 @@
+
+# Spotify-API
+
+I got tired of waiting for Spotify to release their API (if they release it), so decided to roll my own based on the awesome
+work done by [#hack.se](http://despotify.se) (despotify) and Felix Bruns who created a Java port of despotify called 
+[jotify](http://jotify.felixbruns.de/). Add JRuby, Sinatra and some glue to the mix and you (almost) have an API.
+
+*Important*: in order to use this API you'll need a premium spotify account! This API is as unofficial as it gets and *NOT* supported
+by Spotify in any way.
+
+At the moment the following features are implemented:
+
+* searching 							[GET /(albums|tracks|artists)?name=Foo]
+* list user's playlists 	[GET /playlists]
+* get shared playlist			[GET /playlist/id]
+* create new playlist   	[POST /playlists]
+* add tracks to playlist  [PUT	/playlists/id]
+	
+## Installation
+
+Prerequisites: *Java 6+*, JRuby 1.3.x.
+
+		$ jruby -S gem install jberkel-spotify-api --source http://gems.github.com
+		$ jruby -S spotify-api-server --account login:password
+		== Sinatra/0.9.4 has taken the stage on 3000 for development with backup from WEBrick
+		[2009-08-04 01:21:03] INFO  WEBrick 1.3.1
+		[2009-08-04 01:21:03] INFO  ruby 1.8.6 (2009-07-24) [java]
+		[2009-08-04 01:21:03] INFO  WEBrick::HTTPServer#start: pid=12162 port=3000
+	
+		$ curl http://localhost:3000/playlists | jsonpretty
+		{
+		  "result": {
+		    "playlists": [
+		      {
+		        "name": "my shiny playlist",
+		        "author": "jberkel",
+		        "url": "http:\/\/open.spotify.com\/user\/jberkel\/playlist\/5EXLGE7HPVPjvlxPmIfrDe",
+		        "revision": 2,
+		        "id": "b9fe3dcf88945d146ef18117faa61ab4",
+		        "tracks": [
+		          {
+		            "artist": "Elmore Judd",
+		            "title": "Disco In 4 Pieces",
+		            "url": "http:\/\/open.spotify.com\/track\/1VaucR6Bsks5Q9bYBsXvuF",
+		            "id": "3f2752a98dd947c5855278a88159d7b1",
+		            "album": "Insect Funk",
+		            "popularity": 0.325379997491837
+		          },
+		          {
+		            "artist": "40winks",
+		            "title": "Goodmorning (intro)",
+		            "url": "http:\/\/open.spotify.com\/track\/6qHiOf1BFCQIzAjJsRbMfY",
+		            "id": "d34a3a6daeed4f93983068e4e8c26cd6",
+		            "album": "Sound Puzzle",
+		            "popularity": 0.170609995722771
+		          }
+		        ],
+		        "collaborative": false
+		      }
+		    ]
+		  },
+		  "status": "OK"
+		}
+		
+See examples directory for usage.
+
+## Credits
+
+Contains code from the jotify project:
+
+Copyright (c) 2009, Felix Bruns <felixbruns@web.de>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	 * Redistributions of source code must retain the above copyright
+	   notice, this list of conditions and the following disclaimer.
+	 * Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/Rakefile

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'rake/testtask'
+require 'spec/rake/spectask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "spotify-api"
+    gem.summary = "an api for spotify, based on jotify"
+    gem.email = "jan.berkel@gmail.com"
+    gem.homepage = "http://github.com/jberkel/spotify-api"
+    gem.description = "an api for spotify, based on jotify"
+    gem.authors = ["Jan Berkel"]
+    gem.add_dependency "rack"
+    gem.add_dependency "rack-test"
+    gem.add_dependency "sinatra"
+    gem.add_dependency "json-jruby"    
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Spec::Rake::SpecTask.new do |t|
+  t.rcov = false
+  t.spec_files = FileList["spec/**/*_spec.rb"].delete_if { |f| f =~ /integration/ }
+  t.libs << "./lib"
+end
+
+Spec::Rake::SpecTask.new(:integration) do |t|
+  t.rcov = false
+  t.spec_files = FileList["spec/**/*_spec.rb"].select { |f| f =~ /integration/ }
+  t.libs << "./lib"
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 0
+:major: 0
+:minor: 1

data/bin/spotify-api-server

@@ -0,0 +1,25 @@
+#!/usr/bin/env jruby
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+require 'jotify'
+require 'jotify/api'
+
+DEFAULT_PORT = port = 3000
+
+def usage
+  STDERR.puts "#{File.basename($0)} [-p <port>] [--account <login>:<password>]"
+  exit(1)
+end
+
+case ARGV.shift
+  when '-p', '--port': port = ARGV.shift
+  when '--account':
+    login, password = ARGV.shift.to_s.split(':')
+    raise ArgumentError, "you need to specify both login and password!" unless login and password
+    Jotify.credentials = { :username=>login, :password=>password }
+  when '-h', '--help': usage
+end
+
+#Sinatra::Application.set :environment, :production
+Sinatra::Application.run! :port=> (port || DEFAULT_PORT).to_i

data/examples/create_playlist.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rest_client'
+require 'json'
+require 'pp'
+
+puts "creating a new playlist"
+resp = RestClient.post 'http://localhost:3000/playlists', :name=>'my shiny playlist'
+if resp.code == 201
+  location = resp.headers[:location]
+  puts "201 created (#{location})"
+  spotify_id = location[location.rindex('/')+1..-1] 
+  
+  puts "adding some tracks to it"
+  resp = RestClient.put "http://localhost:3000/playlists/#{spotify_id}", { 
+    "tracks" => [ {'id'=>'6qHiOf1BFCQIzAjJsRbMfY'}, {'id'=>'1VaucR6Bsks5Q9bYBsXvuF'} ] 
+  }.to_json
+  puts resp
+else
+  raise resp.to_s
+end
+  
+  

data/examples/list_playlists.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rest_client'
+require 'json'
+require 'pp'
+
+puts "getting all playlists"
+resp = RestClient.get 'http://localhost:3000/playlists'
+playlists = JSON.parse(resp)
+pp playlists
+
+playlists['result']['playlists'].each do |p|
+  puts "retrieving details for playlist #{p['name']}:"
+  pp JSON.parse(RestClient.get "http://localhost:3000/playlists/#{p['id']}")
+end

data/examples/search.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rest_client'
+require 'json'
+require 'pp'
+
+puts "searching for album: Moon Safari"
+pp JSON.parse(RestClient.get('http://localhost:3000/albums?name=Moon+Safari'))
+
+puts "searching for track: The End"
+pp JSON.parse(RestClient.get('http://localhost:3000/tracks?name=The+End'))
+
+puts "searching for artist: The Doors"
+pp JSON.parse(RestClient.get('http://localhost:3000/artists?name=The+Doors'))
+

data/lib/jotify.rb

@@ -0,0 +1,109 @@
+require 'java'
+require File.expand_path(File.dirname(__FILE__) + '/jars/jotify.jar')
+
+class Jotify          
+
+  module Media    
+    import 'de.felixbruns.jotify.media.Playlist'
+    import 'de.felixbruns.jotify.media.PlaylistContainer'    
+    import 'de.felixbruns.jotify.media.Result'
+    import 'de.felixbruns.jotify.media.Track'
+    import 'de.felixbruns.jotify.media.Artist'
+    import 'de.felixbruns.jotify.media.Album'
+  end
+  
+  import 'de.felixbruns.jotify.gui.util.JotifyPreferences'
+  import 'de.felixbruns.jotify.util.SpotifyURI'
+
+  ByPopularity = Proc.new { |a,b| b.popularity <=> a.popularity }
+  
+  [:close, :search].each do |m|
+    define_method(m) do |*args|
+      @jotify.send(m, *args)
+    end
+  end
+
+  def initialize(jotify_impl=Java::DeFelixbrunsJotify::JotifyPool.new(4))
+    @jotify  = jotify_impl
+    
+    credentials = Jotify.credentials
+    @jotify.login(credentials[:username], credentials[:password])
+    
+    at_exit do
+      begin
+        @jotify.close 
+      rescue Exception => e
+      end
+    end
+
+    if block_given?
+      begin
+        yield self
+      ensure
+        close
+      end
+    end
+  end
+
+  def playlists
+    @jotify.playlists.map { |p| playlist(p.getId()) }
+  end
+
+  def playlist(id)
+    playlist = @jotify.playlist(Jotify.resolve_id(id))
+    unless playlist.tracks.empty?
+     res = @jotify.browse(playlist.tracks)
+     res.tracks.each_with_index do |t,i|
+       playlist.tracks.set(i, t)
+     end
+    end
+    playlist
+  end
+   
+  def create_playlist(name, collaborative=false)
+    playlist = @jotify.playlistCreate(name, collaborative)
+    return nil unless playlist
+    add_playlist(playlist)
+    playlist
+  end
+    
+  def add_playlist(id)
+    @jotify.playlistsAddPlaylist(@jotify.playlists, id.is_a?(Media::Playlist) ? id : playlist(id))
+  end
+     
+  def add_tracks_to_playlist(playlist, track_ids)
+    tracks = Java::JavaUtil::ArrayList.new
+    track_ids.each { |id| tracks.add(Media::Track.new(Jotify.resolve_id(id))) }
+    @jotify.playlistAddTracks(playlist, tracks, 0)    
+  end
+  
+  def self.resolve_id(id)
+    case id
+      when /\Ahttp:\/\/open\.spotify\.com/: SpotifyURI.to_hex(id[id.rindex('/')+1..-1])
+      when /spotify:/: SpotifyURI.to_hex(id[id.rindex(':')+1..-1])
+      when /\A[0-9a-f]{32}\Z/: id
+      when /\A[a-zA-Z0-9]{22}\Z/: SpotifyURI.to_hex(id)
+    else 
+      raise "invalid id: #{id}"
+    end
+  end
+   
+  def self.credentials
+    prefs = JotifyPreferences.getInstance()
+    prefs.load()
+    { 
+     :username => prefs.getString("login.username"),
+     :password => prefs.getString("login.password")
+    }       
+  end
+   
+  def self.credentials=(creds)
+    prefs = JotifyPreferences.getInstance()
+    prefs.load()
+    prefs.setString("login.username", creds[:username])
+    prefs.setString("login.password", creds[:password])
+    prefs.save() or raise "could not save login details"
+  end
+end
+
+require File.expand_path(File.dirname(__FILE__) + '/jotify/media')

data/lib/jotify/api.rb

@@ -0,0 +1,114 @@
+#!/usr/bin/env jruby
+require 'rubygems'
+require 'json'
+require 'sinatra/base'
+require File.expand_path(File.dirname(__FILE__) + '/../jotify') unless defined?(Jotify)
+  
+class Sinatra::Application
+  Lock = Mutex.new
+  
+  def jotify
+    Lock.synchronize do
+      @@jotify ||= Jotify.new
+    end
+  end
+  
+  def query(what, p=what) 
+    params[p] ? "#{what}:" + params[p] : '' 
+  end
+end
+
+Sinatra::Application.error ArgumentError do
+  content_type :json
+  {
+    'status' => 'ERROR',
+    'message' => request.env['sinatra.error'].message
+  }.to_json
+end
+  
+Sinatra::Application.get('/tracks') do
+  content_type :json
+  raise ArgumentError, "need name" unless params[:name]
+  
+  res = jotify.search([query(:track, :name), query(:artist), query(:album)].join(' '))
+  {
+    'status'=>'OK', 
+    'result'=> res.tracks.map { |t| t.to_h }
+  }.to_json
+end
+
+Sinatra::Application.get('/albums') do
+  content_type :json
+  raise ArgumentError, "need name" unless params[:name]
+    
+  res = jotify.search([query(:album, :name), query(:artist)].join(' ') )
+  {
+    'status'=>'OK', 
+    'result'=> res.albums.map { |a| a.to_h }
+  }.to_json
+end
+
+Sinatra::Application.get('/artists') do
+  content_type :json
+  raise ArgumentError, "need name" unless params[:name]
+  
+  res = jotify.search(query(:artist, :name))
+  {
+    'status'=>'OK', 
+    'result'=> res.artists.map { |a| a.to_h }
+  }.to_json
+end
+
+Sinatra::Application.get('/playlists') do
+  content_type :json
+  #playlists = jotify.playlists
+  {
+    'status'=>'OK',
+    'result'=> { 'playlists' => jotify.playlists.map { |p| p.to_h } }
+  }.to_json
+end
+
+Sinatra::Application.get('/playlists/:id') do
+  content_type :json  
+  if playlist = jotify.playlist(params[:id])
+    {
+      'status'=>'OK',
+      'result'=>playlist.to_h
+    }.to_json
+  else
+    return 404, { 'status' => 'ERROR', 'message' => 'playlist not found' }.to_json
+  end
+end
+
+Sinatra::Application.post('/playlists') do
+  content_type :json
+  name, collaborative = params[:name], params[:collaborative] == 'true'
+  playlist = jotify.create_playlist(name, collaborative)
+  if playlist
+    redirect playlist.link, 201 # created
+  else
+    return 500, { 'status' => 'ERROR', 'message' => 'playlist could not be created' }.to_json
+  end
+end
+
+Sinatra::Application.put('/playlists/:id') do
+  content_type :json
+  playlist = jotify.playlist(params[:id])
+  return 404, { 'status' => 'ERROR', 'message' => 'playlist not found' }.to_json unless playlist
+  body = request.body.read
+  data = JSON.parse(body)
+  raise ArgumentError, "invalid format" unless data.is_a?(Hash) && data['tracks'].is_a?(Array)
+  ids  = data['tracks'].map { |t| t['id'] }
+  return 200, { 'status' => 'OK', 'message' => 'not modified' }.to_json if ids.empty?
+  
+  if jotify.add_tracks_to_playlist(playlist, ids)
+    return 200, { 'status' => 'OK', 'message' => "successfully added #{ids.size} tracks" }.to_json
+  else
+    return 500, { 'status' => 'ERROR', 'message' => 'could not add to playlist' }.to_json
+  end  
+end
+
+
+if __FILE__ == $0
+  Sinatra::Application.run! 
+end

data/lib/jotify/media.rb

@@ -0,0 +1,99 @@
+require 'java'
+require File.expand_path(File.dirname(__FILE__) + '/../jars/jotify.jar')
+
+#Make Jotify's native Java classes a bit more rubyish by implementing some mehods / modules
+module Java
+  module DeFelixbrunsJotifyMedia
+    class Media
+      def inspect
+        self.to_s
+      end  
+  
+      def to_h
+        h = { :id=>self.getId(), :popularity=> popularity.nan? ? 0.0 : popularity.to_f }
+        h[:url] = self.link if self.respond_to?(:link)
+        h
+      end
+    end
+  
+    class Playlist
+      include Enumerable  
+      
+      def each(&block) 
+        tracks.each(&block)
+      end
+
+      def inspect
+        "[Playlist: #{self.getId()} #{getTracks.to_a}]"
+      end
+
+      def to_h
+        {
+          :id => getId(),
+          :name=> name,
+          :url => link,
+          :tracks => tracks.map { |t| t.to_h },
+          :author => author,
+          :revision => revision,
+          :collaborative => collaborative
+        }
+      end
+    end
+  
+    class PlaylistContainer
+      include Enumerable
+      
+      def each(&block) 
+        playlists.each(&block) 
+      end
+    end
+
+    class Result
+      include Enumerable
+      
+      def each(&block)
+        artists.each(&block)
+        tracks.each(&block)
+        albums.each(&block)
+      end
+      
+      def inspect
+        { :artists=>self.artists.to_a, :albums=>self.albums.to_a, :tracks=>self.tracks.to_a }.inspect
+      end  
+
+      def to_h
+        { 
+          :artists => self.artists.map { |a| a.to_h },
+          :albums => self.albums.map { |a| a.to_h },
+          :tracks => self.tracks.map { |t| t.to_h }
+        }
+      end
+    end
+  
+    class Track
+      def to_h
+        super.merge(:title=>title, :artist=>artist ? artist.name : nil, :album=>album ? album.name : nil)
+      end
+    end
+  
+    class Artist
+      def to_h
+        super.merge(:name=>name)
+      end
+    end
+
+    class Album
+      include Enumerable
+      
+      def each(&block) 
+        tracks.each(&block) 
+      end
+        
+      def to_h
+        super.merge(:name=>name, :artist=>artist ? artist.name : nil, :year=>year, :type=>type)
+      end
+    end
+  end
+end
+
+

data/spec/api_spec.rb

@@ -0,0 +1,179 @@
+#!/usr/bin/env jruby -S spec
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+require 'jotify/api'
+require 'rack/test'
+require 'sinatra'
+
+set :environment, :test
+
+describe 'Api' do
+  
+  def app() Sinatra::Application end
+  
+  def json_response
+    last_response.content_type.should == 'application/json'      
+    JSON.parse(last_response.body)    
+  end
+
+  
+  before do  
+    @jotify = jotify = mock('Jotify')
+    Sinatra::Application.send(:define_method, :jotify) { jotify }
+  end
+  
+  describe "/artists" do
+    it "searches by artist name" do
+      res = Jotify::Media::Result.new
+      res.artists.add(Jotify::Media::Artist.new('4d921ebcdd8c80f32ce1ed5acafbb9c8', 'The Kinks'))
+      @jotify.stub!(:search).and_return(res)
+      get '/artists', :name=>'The Kinks'
+      last_response.should be_ok
+      json_response.should == {"status"=>"OK", "result"=>
+        [{"id"=>"4d921ebcdd8c80f32ce1ed5acafbb9c8", "popularity"=>0.0, "url"=>"http://open.spotify.com/artist/2mnbxTkghYtlHMdX3jdP9C", "name"=>"The Kinks"}]
+      }
+    end      
+    
+    it "should return an error message if no name is specified" do
+      lambda { get '/artists' }.should raise_error(ArgumentError)
+    end
+  end
+  
+  describe "/tracks" do
+     it "searches by track name" do
+       res = Jotify::Media::Result.new
+       res.tracks.add(Jotify::Media::Track.new('4d921ebcdd8c80f32ce1ed5acafbb9c8'))
+       @jotify.stub!(:search).and_return(res)
+       get '/tracks', :name=>'Waterloo Sunset'
+       last_response.should be_ok
+       json_response.should == {"status"=>"OK", "result"=>
+         [{"id"=>"4d921ebcdd8c80f32ce1ed5acafbb9c8", "popularity"=>0.0, "url"=>"http://open.spotify.com/track/2mnbxTkghYtlHMdX3jdP9C", "title"=>nil, "artist"=>nil, "album"=>nil}]
+       }
+     end
+           
+     it "should return an error message if no name is specified" do
+       lambda { get '/tracks' }.should raise_error(ArgumentError)
+     end
+  end
+  
+  describe "/albums" do
+    it "searches by album name" do
+      res = Jotify::Media::Result.new
+      res.albums.add(Jotify::Media::Album.new('4d921ebcdd8c80f32ce1ed5acafbb9c8', 
+      'Something Else', 
+      Jotify::Media::Artist.new('4d921ebcdd8c80f32ce1ed5acafbb9c8', 'The Kinks')))
+      
+      @jotify.stub!(:search).and_return(res)
+      get '/albums', :name=>'Something Else'
+      last_response.should be_ok
+      json_response.should == {"status"=>"OK", "result"=>
+        [{"id"=>"4d921ebcdd8c80f32ce1ed5acafbb9c8",
+          "popularity"=>0.0, 
+          "url"=>"http://open.spotify.com/album/2mnbxTkghYtlHMdX3jdP9C", 
+          "name"=>"Something Else", 
+          "artist"=>"The Kinks", "year"=>-1, "type"=>nil}]
+      }
+    end      
+    
+    it "should return an error message if no name is specified" do
+      lambda { get '/albums' }.should raise_error(ArgumentError)
+    end    
+  end
+  
+  describe "/playlists" do
+    before do 
+      #String id, String name, String author, boolean collaborative
+      @playlist = Jotify::Media::Playlist.new("4d921ebcdd8c80f32ce1ed5acafbb9c8", "my shiny playlist", "test", false)
+    end
+      
+    describe "get" do  
+      
+      it "should get all playlists created by the user" do
+        @jotify.should_receive(:playlists).and_return( [@playlist] )
+        get '/playlists'
+        last_response.should be_ok
+        json_response.should == {"status"=>"OK",
+          "result"=> { 
+            "playlists" => [
+              "id"=>"4d921ebcdd8c80f32ce1ed5acafbb9c8",
+              "url"=>"http://open.spotify.com/user/test/playlist/2mnbxTkghYtlHMdX3jdP9C",                     
+              "name"=>"my shiny playlist",
+              "tracks"=>[], "author"=>"test", "revision"=>-1, "collaborative"=>false
+            ] 
+          }
+        }
+      end
+      
+      
+      it "should retrieve a playlist by id" do
+        @jotify.should_receive(:playlist).with("4d921ebcdd8c80f32ce1ed5acafbb9c8").and_return(@playlist)
+        get '/playlists/4d921ebcdd8c80f32ce1ed5acafbb9c8'
+        last_response.should be_ok
+        json_response.should == {"status"=>"OK",
+         "result"=>{
+            "id"=>"4d921ebcdd8c80f32ce1ed5acafbb9c8",
+            "url"=>"http://open.spotify.com/user/test/playlist/2mnbxTkghYtlHMdX3jdP9C",                     
+            "name"=>"my shiny playlist",
+            "tracks"=>[], "author"=>"test", "revision"=>-1, "collaborative"=>false}
+        }
+      end
+    
+      it "should except a base62 string as id" do
+        @jotify.should_receive(:playlist).with("2mnbxTkghYtlHMdX3jdP9C").and_return(@playlist)
+        get '/playlists/2mnbxTkghYtlHMdX3jdP9C'
+        last_response.should be_ok
+      end
+    
+      it "should return 404 for non-existing playlist" do
+        @jotify.should_receive(:playlist).with("unknown").and_return(nil)
+        get '/playlists/unknown'
+        last_response.status.should == 404
+        json_response.should == {"status"=>"ERROR", "message"=>"playlist not found"}
+      end
+    end
+    
+    
+    describe "create/update" do
+      it "should create a playlist when posting to /playlists" do
+        @jotify.should_receive(:create_playlist).with('my shiny playlist', true).and_return(@playlist)
+        post '/playlists', :name => 'my shiny playlist', :collaborative => 'true'
+        last_response.status.should == 201
+        last_response.headers['Location'].should == 'http://open.spotify.com/user/test/playlist/2mnbxTkghYtlHMdX3jdP9C'
+      end
+    
+      it "should update playlist when putting to /playlists/id" do
+        @jotify.should_receive(:playlist).with("foo").and_return(@playlist)
+        @jotify.should_receive(:add_tracks_to_playlist).with(@playlist, ['1','2']).and_return(true)
+        put '/playlists/foo', { 'tracks' => [ {'id'=>'1' }, { 'id'=>'2' } ] }.to_json
+        last_response.should be_ok
+        json_response.should == {'status'=>'OK', 'message'=>'successfully added 2 tracks'}
+      end
+      
+      it "should return 404 if playlist to update cannot be found" do
+        @jotify.should_receive(:playlist).with("foo").and_return(nil)
+        put '/playlists/foo', { 'tracks' => [ {'id'=>'1' }, { 'id'=>'2' } ] }.to_json
+        last_response.status.should == 404
+        json_response.should == {"status"=>"ERROR", "message"=>"playlist not found"} 
+      end
+      
+      it "should return 500 if playlist could not be updated" do
+        @jotify.should_receive(:playlist).with("foo").and_return(@playlist)
+        @jotify.should_receive(:add_tracks_to_playlist).with(@playlist, ['1','2']).and_return(false)
+        put '/playlists/foo', { 'tracks' => [ {'id'=>'1' }, { 'id'=>'2' } ] }.to_json
+        last_response.status.should == 500
+        json_response.should == {"status"=>"ERROR", "message"=>"could not add to playlist"}         
+      end
+            
+      it "should return 403 if invalid data is supplied" do
+        @jotify.should_receive(:playlist).with("foo").and_return(@playlist)
+        lambda { put '/playlists/foo', { 'foo' => 'bar' }.to_json }.should raise_error(ArgumentError)
+      end
+      
+      it "shouldn't do anything if no track ids supplied" do
+        @jotify.should_receive(:playlist).with("foo").and_return(@playlist)
+        put '/playlists/foo', { 'tracks' => [] }.to_json
+        last_response.should be_ok
+      end
+    end
+  end
+end

data/spec/integration_spec.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env jruby -S spec
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'jotify'
+
+# WARNING: these specs need a valid spotify (premium) account, otherwise they will fail
+describe "Integration" do
+  
+  before(:all) do
+    @jotify = Jotify.new
+  end
+  
+  after(:all) do
+    @jotify.close rescue nil
+  end
+    
+  describe "searching" do
+    it "should return a result for a search" do
+      result = @jotify.search("artist:Air")
+      result.should be_a(Jotify::Media::Result)
+      
+      result.artists.should_not be_empty      
+      most_popular = result.artists.to_a.sort(&Jotify::ByPopularity).first
+      most_popular.name.should == 'Air'
+
+      result = @jotify.search("album:Moon Safari")
+      result.albums.should_not be_empty
+      most_popular = result.albums.to_a.sort(&Jotify::ByPopularity).first
+      most_popular.name.should == 'Moon Safari' 
+      most_popular.artist.name.should == 'Air'
+    end
+  end
+  
+end

data/spec/jotify_spec.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env jruby -S spec
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'jotify'
+
+describe Jotify do  
+  
+  before(:each) do
+    @jotify_impl = mock('JotifyImpl')
+    @jotify_impl.stub!(:login)
+    @jotify = Jotify.new(@jotify_impl)
+  end  
+  
+  it "should resolve ids" do    
+    { "spotify:user:flumix:playlist:2mnbxTkghYtlHMdX3jdP9C" => "4d921ebcdd8c80f32ce1ed5acafbb9c8",
+      "http://open.spotify.com/user/flumix/playlist/2mnbxTkghYtlHMdX3jdP9C" => "4d921ebcdd8c80f32ce1ed5acafbb9c8",
+      "2mnbxTkghYtlHMdX3jdP9C" => "4d921ebcdd8c80f32ce1ed5acafbb9c8",
+      "4d921ebcdd8c80f32ce1ed5acafbb9c8" => "4d921ebcdd8c80f32ce1ed5acafbb9c8"
+    }.each { |id, expected| Jotify.resolve_id(id).should == expected }
+  end
+  
+  it "should add tracks to playlist" do    
+    @playlist = Jotify::Media::Playlist.new
+    @jotify_impl.should_receive(:playlistAddTracks) do |playlist, tracks, pos|
+      playlist.should be_a(Jotify::Media::Playlist)
+      #playlist.should == @playlist
+      pos.should == 0
+      tracks.should be_an(Java::JavaUtil::List)
+      tracks.size.should == 1
+    end
+    @jotify.add_tracks_to_playlist(@playlist, ['4d921ebcdd8c80f32ce1ed5acafbb9c8'])
+  end    
+end

data/spec/media_spec.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env jruby -S spec
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'jotify'
+
+describe Jotify::Media do
+  
+  describe "an artist" do
+    before do
+      @artist = Jotify::Media::Artist.new
+    end
+    
+    it "should implement to_h" do
+      @artist.respond_to?(:to_h).should be_true
+    end
+  end
+  
+  describe "a track" do
+    before do
+      @track = Jotify::Media::Track.new
+    end
+    
+    it "should implement to_h" do
+      @track.respond_to?(:to_h).should be_true
+    end      
+  end
+  
+  describe "an album" do
+    before do
+      @album = Jotify::Media::Album.new
+    end
+    
+    it "should implement to_h" do
+      @album.respond_to?(:to_h).should be_true      
+    end
+    
+    it "should implement enumerable" do
+      @album.class.included_modules.should include(Enumerable)
+    end            
+  end
+  
+  describe "a result" do
+    before do 
+      @result = Jotify::Media::Result.new
+    end
+    
+    it "should implement to_h" do
+      @result.respond_to?(:to_h).should be_true      
+    end
+    
+    it "should implement enumerable" do
+      @result.class.included_modules.should include(Enumerable)
+      @result.respond_to?(:each).should be_true
+    end
+  end
+  
+  describe "playlists" do    
+    it "should implement enumerable" do
+      p = Jotify::Media::Playlist.new
+      p.class.included_modules.should include(Enumerable)
+      p.respond_to?(:each).should be_true
+      10.times { p.tracks.add(Jotify::Media::Track.new) }
+      p.to_a.size.should == 10      
+    end
+  end
+  
+  describe "playlist container" do
+    before do
+      @container = Jotify::Media::PlaylistContainer.new
+    end
+    
+    it "should implement enumerable" do
+      @container.respond_to?(:each).should be_true    
+      @container.class.included_modules.should include(Enumerable)        
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'spec'
+require 'rack/test'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+Spec::Runner.configure do |config|
+  config.include Rack::Test::Methods  
+end
+
+

data/spotify-api.gemspec

@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{spotify-api}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jan Berkel"]
+  s.date = %q{2009-08-04}
+  s.default_executable = %q{spotify-api-server}
+  s.description = %q{an api for spotify, based on jotify}
+  s.email = %q{jan.berkel@gmail.com}
+  s.executables = ["spotify-api-server"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION.yml",
+     "bin/spotify-api-server",
+     "examples/create_playlist.rb",
+     "examples/list_playlists.rb",
+     "examples/search.rb",
+     "lib/jars/jotify.jar",
+     "lib/jotify.rb",
+     "lib/jotify/api.rb",
+     "lib/jotify/media.rb",
+     "spec/api_spec.rb",
+     "spec/integration_spec.rb",
+     "spec/jotify_spec.rb",
+     "spec/media_spec.rb",
+     "spec/spec_helper.rb",
+     "spotify-api.gemspec"
+  ]
+  s.homepage = %q{http://github.com/jberkel/spotify-api}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{an api for spotify, based on jotify}
+  s.test_files = [
+    "spec/api_spec.rb",
+     "spec/integration_spec.rb",
+     "spec/jotify_spec.rb",
+     "spec/media_spec.rb",
+     "spec/spec_helper.rb",
+     "examples/create_playlist.rb",
+     "examples/list_playlists.rb",
+     "examples/search.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-test>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<json-jruby>, [">= 0"])
+    else
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<json-jruby>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<json-jruby>, [">= 0"])
+  end
+end

metadata

@@ -0,0 +1,119 @@
+--- !ruby/object:Gem::Specification 
+name: jberkel-spotify-api
+version: !ruby/object:Gem::Version 
+  version: 0.0.1
+platform: ruby
+authors: 
+- Jan Berkel
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-08-04 00:00:00 -07:00
+default_executable: spotify-api-server
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json-jruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: an api for spotify, based on jotify
+email: jan.berkel@gmail.com
+executables: 
+- spotify-api-server
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.md
+files: 
+- .gitignore
+- LICENSE
+- README.md
+- Rakefile
+- VERSION.yml
+- bin/spotify-api-server
+- examples/create_playlist.rb
+- examples/list_playlists.rb
+- examples/search.rb
+- lib/jars/jotify.jar
+- lib/jotify.rb
+- lib/jotify/api.rb
+- lib/jotify/media.rb
+- spec/api_spec.rb
+- spec/integration_spec.rb
+- spec/jotify_spec.rb
+- spec/media_spec.rb
+- spec/spec_helper.rb
+- spotify-api.gemspec
+has_rdoc: false
+homepage: http://github.com/jberkel/spotify-api
+licenses: 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: an api for spotify, based on jotify
+test_files: 
+- spec/api_spec.rb
+- spec/integration_spec.rb
+- spec/jotify_spec.rb
+- spec/media_spec.rb
+- spec/spec_helper.rb
+- examples/create_playlist.rb
+- examples/list_playlists.rb
+- examples/search.rb