myspaceid-sdk 0.1.8 → 0.1.9

data/{README → README.txt}

@@ -1,3 +1,9 @@
+= MySpaceID SDK
+
+* http://myspaceid-sdk.rubyforge.org/
+
+== DESCRIPTION:
+
 MySpaceID lets your users log on using their MySpace account info,
 after which their MySpaceID data becomes available; that is, your web
 servers will be able to communicate with our web servers and request
@@ -28,3 +34,6 @@ Documentation
     * Ruby SDK Documentation Summary: samples/rails/README
     * Ruby SDK - API Documentation: http://myspaceid-ruby-sdk.googlecode.com/svn/trunk/doc/index.html
 
+== LICENSE:
+
+MIT/X Consortium

data/lib/myspace.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'oauth/consumer'
+require 'oauth'
 require 'openid/consumer'
 require 'json'
 require 'logger'
@@ -7,9 +7,11 @@ require 'logger'
 require 'patches'
 
 module MySpace
+  VERSION = '0.1.9'
 end
 
+require 'myspace/end_point'
 require 'myspace/myspace'
 require 'myspace/exceptions'
-require 'myspace/oauth'
+require 'myspace/oauth_request'
 

data/lib/myspace/end_point.rb

@@ -0,0 +1,77 @@
+module MySpace
+  class EndPoint
+    attr_reader :method
+
+    @@registry = {}
+    # Registers a new EndPoint named +name+.
+    #
+    # +path+ is the path on server which may include variables in braces, e.g.
+    #
+    #   '/v1/users/{user_id}/profile'
+    #
+    # In this case, when you call +compute_path+ for this +EndPoint+,
+    # you must include +user_id+ in +params+, which will be
+    # substituted into the url.
+    def self.define(name, path, method, *options)
+      @@registry[name] = EndPoint.new(path, method, options)
+    end
+
+    # Returns the EndPoint named +name+.
+    def self.find(name)
+      return @@registry[name]
+    end
+
+    def initialize(path, method = :get, options = [])
+      @components = EndPoint.parse_path(path)
+      @method = method
+      @options = options.dup
+      @options.delete(:v1_json)
+      @v1_json = options.detect(:v1_json)
+    end
+
+    def self.parse_path(path)
+      # parse the path string looking for {var} to substitute
+      fragments = []
+      pos = 0
+      while pos < path.length
+        lbrace = path.index('{', pos)
+        unless lbrace
+          fragments.push(path[pos, path.length - pos])
+          break
+        end
+        rbrace = path.index('}', lbrace)
+        raise "unmatched left brace in '#{path}'" unless rbrace
+        fragments.push(path[pos, lbrace - pos])
+        var = path[lbrace + 1, rbrace - lbrace - 1].to_sym
+        fragments.push(var)
+        pos = rbrace + 1
+      end
+
+      fragments
+    end
+
+    # Computes the path to the EndPoint by substituting parameters
+    # from +params+ into the path.
+    #
+    # WARNING: This function DESTRUCTIVELY modifies the +params+ hash
+    # that you pass to it.  This is normally what you want, since you
+    # don't want to substitute a parameter into the path and also pass
+    # it in the query string, but make sure to make a copy first if
+    # you're just passing in parameters from another caller.
+    def compute_path(params)
+      path = @components.inject("") do |result, cur|
+        if cur.class == String
+          result + cur
+        elsif cur.class == Symbol
+          val = params.delete(cur)
+          raise "Required parameter '#{cur}' omitted" unless val
+          result + val
+        else
+          raise "Bad path component: #{cur}"
+        end
+      end
+      path << '.json' if @v1_json && params[:v1_json]
+      path
+    end
+  end
+end

data/lib/myspace/exceptions.rb

@@ -1,7 +1,11 @@
 module MySpace
+  # Parent class of our local exceptions
   class MySpaceException < Exception
   end
 
+  # You tried to pass an invalid value as a parameter to a REST call.
+  # The REST error responses are not very elucidating, so we try to
+  # catch these before sending them off.
   class BadIdentifier < MySpaceException
     attr_reader :parameter, :identifier
     def initialize(parameter, identifier)
@@ -10,6 +14,7 @@ module MySpace
     end
   end
 
+  # A REST call failed for some reason.
   class RestException < MySpaceException
     attr_reader :code, :message, :url
     def initialize(code, message, url)
@@ -23,9 +28,16 @@ module MySpace
     end
   end
 
+  # A REST call failed because the caller doesn't have permission to
+  # call it.
   class PermissionDenied < RestException
     def to_s
       "#<PermissionDenied loading '#{url}'>"
     end
   end
+
+  # A REST call timed out.  Should probably just try again.
+  class TimeoutException < Interrupt
+    attr_accessor :url, :timeout
+  end
 end

data/lib/myspace/myspace.rb

@@ -13,21 +13,34 @@ module MySpace
     OAUTH_AUTHORIZATION_URL = '/authorize'      unless const_defined?('OAUTH_AUTHORIZATION_URL')
     OAUTH_ACCESS_TOKEN_URL  = '/access_token'   unless const_defined?('OAUTH_ACCESS_TOKEN_URL')
 
-    API_USERINFO_URL   			= '/v1/user.json'                        unless const_defined?('API_USERINFO_URL')
-    API_ALBUMS_URL     			= '/v1/users/%s/albums.json'             unless const_defined?('API_ALBUMS_URL')
-    API_ALBUM_URL      			= '/v1/users/%s/albums/%s/photos.json'   unless const_defined?('API_ALBUM_URL')
-    API_FRIENDS_URL    			= '/v1/users/%s/friends.json'            unless const_defined?('API_FRIENDS_URL')
-    API_FRIENDSHIP_URL 			= '/v1/users/%s/friends/%s.json'         unless const_defined?('API_FRIENDSHIP_URL')
-    API_MOOD_URL       			= '/v1/users/%s/mood.json'               unless const_defined?('API_MOOD_URL')
-    API_PHOTOS_URL     			= '/v1/users/%s/photos.json'             unless const_defined?('API_PHOTOS_URL')
-    API_PHOTO_URL      			= '/v1/users/%s/photos/%s.json'          unless const_defined?('API_PHOTO_URL')
-    API_PROFILE_URL    			= '/v1/users/%s/profile.json'            unless const_defined?('API_PROFILE_URL')
-    API_STATUS_URL     			= '/v1/users/%s/status.json'             unless const_defined?('API_STATUS_URL')
-    API_STATUS_PUT_URL 			= '/v1/users/%s/status'                  unless const_defined?('API_STATUS_PUT_URL')
-    API_VIDEOS_URL     			= '/v1/users/%s/videos.json'             unless const_defined?('API_VIDEOS_URL')
-    API_VIDEO_URL      			= '/v1/users/%s/videos/%s.json'          unless const_defined?('API_VIDEO_URL')
-    API_ACTIVITIES_URL          = '/v1/users/%s/activities.atom'         unless const_defined?('API_ACTIVITIES_URL')
-    API_FRIENDS_ACTIVITIES_URL  = '/v1/users/%s/friends/activities.atom' unless const_defined?('API_FRIENDS_ACTIVITIES_URL')
+    # tests regularly timeout at 2 seconds
+    TIMEOUT_SECS = 3 unless const_defined?('TIMEOUT_SECS')
+
+    EndPoint.define(:user_info, '/v1/user', :get, :v1_json)
+    EndPoint.define(:albums, '/v1/users/{user_id}/albums', :get, :v1_json)
+    EndPoint.define(:album, '/v1/users/{user_id}/albums/{album_id}/photos', :get, :v1_json)
+    EndPoint.define(:friends, '/v1/users/{user_id}/friends', :get, :v1_json)
+    EndPoint.define(:friendship, '/v1/users/{user_id}/friends/{friend_ids}', :get, :v1_json)
+    EndPoint.define(:mood, '/v1/users/{user_id}/mood', :get, :v1_json)
+    EndPoint.define(:photos, '/v1/users/{user_id}/photos', :get, :v1_json)
+    EndPoint.define(:photo, '/v1/users/{user_id}/photos/{photo_id}', :get, :v1_json)
+    EndPoint.define(:profile, '/v1/users/{user_id}/profile', :get, :v1_json)
+    EndPoint.define(:status_get, '/v1/users/{user_id}/status', :get, :v1_json)
+    EndPoint.define(:status_put, '/v1/users/{user_id}/status', :put)
+    EndPoint.define(:videos, '/v1/users/{user_id}/videos', :get, :v1_json)
+    EndPoint.define(:video, '/v1/users/{user_id}/videos/{video_id}', :get, :v1_json)
+    EndPoint.define(:activities, '/v1/users/{user_id}/activities.atom', :get)
+    EndPoint.define(:friends_activities, '/v1/users/{user_id}/friends/activities.atom', :get)
+    EndPoint.define(:appdata_global_get, '/v1/appdata/global', :get, :v1_json)
+    EndPoint.define(:appdata_global_keys_get, '/v1/appdata/global/{keys}', :get, :v1_json)
+    EndPoint.define(:appdata_global_put, '/v1/appdata/global', :put)
+    EndPoint.define(:appdata_global_delete, '/v1/appdata/global/{keys}', :delete)
+    EndPoint.define(:appdata_user_get, '/v1/users/{user_id}/appdata', :get, :v1_json)
+    EndPoint.define(:appdata_user_keys_get, '/v1/users/{user_id}/appdata/{keys}', :get, :v1_json)
+    EndPoint.define(:appdata_user_put, '/v1/users/{user_id}/appdata', :put)
+    EndPoint.define(:appdata_user_delete, '/v1/users/{user_id}/appdata/{keys}', :delete)
+    EndPoint.define(:appdata_friends_get, '/v1/users/{user_id}/friends/appdata', :get, :v1_json)
+    EndPoint.define(:appdata_friends_keys_get, '/v1/users/{user_id}/friends/appdata/{keys}', :get, :v1_json)
 
     attr_reader :consumer
     attr_accessor :http_logger
@@ -107,7 +120,7 @@ module MySpace
 
     # Get the user id of the currently logged in user.
     def get_userid()
-      user_info = call_myspace_api_json(API_USERINFO_URL)
+      user_info = call_myspace_api(:user_info, :v1_json => true)
       user_info['userId'].to_s
     end
 
@@ -148,8 +161,7 @@ module MySpace
     def get_albums(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_ALBUMS_URL, user_id)
-      call_myspace_api_json(url, :get, params)
+      call_myspace_api(:albums, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Get the photo descriptions for the photos of album +album_id+
@@ -187,13 +199,12 @@ module MySpace
     # 	    "userId"=>456073223,
     # 	    "image"=>
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"}}
-    def get_album(user_id, album_id)
+    def get_album(user_id, album_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
       album_id = album_id.to_s
       validate_identifier(:album_id, album_id)
-      url = sprintf(API_ALBUM_URL, user_id, album_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:album, params.dup.update(:user_id => user_id, :album_id => album_id, :v1_json => true))
     end
 
     # Gets the list of friends for the user +user_id+:
@@ -221,8 +232,7 @@ module MySpace
     def get_friends(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_FRIENDS_URL, user_id)
-      call_myspace_api_json(url, :get, params)
+      call_myspace_api(:friends, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Tests whether user +user_id+ is friends with one or more other users:
@@ -248,8 +258,7 @@ module MySpace
         friend_id = friend_id.to_s
         validate_identifier(:friend_ids, friend_id)
       end
-      url = sprintf(API_FRIENDSHIP_URL, user_id, friend_ids.join(';'))
-      call_myspace_api_json(url)
+      call_myspace_api(:friendship, :user_id => user_id, :friend_ids => friend_ids.join(';'), :v1_json => true)
     end
 
     # Gets the mood of user +user_id+:
@@ -268,11 +277,10 @@ module MySpace
     # 	    "userId"=>456073223,
     # 	    "image"=>
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"}}
-    def get_mood(user_id)
+    def get_mood(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_MOOD_URL, user_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:mood, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Gets the photo descriptions for the photos that belong to user +user_id+:
@@ -311,8 +319,7 @@ module MySpace
     def get_photos(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_PHOTOS_URL, user_id)
-      call_myspace_api_json(url, :get, params)
+      call_myspace_api(:photos, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Gets the photo description for photo +photo_id+ for user +user_id+:
@@ -336,13 +343,12 @@ module MySpace
     # 	    "userId"=>456073223,
     # 	    "image"=>
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"}}
-    def get_photo(user_id, photo_id)
+    def get_photo(user_id, photo_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
       photo_id = photo_id.to_s
       validate_identifier(:photo_id, photo_id)
-      url = sprintf(API_PHOTO_URL, user_id, photo_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:photo, params.dup.update(:user_id => user_id, :photo_id => photo_id, :v1_json => true))
     end
 
     # Gets the profile info for user +user_id+:
@@ -371,8 +377,7 @@ module MySpace
     def get_profile(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_PROFILE_URL, user_id)
-      call_myspace_api_json(url, :get, params)
+      call_myspace_api(:profile, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Gets the status of user +user_id+:
@@ -392,11 +397,17 @@ module MySpace
     # 	    "image"=>
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"},
     # 	  "status"=>"Testing"}
-    def get_status(user_id)
+    def get_status(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_STATUS_URL, user_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:status_get, params.dup.update(:user_id => user_id, :v1_json => true))
+    end
+
+    # Sets the status of the user +user_id+
+    def set_status(user_id, status)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      call_myspace_api(:status_put, :user_id => user_id, :body => {:status => status})
     end
 
     # Gets the video descriptions for the videos of user +user_id+:
@@ -442,11 +453,10 @@ module MySpace
     # 	    "userId"=>456073223,
     # 	    "image"=>
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"}}
-    def get_videos(user_id)
+    def get_videos(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_VIDEOS_URL, user_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:videos, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
     # Gets the video description for the video +video_id+ of user +user_id+:
@@ -480,65 +490,156 @@ module MySpace
     # 	    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"},
     # 	  "totalvotes"=>"0",
     # 	  "videoUri"=>"http://api.myspace.com/v1/users/456073223/videos/53551799"}
-    def get_video(user_id, video_id)
+    def get_video(user_id, video_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
       video_id = video_id.to_s
       validate_identifier(:video_id, video_id)
-      url = sprintf(API_VIDEO_URL, user_id, video_id)
-      call_myspace_api_json(url)
+      call_myspace_api(:video, params.dup.update(:user_id => user_id, :video_id => video_id, :v1_json => true))
     end
 
-    def get_activities(user_id)
+    def get_activities(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_ACTIVITIES_URL, user_id)
-      call_myspace_api_xml(url)
+      call_myspace_api(:activities, params.dup.update(:user_id => user_id))
     end
 
-    def get_friends_activities(user_id)
+    def get_friends_activities(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_FRIENDS_ACTIVITIES_URL, user_id)
-      call_myspace_api_xml(url)
+      call_myspace_api(:friends_activities, params.dup.update(:user_id => user_id))
     end
 
-    def set_status(user_id, status)
+    def get_global_appdata(*keys)
+      appdata_to_hash do
+        if keys.length > 0
+          call_myspace_api(:appdata_global_keys_get, :keys => keys.join(';'), :v1_json => true)
+        else
+          call_myspace_api(:appdata_global_get, :v1_json => true)
+        end
+      end
+    end
+
+    def self.remove_null_values(hash)
+      hash.keys.inject([]) do |nulls, key|
+        unless hash[key]
+          hash.delete(key)
+          nulls << key
+        end
+        nulls
+      end
+    end
+
+    def set_global_appdata(params = {})
+      deletes = MySpace.remove_null_values(params)
+
+      call_myspace_api(:appdata_global_put, :body => params) if params.length > 0
+      call_myspace_api(:appdata_global_delete, :keys => deletes.join(';')) if deletes.length > 0
+    end
+
+    def clear_global_appdata(*keys)
+      call_myspace_api(:appdata_global_delete, :keys => keys.join(';'))
+    end
+
+    def get_user_appdata(user_id, *keys)
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      url = sprintf(API_STATUS_PUT_URL, user_id)
-      call_myspace_api_xml(url, :put, {:body => {:status => status}})
+      appdata_to_hash do
+        if keys.length > 0
+          call_myspace_api(:appdata_user_keys_get, :user_id => user_id, :keys => keys.join(';'), :v1_json => true)
+        else
+          call_myspace_api(:appdata_user_get, :user_id => user_id, :v1_json => true)
+        end
+      end
     end
 
-    def call_myspace_api(url, method = :get, params = {}, &block)
+    def set_user_appdata(user_id, params = {})
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      deletes = MySpace.remove_null_values(params)
+      call_myspace_api(:appdata_user_put, :user_id => user_id, :body => params) if params.length > 0
+      call_myspace_api(:appdata_user_delete, :user_id => user_id, :keys => deletes.join(';')) if deletes.length > 0
+    end
+
+    def clear_user_appdata(user_id, *keys)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      call_myspace_api(:appdata_user_delete, :user_id => user_id, :keys => keys.join(';'))
+    end
+
+    def get_user_friends_appdata(user_id, *keys)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      appdata_to_hash do
+        if keys.length > 0
+          call_myspace_api(:appdata_friends_get, :user_id => user_id, :v1_json => true)
+        else
+          call_myspace_api(:appdata_friends_keys_get, :user_id => user_id, :keys => keys.join(';'), :v1_json => true)
+        end
+      end
+    end
+
+    def appdata_to_hash(&block)
+      appdata = yield
+      return {} unless appdata['keyvaluecollection']
+      appdata['keyvaluecollection'].inject({}) do |hash, entry|
+        hash.update(entry['key'].to_sym => entry['value'])
+      end
+    end
+
+    
+    def call_myspace_api(name, params = {}, &block)
       params = params.dup
+      ep = EndPoint.find(name)
+      url = ep.compute_path(params)
+      timeout = params.delete(:timeout) || TIMEOUT_SECS
       body = params.delete(:body)
       headers = params.delete(:headers)
+      params.delete(:v1_json)
       query_str = params.collect do |key, value|
         CGI.escape(key.to_s) + '=' + CGI.escape(value.to_s)
       end.join('&')
 
       url << '?' + query_str if query_str.length > 0
 
+      resp = nil
       @http_logger.info("sending: '#{url}'") if @http_logger
-      resp = @access_token.request(method, url, body, headers)
+      begin
+        Timeout::timeout(timeout, TimeoutException) do
+          resp = @access_token.request(ep.method, url, body, headers)
+        end
+      rescue TimeoutException => e
+        e.timeout = timeout
+        e.url = url
+        raise e
+      end
       @http_logger.info("received: '#{resp.code}': '#{resp.body}'") if @http_logger
 
       validate_response(resp, url)
-      yield(resp.body)
-    end
 
-    def call_myspace_api_json(url, method = :get, params = {})
-      call_myspace_api(url, method, params) do |body|
-        JSON::parse(body)
+      content_type = resp['content-type']
+      if content_type
+        if content_type =~ /json/
+          return JSON::parse(resp.body)
+        elsif content_type =~ /xml/
+          return REXML::Document.new(resp.body)
+        end
+        
+        raise "unknown content type: #{content_type}"
       end
     end
 
-    def call_myspace_api_xml(url, method = :get, params = {})
-      call_myspace_api(url, method, params) do |body|
-        REXML::Document.new(body)
-      end
-    end
+    # def call_myspace_api_json(url, method = :get, params = {})
+    #   call_myspace_api(url, method, params) do |body|
+    #     JSON::parse(body)
+    #   end
+    # end
+
+    # def call_myspace_api_xml(url, method = :get, params = {})
+    #   call_myspace_api(url, method, params) do |body|
+    #     REXML::Document.new(body)
+    #   end
+    # end
 
     protected
 

data/test/myspace_test.rb

@@ -8,6 +8,25 @@ module MySpaceTest
   include TestData
 
   def setup
-    @myspace = MySpace::MySpace.new(CONSUMER_KEY, CONSUMER_SECRET, :access_token => TOKEN, :access_token_secret => SECRET)
+    @myspace = MySpace::MySpace.new(CONSUMER_KEY, CONSUMER_SECRET,
+                                    :access_token => TOKEN, :access_token_secret => SECRET,
+                                    :logger => Logger.new($stdout))
+  end
+
+  class Tester
+    attr_accessor :passed
+    def initialize(default = false)
+      @passed = default
+    end
+  end
+
+  def assert_passes_eventually(max_iterations = 10, sleep_time = 0.1, &block)
+    tester = Tester.new
+    max_iterations.times do
+      yield(tester)
+      break if tester.passed
+      sleep(sleep_time)
+    end
+    assert(tester.passed)
   end
 end

data/test/tc_albums.rb

@@ -85,7 +85,7 @@ class TC_Albums < Test::Unit::TestCase
     photo = photos[0]
     assert_instance_of(Hash, photo)
     photo_id = photo['id'].to_s
-    assert_equal('100809', photo_id)
+    assert_equal(PHOTO_ID, photo_id)
     caption = photo['caption']
     assert_instance_of(String, caption)
     assert_equal('', caption)

data/test/tc_friends.rb

@@ -11,7 +11,7 @@ class TC_Friends < Test::Unit::TestCase
         obj = @myspace.get_friends(value)
       end
     end
-    assert_raise(MySpace::PermissionDenied) do
+    assert_raise(OAuth::Problem) do
       obj = @myspace.get_friends("6221")
     end
     assert_nothing_raised do

data/test/tc_profile.rb

@@ -78,27 +78,37 @@ class TC_Profile < Test::Unit::TestCase
     assert_instance_of(Hash, obj)
     status = obj['status']
     assert_instance_of(String, status)
-    assert_equal("Testing", status)
+    # assert_equal("Testing", status)
 
     assert_nothing_raised do
       @myspace.set_status(USER_ID, "Updating!")
     end
 
-    passed = false
-    10.times do
+    assert_passes_eventually do |result|
       assert_nothing_raised do
         obj = @myspace.get_status(USER_ID)
       end
       assert_instance_of(Hash, obj)
       status = obj['status']
       assert_instance_of(String, status)
-      if status == "Updating!"
-        passed = true
-        break
-      end
-      sleep(0.1)
+      result.passed = true if status == "Updating!"
     end
-    assert(passed)
+
+    # passed = false
+    # 10.times do
+    #   assert_nothing_raised do
+    #     obj = @myspace.get_status(USER_ID)
+    #   end
+    #   assert_instance_of(Hash, obj)
+    #   status = obj['status']
+    #   assert_instance_of(String, status)
+    #   if status == "Updating!"
+    #     passed = true
+    #     break
+    #   end
+    #   sleep(0.1)
+    # end
+    # assert(passed)
 
     assert_nothing_raised do
       @myspace.set_status(USER_ID, "Testing")

data/test/test_data.rb

@@ -7,6 +7,7 @@ module TestData
 
   USER_ID = '456073223' unless const_defined?('USER_ID')
   ALBUM_ID = '40418' unless const_defined?('ALBUM_ID')
+  PHOTO_ID = '100809' unless const_defined?('PHOTO_ID')
   VIDEO_ID = '53551799' unless const_defined?('VIDEO_ID')
   VIDEO_TITLE = '110403na' unless const_defined?('VIDEO_TITLE')
 

data/test/ts_alltests.rb

@@ -4,4 +4,5 @@ require 'tc_profile'
 require 'tc_friends'
 require 'tc_albums'
 require 'tc_videos'
+require 'tc_appdata'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myspaceid-sdk
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Christopher B. Baker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -07:00
+date: 2009-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,21 +42,33 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: The MySpaceID SDK provides a library for implementing MySpaceID and accessing MySpace users account data.
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.11.0
+    version: 
+description: "MySpaceID lets your users log on using their MySpace account info, after which their MySpaceID data becomes available; that is, your web servers will be able to communicate with our web servers and request user data.  This SDK project contains examples of the base API code necessary to make signed requests against the MySpaceID REST API.  To use the MySpaceID API, you first need to register on the MySpace Developer Site, create an app, and obtain a consumer key and secret. Information about these procedures, and about MySpaceID in general, is available at the MySpaceID Developer Wiki:  http://wiki.developer.myspace.com/index.php?title=Category:MySpaceID  The MySpaceID Ruby SDK enables you to work with MySpace data using the OpenStack (OpenID, OAuth etc) and the MySpace REST APIs via easy-to-use high level interfaces.  The best way to implement your own application is to take an existing sample and customize it.  Working Examples in this SDK:  * OAuth - make signed requests * OpenID + OAuth Hybrid - delegated login, and making signed requests   Documentation  * Ruby SDK Documentation Summary: samples/rails/README * Ruby SDK - API Documentation: http://myspaceid-ruby-sdk.googlecode.com/svn/trunk/doc/index.html"
 email: cbaker@myspace.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.txt
+- samples/rails/sample/public/robots.txt
 files: 
-- README
+- README.txt
 - lib/myspace.rb
 - lib/myspace
+- lib/myspace/oauth_request.rb
 - lib/myspace/myspace.rb
+- lib/myspace/end_point.rb
 - lib/myspace/exceptions.rb
-- lib/myspace/oauth.rb
 - lib/patches.rb
 - test/tc_profile.rb
 - test/myspace_test.rb
@@ -143,7 +155,6 @@ files:
 - samples/rails/sample/public/stylesheets/openid.css
 - samples/rails/sample/public/stylesheets/base.css
 - samples/rails/sample/public/stylesheets/main.css
-- samples/rails/sample/public/doc
 - samples/rails/sample/test
 - samples/rails/sample/test/test_helper.rb
 - samples/rails/sample/test/performance
@@ -154,6 +165,7 @@ files:
 - samples/rails/sample/test/functional/user_controller_test.rb
 - samples/rails/sample/db
 - samples/rails/sample/db/development.sqlite3
+- samples/rails/sample/log
 - samples/rails/sample/config
 - samples/rails/sample/config/locales
 - samples/rails/sample/config/locales/en.yml
@@ -193,10 +205,11 @@ files:
 - samples/rails/consumer_key.rb-copyme
 - samples/rails/README
 has_rdoc: true
-homepage: http://developer.myspace.com/
+homepage: http://myspaceid-sdk.rubyforge.org/
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -217,6 +230,6 @@ rubyforge_project: myspaceid-sdk
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Official SDK for MySpaceID and MySpace Data Accessibility.
-test_files: []
-
+summary: MySpaceID lets your users log on using their MySpace account info, after which their MySpaceID data becomes available; that is, your web servers will be able to communicate with our web servers and request user data
+test_files: 
+- test/test_data.rb