soundcloud 0.2.4 → 0.2.5

data/lib/soundcloud.rb

@@ -4,13 +4,77 @@ require 'uri'
 
 class Soundcloud
   class ResponseError < HTTParty::ResponseError
-    def self.message(response)
+    def message
       error = response.parsed_response['error'] || response.parsed_response['errors']['error']
-      "HTTP status: #{response.code} error: #{error}"
+      "HTTP status: #{StatusCodes.interpret_status(response.code)} Error: #{error}"
     rescue
-      "HTTP status: #{response.code}"
+      "HTTP status: #{StatusCodes.interpret_status(response.code)}"
+    end
+
+    module StatusCodes
+      STATUS_CODES = {
+        100 => "Continue",
+        101 => "Switching Protocols",
+        102 => "Processing",
+
+        200 => "OK",
+        201 => "Created",
+        202 => "Accepted",
+        203 => "Non-Authoritative Information",
+        204 => "No Content",
+        205 => "Reset Content",
+        206 => "Partial Content",
+        207 => "Multi-Status",
+        226 => "IM Used",
+
+        300 => "Multiple Choices",
+        301 => "Moved Permanently",
+        302 => "Found",
+        303 => "See Other",
+        304 => "Not Modified",
+        305 => "Use Proxy",
+        307 => "Temporary Redirect",
+
+        400 => "Bad Request",
+        401 => "Unauthorized",
+        402 => "Payment Required",
+        403 => "Forbidden",
+        404 => "Not Found",
+        405 => "Method Not Allowed",
+        406 => "Not Acceptable",
+        407 => "Proxy Authentication Required",
+        408 => "Request Timeout",
+        409 => "Conflict",
+        410 => "Gone",
+        411 => "Length Required",
+        412 => "Precondition Failed",
+        413 => "Request Entity Too Large",
+        414 => "Request-URI Too Long",
+        415 => "Unsupported Media Type",
+        416 => "Requested Range Not Satisfiable",
+        417 => "Expectation Failed",
+        422 => "Unprocessable Entity",
+        423 => "Locked",
+        424 => "Failed Dependency",
+        426 => "Upgrade Required",
+
+        500 => "Internal Server Error",
+        501 => "Not Implemented",
+        502 => "Bad Gateway",
+        503 => "Service Unavailable",
+        504 => "Gateway Timeout",
+        505 => "HTTP Version Not Supported",
+        507 => "Insufficient Storage",
+        510 => "Not Extended"
+      }
+
+      def self.interpret_status(status)
+        "#{status} #{STATUS_CODES[status.to_i]}".strip
+      end
     end
   end
+  
+  class UnauthorizedResponseError < ResponseError; end
 
   include HTTMultiParty
   
@@ -101,12 +165,14 @@ private
   def handle_response(refreshing_enabled=true, &block)
     response = block.call
     if response && !response.success?
-      if response.code == 401 && refreshing_enabled
+      if response.code == 401 && refreshing_enabled && options_for_refresh_flow_present?
         exchange_token
         # TODO it should return the original
         handle_response(false, &block)
       else
-        raise ResponseError.new(response), ResponseError.message(response)
+        #raise ResponseError.new(response), ResponseError.message(response)
+        raise ResponseError.new(response)
+        #raise ResponseError.from(response)
       end
     elsif response.is_a? Hash
       HashResponseWrapper.new(response)

data/lib/soundcloud/version.rb

@@ -1,3 +1,3 @@
 class Soundcloud
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -2,7 +2,7 @@
 name: soundcloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency