spotify-api 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,6 @@
+== 0.0.7 / 2010-03-14
+  * Updated jotify.jar
+
 == 0.0.6 / 2009-10-26
   * More interesting demo apps, more robust API
 

data/Gemfile

@@ -0,0 +1,7 @@
+gem "sinatra"
+gem "json-jruby"
+
+group :development do
+  gem "rspec"
+  gem "rack-test"
+end

data/README.md

@@ -51,6 +51,11 @@ See examples directory for usage. The demo application ([lastfm2spotify_loved_tr
 grab all recently loved tracks by your last.fm friends to create a new
 spotify playlist. A nice way to listen to some good new music (if you share a similar music taste with most of your friends :)).                      
 
+## Hacking
+
+Test your changes with *rake spec* for unit tests, *rake integration* for integration tests. The jotify jar file is build from 
+[github.com/jberkel/jotify/tree/spotify-api](http://github.com/jberkel/jotify/tree/spotify-api).
+
 ## Credits
 
 Contains code from the jotify project:

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 6
 :major: 0
 :minor: 0
+:patch: 7
+:build: 

data/lib/clients/lastfm.rb

@@ -17,7 +17,8 @@ class LastFM
   class <<self 
     def loved_tracks(user_id, limit=5)
       if tracks = query('user.getLovedTracks', :user=>user_id, :limit=>limit)['lovedtracks']['track']
-        tracks.map do |r|
+
+        [tracks].flatten.map do |r|
           { 'artist' => r['artist']['name'], 'title'=>r['name'], 'mbid' => r['mbid'] } 
         end
       else

data/lib/jotify.rb

@@ -13,7 +13,14 @@ class Jotify
   end
   
   import 'de.felixbruns.jotify.gui.util.JotifyPreferences'
-  import 'de.felixbruns.jotify.util.SpotifyURI'
+  import 'de.felixbruns.jotify.media.Link'
+
+  class Java::DeFelixbrunsJotifyMedia::Link    
+    def to_s
+      self.asHTTPLink
+    end
+  end
+  
 
   ByPopularity = Proc.new { |a,b| b.popularity <=> a.popularity }
   
@@ -46,7 +53,7 @@ class Jotify
   end
 
   def playlists
-    @jotify.playlists.map { |p| playlist(p.getId()) }
+    @jotify.playlistContainer.playlists.map { |p| playlist(p.getId()) }
   end
 
   def playlist(id, resolve_tracks=false)
@@ -60,17 +67,17 @@ class Jotify
     playlist
   end
    
-  def create_playlist(name, collaborative=false)
+  def create_playlist(name, collaborative=false, description=nil, picture=nil)
     raise ArgumentError, "need name" unless name
     
-    playlist = @jotify.playlistCreate(name, collaborative)
+    playlist = @jotify.playlistCreate(name, collaborative, description, picture)
     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))
+    @jotify.playlistContainerAddPlaylist(@jotify.playlistContainer, id.is_a?(Media::Playlist) ? id : playlist(id))
   end
      
   def rename_playlist(playlist, name)
@@ -97,11 +104,12 @@ class Jotify
   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 /\Ahttp:\/\/open\.spotify\.com/: Link.to_hex(id[id.rindex('/')+1..-1])
+      when /spotify:/: Link.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)
+      when /\A[a-zA-Z0-9]{22}\Z/: Link.to_hex(id)
     else 
       raise "invalid id: #{id}"
     end

data/lib/jotify/api.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env jruby
+
 require 'rubygems'
 require 'json'
 require 'sinatra/base'
@@ -113,7 +113,7 @@ Sinatra::Application.post('/playlists') do
         return error(500, 'playlist created but tracks could not be added')
       end
     end
-    redirect playlist.link, 201 # created
+    redirect playlist.link.asHTTPLink, 201 # created
   else
     error(500, 'playlist could not be created')
   end

data/lib/jotify/media.rb

@@ -11,7 +11,7 @@ module Java
   
       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[:url] = self.link.asHTTPLink if self.respond_to?(:link)
         h
       end
     end
@@ -39,7 +39,7 @@ module Java
         {
           :id => getId(),
           :name=> name,
-          :url => link,
+          :url => link.asHTTPLink,
           :tracks => tracks.map { |t| t.to_h },
           :author => author,
           :revision => revision,

data/spec/integration_spec.rb

@@ -40,12 +40,11 @@ describe "Integration" do
     
     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
+          t.getTitle().should be_nil
         end
       end      
     end

data/spotify-api.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{spotify-api}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Berkel"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2010-03-14}
   s.default_executable = %q{spotify-api-server}
   s.description = %q{an api for spotify, based on jotify}
   s.email = %q{jan.berkel@gmail.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "CHANGELOG",
+     "Gemfile",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -45,7 +46,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{an api for spotify, based on jotify}
   s.test_files = [
     "spec/integration_spec.rb",
@@ -80,3 +81,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spotify-api
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jan Berkel
@@ -9,59 +14,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +01:00
+date: 2010-03-14 00:00:00 +01:00
 default_executable: spotify-api-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json-jruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: an api for spotify, based on jotify
 email: jan.berkel@gmail.com
 executables: 
@@ -74,6 +89,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -107,18 +123,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: an api for spotify, based on jotify