grooveshark 0.2.7 → 0.2.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2I1MWRjYjA2NTQyNzY4OTBmN2UwN2NjZGI4YmEwNjlmNDNhZGM4OA==
+  data.tar.gz: !binary |-
+    ZjU4YzQzNmU0MmM1NGY3Y2U3ZTY5YTFjYzljZWI5YjFlYWM3MmQwYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjQ3MjlkMGI3ODNhNjk2NGNmNjEzYjFjZDkxNjdkMDE1ZmEzZDFlNjRiNjlk
+    OTZiNGViOTIwOWY0YmQ4OGNmMjdmZGJkOTJhY2I5M2U2ZGRkYjQzNTQ2MDI4
+    ODE5MmFmMWY3YzhkZWJlYjQ0YTBmMDBkYzJkOGM5ZjIxMTA1MjM=
+  data.tar.gz: !binary |-
+    NGY3MjZlNzQ1ZTkzYzAyYjc2MjAyNjM2MjYxMjgyNGVmNmVlZDBhNDNiN2Qx
+    YWI0MDBkMDM3YmJkMmMwZDRjMjAzNTM5NDc4YjAwMGZkNzJjMzBjMGFmODhi
+    MDVlNTBkZmYyZTIwOTQ2NjlhMzEzMDBiZTNjNDg3ZTE2OWRjNjg=

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2011-2013 Dan Sosedoff.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/grooveshark.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.require_paths = ['lib']
   
-  s.add_development_dependency 'rspec',       '~> 2.6'
-  s.add_development_dependency 'rake',        '~> 0.9'
+  s.add_development_dependency 'rspec',       '~> 2.12'
+  s.add_development_dependency 'rake',        '~> 10.0'
   
   s.add_runtime_dependency     'json',        '>= 1.4.6'
   s.add_runtime_dependency     'rest-client', '>= 1.5.1'

data/lib/grooveshark.rb

@@ -5,7 +5,6 @@ require 'uuid'
 
 require 'grooveshark/utils'
 require 'grooveshark/errors'
-require 'grooveshark/request'
 require 'grooveshark/client'
 require 'grooveshark/user'
 require 'grooveshark/playlist'

data/lib/grooveshark/client.rb

@@ -1,50 +1,15 @@
 module Grooveshark
   class Client
-    include Grooveshark::Request
-    
     attr_accessor :session, :comm_token
     attr_reader :user, :comm_token_ttl, :country
   
-    def initialize(session=nil)
+    def initialize(params = {})
+      @ttl = params[:ttl] || 120 # 2 minutes
       @session, @country = get_session_and_country
       @uuid = UUID.new.generate.upcase
       get_comm_token
     end
     
-    protected
-
-    def get_session_and_country
-      response = RestClient.get('http://grooveshark.com')
-      session = response.headers[:set_cookie].to_s.scan(/PHPSESSID=([a-z\d]{32});/i).flatten.first
-      config_json = response.to_s.scan(/window.gsConfig = (\{.*?\});/).flatten.first
-      raise GeneralError, "gsConfig not found" if not config_json
-      config = JSON.parse(config_json)
-      [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)
-      @comm_token_ttl = Time.now.to_i
-    end
-    
-    # Sign method
-    def create_token(method)
-      rnd = get_random_hex_chars(6)
-      salt = get_method_salt(method)
-      plain = [method, @comm_token, salt, rnd].join(':')
-      hash = Digest::SHA1.hexdigest(plain)
-      "#{rnd}#{hash}"
-    end
-
-    def get_random_hex_chars(length)
-      chars = ('a'..'f').to_a | (0..9).to_a
-      (0...length).map { chars[rand(chars.length)] }.join
-    end
-    
-    public
-    
     # Authenticate user
     def login(user, password)
       data = request('authenticateUser', {:username => user, :password => password}, true)
@@ -124,10 +89,78 @@ module Grooveshark
       get_song_url_by_id(song.id)
     end
 
+    protected
+
+    def get_session_and_country
+      response = RestClient.get('http://grooveshark.com')
+      session = response.headers[:set_cookie].to_s.scan(/PHPSESSID=([a-z\d]{32});/i).flatten.first
+      config_json = response.to_s.scan(/window.gsConfig = (\{.*?\});/).flatten.first
+      raise GeneralError, "gsConfig not found" if not config_json
+      config = JSON.parse(config_json)
+      [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)
+      @comm_token_ttl = Time.now.to_i
+    end
+    
+    # Sign method
+    def create_token(method)
+      rnd = get_random_hex_chars(6)
+      salt = 'gooeyFlubber'
+      plain = [method, @comm_token, salt, rnd].join(':')
+      hash = Digest::SHA1.hexdigest(plain)
+      "#{rnd}#{hash}"
+    end
+
+    def get_random_hex_chars(length)
+      chars = ('a'..'f').to_a | (0..9).to_a
+      (0...length).map { chars[rand(chars.length)] }.join
+    end
+    
     private
 
-    def get_method_salt(method)
-      get_method_client(method) == 'jsqueue' ? 'closeButNoCigar' : 'breakfastBurritos'
+    # 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' => {
+          'client' => 'mobileshark',
+          'clientRevision' => '20120830',
+          'country' => @country,
+          'privacy' => 0,
+          'session' => @session,
+          'uuid' => @uuid
+        },
+        'method' => method,
+        '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
+        raise GeneralError, ex.message
+      end
+
+      data = JSON.parse(data)
+      data = data.normalize if data.kind_of?(Hash)
+
+      if data.key?('fault')
+        raise ApiError.new(data['fault'])
+      else
+        data['result']
+      end
+    end
+    
+    # Refresh communications token on ttl
+    def refresh_token
+      get_comm_token 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.7'
+  VERSION = '0.2.8'
 end

data/spec/client_spec.rb

@@ -26,6 +26,20 @@ describe 'Client' do
       @gs = Grooveshark::Client.new
       lambda { @gs.login('invlid_user_name', 'invalid_password') }.should raise_error Grooveshark::InvalidAuthentication
     end
+
+    it 'should obtain a new communication token on TTL expiration' do
+      @gs = Grooveshark::Client.new(:ttl => 1)
+      @tokens = []
+      
+      3.times do |i|
+        @gs.search_songs('Muse')
+        @tokens << @gs.comm_token
+        sleep 3
+      end
+      
+      @tokens.uniq!
+      @tokens.size.should == 3
+    end
   end
   
   context 'search' do
@@ -49,7 +63,7 @@ describe 'Client' do
   context 'download' do
     it 'should download without being banned' do
       gs = Grooveshark::Client.new
-      ten_minutes_later = Time.new + 15 * 60 # Usually IP is banned after about 10 minutes
+      ten_minutes_later = Time.new + 15 * 60 # Usually IP is banned after about 15 minutes
       while Time.new < ten_minutes_later do
         # Try with a short song (this one is about a minute long)
         song = gs.search_songs("Alan Reeves The Chase").first

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: grooveshark
 version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+  version: 0.2.8
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,6 +89,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - grooveshark.gemspec
@@ -107,47 +97,38 @@ files:
 - lib/grooveshark/client.rb
 - lib/grooveshark/errors.rb
 - lib/grooveshark/playlist.rb
-- lib/grooveshark/request.rb
 - lib/grooveshark/song.rb
 - lib/grooveshark/user.rb
 - lib/grooveshark/utils.rb
 - lib/grooveshark/version.rb
 - spec/client_spec.rb
 - spec/helper.rb
-- spec/request_spec.rb
 - spec/utils_spec.rb
 homepage: http://github.com/sosedoff/grooveshark
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 504227010873878309
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 504227010873878309
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Grooveshark API
 test_files:
 - spec/client_spec.rb
 - spec/helper.rb
-- spec/request_spec.rb
 - spec/utils_spec.rb
+has_rdoc: 

data/lib/grooveshark/request.rb

@@ -1,63 +0,0 @@
-module Grooveshark
-  module Request
-    TOKEN_TTL = 120 # 2 minutes
-    
-    # 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' => {
-          'client' => get_method_client(method),
-          'clientRevision' => get_method_client_revision(method),
-          'country' => @country,
-          'privacy' => 0,
-          'session' => @session,
-          'uuid' => @uuid
-        },
-        'method' => method,
-        '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
-        raise GeneralError, ex.message
-      end
-
-      data = JSON.parse(data)
-      data = data.normalize if data.kind_of?(Hash)
-
-      if data.key?('fault')
-        raise ApiError.new(data['fault'])
-      else
-        data['result']
-      end
-    end
-    
-    # Refresh communications token on ttl
-    def refresh_token
-      get_comm_token if Time.now.to_i - @comm_token_ttl > TOKEN_TTL
-    end
-
-    private
-
-    def get_method_client(method)
-      jsqueue_methods = [
-        'getStreamKeyFromSongIDEx', 
-        'addSongsToQueue', 
-        'markSongDownloadedEx', 
-        'markStreamKeyOver30Seconds', 
-        'markSongQueueSongPlayed',
-        'markSongComplete'
-      ]
-      jsqueue_methods.include?(method) ? 'jsqueue' : 'htmlshark'
-    end
-
-    def get_method_client_revision(method)
-      get_method_client(method) == 'jsqueue' ? '20120312.02' : '20120312'
-    end
-  end
-end

data/spec/request_spec.rb

@@ -1,25 +0,0 @@
-require File.expand_path("./helper", File.dirname(__FILE__))
-
-describe 'Request' do
-  module Grooveshark
-    module Request
-      # Override default ttl for tests
-      remove_const :TOKEN_TTL # Avoid the "already initialized constant" warning
-      TOKEN_TTL = 1
-    end
-  end
-  
-  # it 'should obtain a new communication token on TTL expiration' do
-  #   @gs = Grooveshark::Client.new
-  #   @tokens = []
-  #   
-  #   3.times do |i|
-  #     @gs.search_songs('Muse')
-  #     @tokens << @gs.comm_token
-  #     sleep 3
-  #   end
-  #   
-  #   @tokens.uniq!
-  #   @tokens.size.should == 3
-  # end
-end