jberkel-spotify-api 0.0.2 → 0.0.3

data/.gitignore

@@ -1 +1,2 @@
 pkg
+coverage

data/CHANGELOG

@@ -0,0 +1,6 @@
+== 0.0.2 / 2009-08-05
+ * Fix option parser bug
+
+== 0.0.1 / 2009-08-04
+ * First release to github
+

data/Rakefile

@@ -26,6 +26,14 @@ Spec::Rake::SpecTask.new do |t|
   t.libs << "./lib"
 end
 
+desc "runs specs with rcov"
+Spec::Rake::SpecTask.new('spec:coverage') do |t|
+  t.rcov = true
+  t.spec_files = FileList["spec/**/*_spec.rb"].delete_if { |f| f =~ /integration/ }
+  t.libs << "./lib"
+  t.rcov_opts = ['--exclude', 'spec/.*rb,\(__.+__\)']
+end
+
 Spec::Rake::SpecTask.new(:integration) do |t|
   t.rcov = false
   t.spec_files = FileList["spec/**/*_spec.rb"].select { |f| f =~ /integration/ }

data/VERSION.yml

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

data/examples/create_playlist.rb

@@ -6,17 +6,14 @@ require 'json'
 require 'pp'
 
 puts "creating a new playlist"
-resp = RestClient.post 'http://localhost:3000/playlists', :name=>'my shiny playlist'
+resp = RestClient.post('http://localhost:3000/playlists', {
+  "name"=>'my shiny playlist',
+  "tracks" => [ {'id'=>'6qHiOf1BFCQIzAjJsRbMfY'}, {'id'=>'1VaucR6Bsks5Q9bYBsXvuF'} ] 
+}.to_json)
+
 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/lib/jotify.rb

@@ -49,9 +49,9 @@ class Jotify
     @jotify.playlists.map { |p| playlist(p.getId()) }
   end
 
-  def playlist(id)
+  def playlist(id, resolve_tracks=false)
     playlist = @jotify.playlist(Jotify.resolve_id(id))
-    unless playlist.tracks.empty?
+    if resolve_tracks && !playlist.tracks.empty?
      res = @jotify.browse(playlist.tracks)
      res.tracks.each_with_index do |t,i|
        playlist.tracks.set(i, t)

data/lib/jotify/api.rb

@@ -82,9 +82,16 @@ end
 
 Sinatra::Application.post('/playlists') do
   content_type :json
-  name, collaborative = params[:name], params[:collaborative] == 'true'
-  playlist = jotify.create_playlist(name, collaborative)
+  body = request.body.read
+  data = JSON.parse(body)
+  playlist = jotify.create_playlist(data['name'], data['collaborative'])
   if playlist
+    if data['tracks']
+      ids  = data['tracks'].map { |t| t['id'] }
+      unless jotify.add_tracks_to_playlist(playlist, ids)         
+        return 500, 'status' => 'ERROR', 'message' => 'playlist created but tracks could not be added'
+      end
+    end
     redirect playlist.link, 201 # created
   else
     return 500, { 'status' => 'ERROR', 'message' => 'playlist could not be created' }.to_json

data/lib/jotify/media.rb

@@ -22,6 +22,10 @@ module Java
       def each(&block) 
         tracks.each(&block)
       end
+      
+      def size
+        tracks.size
+      end
 
       def inspect
         "[Playlist: #{self.getId()} #{getTracks.to_a}]"
@@ -38,6 +42,10 @@ module Java
           :collaborative => collaborative
         }
       end
+      
+      def <<(track)
+        tracks.add(track) if track.is_a?(Track)
+      end
     end
   
     class PlaylistContainer
@@ -46,6 +54,12 @@ module Java
       def each(&block) 
         playlists.each(&block) 
       end
+      
+      def size() playlists.size end
+        
+      def <<(pl)
+        playlists.add(pl) if pl.is_a?(Playlist)
+      end
     end
 
     class Result

data/spec/integration_spec.rb

@@ -30,4 +30,25 @@ describe "Integration" do
     end
   end
   
+
+  describe "playlists" do
+    
+    before do
+      @playlists = @jotify.playlists
+      @playlists.should_not be_empty
+    end
+    
+    it "should return name and id, not tracks (GH-3)" do
+      @playlists.each do |pl|
+        puts pl.inspect
+        pl.name.should_not be_nil
+       
+        pl.tracks.each do |t|
+          t.getId().should_not be_nil
+          t.getName().should be_nil
+        end
+      end      
+    end
+  end
+  
 end

data/spec/{api_spec.rb → jotify/api_spec.rb}

@@ -1,5 +1,5 @@
 #!/usr/bin/env jruby -S spec
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 require 'jotify/api'
 require 'rack/test'
@@ -84,6 +84,7 @@ describe 'Api' 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  
@@ -136,10 +137,31 @@ describe 'Api' do
     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'
+        post '/playlists', { 'name' => 'my shiny playlist', 'collaborative' => true }.to_json
+        last_response.status.should == 201
+        last_response.headers['Location'].should == 'http://open.spotify.com/user/test/playlist/2mnbxTkghYtlHMdX3jdP9C'
+      end
+
+      it "should create a playlist and adding tracks when posting to /playlists" do
+        @jotify.should_receive(:create_playlist).with('my shiny playlist', true).and_return(@playlist)
+        @jotify.should_receive(:add_tracks_to_playlist).with(@playlist, ['1','2']).and_return(true)
+   
+        post '/playlists', { 'name' => 'my shiny playlist', 
+          'collaborative' => true,
+          'tracks' =>  [ {'id'=>'1' }, { 'id'=>'2' } ] 
+          }.to_json
         last_response.status.should == 201
         last_response.headers['Location'].should == 'http://open.spotify.com/user/test/playlist/2mnbxTkghYtlHMdX3jdP9C'
       end
+
+
+      it "should return 500 if playlist could not be created" do
+        @jotify.should_receive(:create_playlist).with('my shiny playlist', true).and_return(nil)
+        post '/playlists', { :name => 'my shiny playlist', :collaborative =>true }.to_json
+        last_response.status.should == 500
+        json_response.should == {"status"=>"ERROR", "message"=>"playlist could not be created"}
+      end
+
     
       it "should update playlist when putting to /playlists/id" do
         @jotify.should_receive(:playlist).with("foo").and_return(@playlist)

data/spec/jotify/media_spec.rb

@@ -0,0 +1,106 @@
+#!/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(spotify_hex_id)
+    end
+    
+    it "should implement to_h" do
+      @artist.to_h.should == {:id=>"4d921ebcdd8c80f32ce1ed5acafbb9c8", :popularity=>0.0, :url=>"http://open.spotify.com/artist/2mnbxTkghYtlHMdX3jdP9C", :name=>nil} 
+    end
+  end
+  
+  describe "a track" do
+    before do
+      @track = Jotify::Media::Track.new(spotify_hex_id)
+    end
+    
+    it "should implement to_h" do
+      @track.to_h.should ==  {:id=>"4d921ebcdd8c80f32ce1ed5acafbb9c8", :popularity=>0.0, :url=>"http://open.spotify.com/track/2mnbxTkghYtlHMdX3jdP9C", :title=>nil, :artist=>nil, :album=>nil} 
+    end      
+  end
+  
+  describe "an album" do
+    before do
+      @album = Jotify::Media::Album.new(spotify_hex_id)
+    end
+    
+    it "should implement to_h" do
+      @album.to_h.should == {:id=>"4d921ebcdd8c80f32ce1ed5acafbb9c8", :popularity=>0.0, :url=>"http://open.spotify.com/album/2mnbxTkghYtlHMdX3jdP9C", :name=>nil, :artist=>nil, :year=>-1, :type=>nil} 
+    end
+    
+    it "should implement enumerable" do
+      @album.class.included_modules.should include(Enumerable)
+      @album.to_a.should == []
+    end            
+  end
+  
+  describe "a result" do
+    before do 
+      @result = Jotify::Media::Result.new
+    end
+    
+    it "should implement to_h" do
+      @result.to_h.should == {:artists=>[], :albums=>[], :tracks=>[]}
+    end
+    
+    it "should implement enumerable" do
+      @result.class.included_modules.should include(Enumerable)
+      @result.respond_to?(:each).should be_true
+      @result.to_a.should == []
+      @result.inspect.should == "{:artists=>[], :albums=>[], :tracks=>[]}"
+    end
+  end
+  
+  describe "playlists" do    
+    before(:each) do
+      @p = Jotify::Media::Playlist.new
+    end
+    
+    it "should implement enumerable, size, inspect" do
+      @p.class.included_modules.should include(Enumerable)
+      @p.respond_to?(:each).should be_true
+      10.times { @p.tracks.add(Jotify::Media::Track.new) }
+      @p.size.should == 10      
+    end
+    
+    it "should implement inspect" do
+      @p.inspect.should == "[Playlist:  ]" 
+    end
+    
+    it "should implement <<(track)" do
+      @t = Jotify::Media::Track.new(spotify_hex_id)      
+      lambda {
+       @p << @t 
+      }.should change(@p, :size).by(1)
+      @p.to_a.first.should == @t
+    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)     
+      @container.to_a.should == []   
+    end
+    
+    it "should implement size" do
+      @container.size.should == 0
+    end
+    
+    it "should implement <<(playlist)" do
+      lambda {
+        2.times { @container << empty_playlist }
+      }.should change(@container, :size).by(2)
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -9,3 +9,28 @@ Spec::Runner.configure do |config|
 end
 
 
+module Helpers
+  def spotify_hex_id
+    '4d921ebcdd8c80f32ce1ed5acafbb9c8'
+  end
+  
+  def spotify_uri
+    '2mnbxTkghYtlHMdX3jdP9C'
+  end
+  
+  def empty_playlist
+    Jotify::Media::Playlist.new
+  end
+  
+  def empty_track
+    Jotify::Media::Track.new
+  end
+  
+  def empty_album
+    Jotify::Media::Album.new
+  end
+end
+
+Spec::Example::ExampleMethods.send(:include, Helpers)
+
+

data/spotify-api.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spotify-api}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Berkel"]
-  s.date = %q{2009-08-05}
+  s.date = %q{2009-08-07}
   s.default_executable = %q{spotify-api-server}
   s.description = %q{an api for spotify, based on jotify}
   s.email = %q{jan.berkel@gmail.com}
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -29,10 +30,10 @@ Gem::Specification.new do |s|
      "lib/jotify.rb",
      "lib/jotify/api.rb",
      "lib/jotify/media.rb",
-     "spec/api_spec.rb",
      "spec/integration_spec.rb",
+     "spec/jotify/api_spec.rb",
+     "spec/jotify/media_spec.rb",
      "spec/jotify_spec.rb",
-     "spec/media_spec.rb",
      "spec/spec_helper.rb",
      "spotify-api.gemspec"
   ]
@@ -42,10 +43,10 @@ Gem::Specification.new do |s|
   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/integration_spec.rb",
+     "spec/jotify/api_spec.rb",
+     "spec/jotify/media_spec.rb",
      "spec/jotify_spec.rb",
-     "spec/media_spec.rb",
      "spec/spec_helper.rb",
      "examples/create_playlist.rb",
      "examples/list_playlists.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jberkel-spotify-api
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jan Berkel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 -07:00
+date: 2009-08-07 00:00:00 -07:00
 default_executable: spotify-api-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
@@ -75,10 +76,10 @@ files:
 - lib/jotify.rb
 - lib/jotify/api.rb
 - lib/jotify/media.rb
-- spec/api_spec.rb
 - spec/integration_spec.rb
+- spec/jotify/api_spec.rb
+- spec/jotify/media_spec.rb
 - spec/jotify_spec.rb
-- spec/media_spec.rb
 - spec/spec_helper.rb
 - spotify-api.gemspec
 has_rdoc: false
@@ -109,10 +110,10 @@ 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/api_spec.rb
+- spec/jotify/media_spec.rb
 - spec/jotify_spec.rb
-- spec/media_spec.rb
 - spec/spec_helper.rb
 - examples/create_playlist.rb
 - examples/list_playlists.rb

data/spec/media_spec.rb

@@ -1,77 +0,0 @@
-#!/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