soundcloud 0.1.9 → 0.2.0

data/README.md

@@ -46,7 +46,7 @@ It is providing simple methods to handle authorization and to execute HTTP calls
     
     client.authorize_url(:redirect_uri => REDIRECT_URI)
     # => "https://soundcloud.com/connect?client_id=YOUR_CLIENT_ID&response_type=code&redirect_uri=http://host/redirect"
-    client.exchange_code(:redirect_uri => uri, :code => 'CODE')
+    client.exchange_token(:redirect_uri => uri, :code => 'CODE')
 
 #### OAuth2 refresh token flow, upload a track and print its link
     # register a new client which will exchange an existing refresh_token for an access_token
@@ -117,4 +117,4 @@ Will return true or false depending on if expires_at is in the past.
 
 #### Error Handling
 In case a request was not successful a Soundcloud::ResponseError will be raise.
-The original HTTParty response is available through Soundcloud::ResponseError#response.
+The original HTTParty response is available through Soundcloud::ResponseError#response.

data/lib/soundcloud.rb

@@ -5,9 +5,16 @@ require 'hashie'
 require 'uri'
 
 class Soundcloud
-  class ResponseError < HTTParty::ResponseError; end
+  class ResponseError < HTTParty::ResponseError
+    def self.message(response)
+      error = response.parsed_response['error'] || response.parsed_response['errors']['error']
+      "HTTP status: #{response.code} error: #{error}"
+    rescue
+      "HTTP status: #{response.code}"
+    end
+  end
+
   include HTTMultiParty
-  headers 'Accept' => 'application/json'
   
   # TODO fix when api is ready for client_id
   CLIENT_ID_PARAM_NAME  = :consumer_key
@@ -30,11 +37,11 @@ class Soundcloud
     raise ArgumentError, "At least a client_id or an access_token must be present" if client_id.nil? && access_token.nil?
   end
 
-  def get   (path, query={}, options={}); handle_response { self.class.get    *construct_query_arguments(path, options.merge(:query => query)) } end
-  def post  (path, query={}, options={}); handle_response { self.class.post   *construct_query_arguments(path, options.merge(:query => query)) } end
-  def put   (path, query={}, options={}); handle_response { self.class.put    *construct_query_arguments(path, options.merge(:query => query)) } end
-  def delete(path, query={}, options={}); handle_response { self.class.delete *construct_query_arguments(path, options.merge(:query => query)) } end
-  def head  (path, query={}, options={}); handle_response { self.class.head   *construct_query_arguments(path, options.merge(:query => query)) } end
+  def get   (path, query={}, options={}); handle_response { self.class.get     *construct_query_arguments(path, options.merge(:query => query)) } end
+  def post  (path, body={}, options={});  handle_response { self.class.post    *construct_query_arguments(path, options.merge(:body => body), :body) } end
+  def put   (path, body={}, options={});  handle_response { self.class.put     *construct_query_arguments(path, options.merge(:body => body), :body) } end
+  def delete(path, query={}, options={});  handle_response { self.class.delete *construct_query_arguments(path, options.merge(:query => query)) } end
+  def head  (path, query={}, options={}); handle_response { self.class.head    *construct_query_arguments(path, options.merge(:query => query)) } end
 
   # accessors for options
   def client_id;      @options[:client_id];     end
@@ -58,8 +65,11 @@ class Soundcloud
   def api_host; [API_SUBHOST, host].join('.'); end
 
   def authorize_url(options={})
+    display = options.delete(:display)
     store_options(options)
-    "https://#{host}#{AUTHORIZE_PATH}?response_type=code&client_id=#{client_id}&redirect_uri=#{URI.escape redirect_uri}"
+    url = "https://#{host}#{AUTHORIZE_PATH}?response_type=code_and_token&client_id=#{client_id}&redirect_uri=#{URI.escape redirect_uri}"
+    url << "&display=#{display}" if display
+    url
   end
   
   def exchange_token(options={})
@@ -91,12 +101,12 @@ private
   def handle_response(refreshing_enabled=true, &block)
     response = block.call
     if response && !response.success?
-      if response.code == 401 && response["error"] == "invalid_grant" && refreshing_enabled
+      if response.code == 401 && refreshing_enabled
         exchange_token
         # TODO it should return the original
         handle_response(false, &block)
       else
-        raise ResponseError.new(response), "HTTP Status #{response.code}"
+        raise ResponseError.new(response), ResponseError.message(response)
       end
     elsif response.is_a? Hash
       HashResponseWrapper.new(response)
@@ -115,18 +125,18 @@ private
   end
   
 
-  def construct_query_arguments(path_or_uri, options={})
+  def construct_query_arguments(path_or_uri, options={}, body_or_query=:query)
     uri = URI.parse(path_or_uri)
     path = uri.path
     
     scheme = use_ssl? ? 'https' : 'http'
     options = options.dup
-    options[:query] ||= {}
-
+    options[body_or_query] ||= {}
+    options[body_or_query][:format] = "json"
     if access_token
-      options[:query][:oauth_token] = access_token
+      options[body_or_query][:oauth_token] = access_token
     else
-      options[:query][CLIENT_ID_PARAM_NAME] = client_id
+      options[body_or_query][CLIENT_ID_PARAM_NAME] = client_id
     end
     [
       "#{scheme}://#{api_host}#{path}#{uri.query ? "?#{uri.query}" : ""}",

data/lib/soundcloud/hash_response_wrapper.rb

@@ -1,7 +1,9 @@
 class Soundcloud::HashResponseWrapper < Hashie::Mash
   attr_reader :response
   def initialize(response, *args)
-    super(response, *args)
+    super(response, *args) do |x| 
+      raise NoMethodError
+    end
     @response = response
   end
 end

data/lib/soundcloud/version.rb

@@ -1,3 +1,3 @@
 class Soundcloud
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -05:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
-        - 2
-        version: "0.2"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency