grooveshark 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b7dfe5b1d75551f6d9991500bd51410105bbf6
-  data.tar.gz: a0e90517ea68482399f001c63c9e92f2108c0fc5
+  metadata.gz: 4d602ca3fbcfdc5d9812fb69bd45e890f25f5b36
+  data.tar.gz: fd049697921040644c38404c77374c2b625622fe
 SHA512:
-  metadata.gz: 203b0405c3b0d4b4c9d95aedb3a5665c3219914943306e927ad48c7a4eb3b97cb1c99ee756660140fa201814787af668b1f1f7efb9be01f8f01f60bb17ccbf7f
-  data.tar.gz: 2458b45328a4a59b8876043196b72ab7c62ad8edc3ff9a284be0da13adc57314225bb5d5fbb628b1f5c1a199135a27ff7fc2aa3a6a1eb04dbc3c703b3c60a377
+  metadata.gz: e6d345fbb7bf7e58eaf8ceb38c9c2b32d604f8e5e60be3461acacb4dc1028d9f23c31b46f766d64b6ca2b2501dcd4e904a2940f727163841991ef03a0dfdca84
+  data.tar.gz: 5c1a411ae739e3c352ab7c0df69eff39e7234644860619cce1221edf0aa1b19cb48616adf90f194c50540b64fc67bf21452346437699838d26401f985d99d44c

data/lib/grooveshark/client.rb

@@ -5,9 +5,8 @@ module Grooveshark
   
     def initialize(params = {})
       @ttl = params[:ttl] || 120 # 2 minutes
-      @session, @country = get_session_and_country
       @uuid = UUID.new.generate.upcase
-      get_comm_token
+      get_token_data
     end
     
     # Authenticate user
@@ -89,32 +88,28 @@ module Grooveshark
       get_song_url_by_id(song.id)
     end
 
-    def get_session_and_country
+    def get_token_data
       response = RestClient.get('http://grooveshark.com')
-      session = response.headers[:set_cookie].to_s.scan(/PHPSESSID=([a-z\d]{32});/i).flatten.first
 
       preload_regex = /gsPreloadAjax\(\{url: '\/preload.php\?(.*)&hash=' \+ clientPage\}\)/
       preload_id = response.to_s.scan(preload_regex).flatten.first
       preload_url = "http://grooveshark.com/preload.php?#{preload_id}&getCommunicationToken=1&hash=%2F"
       preload_response = RestClient.get(preload_url)
 
-      config_json = preload_response.to_s.scan(/window.tokenData = (.*);/).flatten.first
-      raise GeneralError, "gsConfig not found" if not config_json
-      config = JSON.parse(config_json)['getGSConfig']
-      [session, config['country']]
-    end
-    
-    # Get communication token
-    def get_comm_token
-      @comm_token = nil # request() uses it
-      @comm_token = request('getCommunicationToken', {:secretKey => Digest::MD5.hexdigest(@session)}, true)
+      token_data_json = preload_response.to_s.scan(/window.tokenData = (.*);/).flatten.first
+      raise GeneralError, "token data not found" if not token_data_json
+      token_data = JSON.parse(token_data_json)
+      @comm_token = token_data['getCommunicationToken']
       @comm_token_ttl = Time.now.to_i
+      config = token_data['getGSConfig']
+      @country = config['country']
+      @session = config['sessionID']
     end
     
     # Sign method
     def create_token(method)
       rnd = get_random_hex_chars(6)
-      salt = 'gooeyFlubber'
+      salt = "gooeyFlubber"
       plain = [method, @comm_token, salt, rnd].join(':')
       hash = Digest::SHA1.hexdigest(plain)
       "#{rnd}#{hash}"
@@ -128,7 +123,7 @@ module Grooveshark
     # Perform API request
     def request(method, params={}, secure=false)
       refresh_token if @comm_token
-      
+
       url = "#{secure ? 'https' : 'http'}://grooveshark.com/more.php?#{method}"
       body = {
         'header' => {
@@ -143,7 +138,6 @@ module Grooveshark
         'parameters' => params
       }
       body['header']['token'] = create_token(method) if @comm_token
-
       begin
         data = RestClient.post(url, body.to_json, {'Content-Type' => 'application/json'})
       rescue Exception => ex
@@ -162,7 +156,7 @@ module Grooveshark
     
     # Refresh communications token on ttl
     def refresh_token
-      get_comm_token if Time.now.to_i - @comm_token_ttl > @ttl
+      get_token_data if Time.now.to_i - @comm_token_ttl > @ttl
     end
   end
 end

data/lib/grooveshark/version.rb

@@ -1,3 +1,3 @@
 module Grooveshark
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/client_spec.rb

@@ -17,7 +17,7 @@ describe 'Client' do
     it 'should have a valid token' do
       @gs = Grooveshark::Client.new
       @gs.comm_token.should_not == nil
-      @gs.comm_token.should match /^[abcdef\d]{13}$/i
+      @gs.comm_token.should match /^[abcdef\d]{40}$/i
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grooveshark
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec