grooveshark 0.1.1 → 0.2.0

data/lib/grooveshark.rb

@@ -2,6 +2,7 @@ require 'digest'
 require 'json'
 require 'rest-client'
 
+require 'grooveshark/utils'
 require 'grooveshark/errors'
 require 'grooveshark/request'
 require 'grooveshark/client'

data/lib/grooveshark/client.rb

@@ -18,7 +18,6 @@ module Grooveshark
     
     # Get communication token
     def get_comm_token
-      puts "Grooveshark::Client.get_comm_token"
       @comm_token = nil # so that it doesn't send a token
       @comm_token = request('getCommunicationToken', {:secretKey => Digest::MD5.hexdigest(@session)}, true)
     end
@@ -38,7 +37,24 @@ module Grooveshark
       raise InvalidAuthentication, 'Wrong username or password!' if @user.id == 0
       return @user
     end
-  
+    
+    # Find user by ID
+    def get_user_by_id(id)
+      resp = request('getUserByID', {:userID => id})['user']
+      resp['username'].empty? ? nil : User.new(self, resp)
+    end
+    
+    # Find user by username
+    def get_user_by_username(name)
+      resp = request('getUserByUsername', {:username => name})['user']
+      resp['username'].empty? ? nil : User.new(self, resp)
+    end
+    
+    # Get recently active users
+    def recent_users
+      request('getRecentlyActiveUsers', {})['users'].map { |u| User.new(self, u) }
+    end
+      
     # Perform search request for query
     def search(type, query)
       results = request('getSearchResults', {:type => type, :query => query})
@@ -73,7 +89,7 @@ module Grooveshark
     # Get song stream url by ID
     def get_song_url_by_id(id)
       resp = get_stream_auth_by_songid(id)
-      "http://#{resp['ip']}/stream.php?streamKey=#{resp['streamKey']}"
+      "http://#{resp['ip']}/stream.php?streamKey=#{resp['stream_key']}"
     end
     
     # Get song stream

data/lib/grooveshark/errors.rb

@@ -1,4 +1,5 @@
 module Grooveshark
   class InvalidAuthentication < Exception ; end
+  class ReadOnlyAccess < Exception ; end
   class GeneralError < Exception ; end
 end

data/lib/grooveshark/playlist.rb

@@ -9,18 +9,18 @@ module Grooveshark
       @songs = []
     
       if data
-        @id       = data['PlaylistID']
-        @name     = data['Name']
-        @about    = data['About']
-        @picture  = data['Picture']
-        @user_id  = data['UserID'] || user_id
-        @username = data['Username']
+        @id       = data['playlist_id']
+        @name     = data['name']
+        @about    = data['about']
+        @picture  = data['picture']
+        @user_id  = data['user_id'] || user_id
+        @username = data['user_name']
       end
     end
 
     # Fetch playlist songs
     def load_songs
-      @songs = @client.request('playlistGetSongs', :playlistID => @id)['Songs']
+      @songs = @client.request('playlistGetSongs', :playlistID => @id)['songs']
       @songs.map! { |s| Song.new(s) }
     end
     

data/lib/grooveshark/request.rb

@@ -12,7 +12,7 @@ module Grooveshark
     }
     
     # Perform API request
-    def request(method, params, secure=false)
+    def request(method, params={}, secure=false)
       agent = METHOD_CLIENTS.key?(method) ? METHOD_CLIENTS[method] : CLIENT
       url = "#{secure ? 'https' : 'http'}://#{API_BASE}/more.php?#{method}"
       body = {
@@ -40,6 +40,7 @@ module Grooveshark
       end
       
       data = JSON.parse(data)
+      data = data.normalize if data.kind_of?(Hash)
       return data['result'] unless data['fault']
     end
   end

data/lib/grooveshark/song.rb

@@ -8,23 +8,25 @@ module Grooveshark
     def initialize(data=nil)
       unless data.nil?
         @data       = data
-        @id         = data['SongID']
-        @name       = data['SongName'] || data['Name']
-        @artist     = data['ArtistName']
-        @artist_id  = data['ArtistID']
-        @album      = data['AlbumName']
-        @album_id   = data['AlbumID']
-        @track      = data['TrackNum']
-        @duration   = data['EstimateDuration']
-        @artwork    = data['CoverArtFilename']
-        @playcount  = data['SongPlays']
+        @id         = data['song_id']
+        @name       = data['song_name'] || data['name']
+        @artist     = data['artist_name']
+        @artist_id  = data['artist_id']
+        @album      = data['album_name']
+        @album_id   = data['album_id']
+        @track      = data['track_num']
+        @duration   = data['estimate_duration']
+        @artwork    = data['cover_art_filename']
+        @playcount  = data['song_plays']
       end
     end
     
+    # Presentable format
     def to_s
       [@id, @name, @artist].join(' - ')
     end
     
+    # Hash export for API usage
     def to_hash
       {
         'songID'      => @id,

data/lib/grooveshark/user.rb

@@ -1,17 +1,33 @@
 module Grooveshark
   class User
-    attr_reader :id, :username, :premium, :data
+    attr_reader :id, :username, :email, :premium, :data
+    attr_reader :city, :country, :sex
     attr_reader :playlists, :favorites
 
     # Init user account object
     def initialize(client, data=nil)
       if data
-        @data = data
-        @id = data['userID']
+        @data     = data
+        @id       = data['user_id']
         @username = data['username']
-        @premium = data['isPremium']
+        @premium  = data['is_premium']
+        @email    = data['email']
+        @city     = data['city']
+        @country  = data['country']
+        @sex      = data['sex']
       end
-      @client = client
+      @client     = client
+    end
+    
+    # Get user avatar URL
+    def avatar
+      "http://beta.grooveshark.com/static/userimages/#{@id}.jpg"
+    end
+    
+    # Get user activity for the date (COMES AS RAW RESPONSE)
+    def feed(date=nil)
+      date = Time.now if date.nil?
+      @client.request('getProcessedUserFeedData', {:userID => @id, :day => date.strftime("%Y%m%d")})
     end
     
     # --------------------------------------------------------------------------
@@ -20,19 +36,20 @@ module Grooveshark
     
     # Fetch songs from library 
     def library(page=0)
-      resp = @client.request('userGetSongsInLibrary', {:userID => @id, :page => page.to_s})['Songs']
+      resp = @client.request('userGetSongsInLibrary', {:userID => @id, :page => page.to_s})['songs']
       resp.map { |s| Song.new(s) }
     end
     
-    # Add songs to user library (DOES NOT WORK FOR SOME REASON)
+    # Add songs to user's library
     def library_add(songs=[])
       @client.request('userAddSongsToLibrary', {:songs => songs.map { |s| s.to_hash }})
     end
     
     # Remove song from user library
     def library_remove(song)
-      song_id = song.kind_of?(Song) ? song.id : song.to_s
-      @client.request('userRemoveSongFromLibrary', {:userID => @id, :songID => song_id})
+      raise ArgumentError, 'Song object required' unless song.kind_of?(Song)
+      req = {:userID => @id, :songID => song.id, :albumID => song.album_id, :artistID => song.artist_id}
+      @client.request('userRemoveSongFromLibrary', req)
     end
     
     # --------------------------------------------------------------------------
@@ -43,7 +60,7 @@ module Grooveshark
     def playlists
       return @playlists if @playlists
       results = @client.request('userGetPlaylists', :userID => @id)
-      @playlists = results['Playlists'].map { |list| Playlist.new(@client, list, @id) }
+      @playlists = results['playlists'].map { |list| Playlist.new(@client, list, @id) }
     end
     
     # Get playlist by ID

data/lib/grooveshark/utils.rb

@@ -0,0 +1,26 @@
+class String
+  def normalize_attribute
+    self.gsub(/^.*::/, "").
+         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+         gsub(/([a-z\d])([A-Z])/,'\1_\2').
+         downcase
+  end
+end
+
+class Hash
+  def normalize
+    h = {}
+    self.each_pair do |k,v|
+      attr = k.to_s.normalize_attribute
+      case v
+        when Hash
+          h[attr] = v.normalize
+        when Array
+          h[attr] = v.map { |o| o.kind_of?(Hash) ? o.normalize : o }
+        else
+          h[attr] = v
+      end
+    end
+    h
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grooveshark
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -06:00
+date: 2011-01-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/grooveshark.rb
+- lib/grooveshark/utils.rb
 - lib/grooveshark/client.rb
 - lib/grooveshark/errors.rb
 - lib/grooveshark/playlist.rb