soundcloud 0.1.8 → 0.1.9

data/README.md

@@ -106,6 +106,15 @@ The response is either a Hashie::Mash or an array of Hashie::Mashs. The mashs ex
 #### Soundcloud#client_id, client_secret, access_token, refresh_token, use_ssl?
 These methods are accessors for the stored options.
 
+### Soundcloud#on_exchange_token
+A Proc passed to on_exchange_token will be called each time a token was successfully exchanged or refreshed
+
+### Soundcloud#expires_at
+Returns a date based on the expires_in attribute returned from a token exchange.
+
+### Soundcloud#expired?
+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.

data/lib/soundcloud.rb

@@ -15,7 +15,8 @@ class Soundcloud
   AUTHORIZE_PATH        = '/connect'
   TOKEN_PATH            = '/oauth2/token'
   DEFAULT_OPTIONS       = {
-    :site => 'soundcloud.com'
+    :site              => 'soundcloud.com',
+    :on_exchange_token => lambda {}
   }
 
 
@@ -40,7 +41,12 @@ class Soundcloud
   def client_secret;  @options[:client_secret]; end
   def access_token;   @options[:access_token];  end
   def refresh_token;  @options[:refresh_token]; end
-  def redirect_uri;   @options[:redirect_uri]; end
+  def redirect_uri;   @options[:redirect_uri];  end
+  def expires_at;     @options[:expires_at];    end
+
+  def expired?
+    (expires_at.nil? || expires_at < Time.now)
+  end
 
   def use_ssl?; 
     !! @options[:use_ssl?] || access_token
@@ -72,9 +78,15 @@ class Soundcloud
       self.class.post("https://#{api_host}#{TOKEN_PATH}", :query => params)
     }
     @options.merge!(:access_token => response.access_token, :refresh_token => response.refresh_token)
+    @options[:expires_at] = Time.now + response.expires_in
+    @options[:on_exchange_token].call
     response
   end
-  
+
+  def on_exchange_token(&block)
+    store_options(:on_exchange_token => block)
+  end
+
 private
   def handle_response(refreshing_enabled=true, &block)
     response = block.call
@@ -101,6 +113,7 @@ private
     @options ||= DEFAULT_OPTIONS.dup
     @options.merge! options
   end
+  
 
   def construct_query_arguments(path_or_uri, options={})
     uri = URI.parse(path_or_uri)

data/lib/soundcloud/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soundcloud
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency