myspaceid-sdk 0.1.9 → 0.1.11

data/Rakefile

@@ -0,0 +1,66 @@
+require 'rake/testtask'
+require 'rake/packagetask'
+# require 'rake/rdoctask'
+require 'hoe'
+
+$LOAD_PATH.push('lib')
+require 'myspace.rb'
+
+Hoe.new('myspaceid-sdk', MySpace::VERSION) do |p|
+  p.author = 'Christopher B. Baker'
+  p.email = 'cbaker@myspace.com'
+  p.rubyforge_name = 'myspaceid-sdk'
+  p.extra_deps = ['ruby-openid', 'oauth', 'json']
+end
+
+desc "Generate manifest file programmatically"
+task :generate_manifest do
+  files = FileList[
+                   'README.txt', 'lib/**/*', 'test/**/*', 'samples/**/*'
+                  ].exclude(/db\/cstore|log\/|public\/doc|tmp/)
+  
+  File.rename('Manifest.txt', "Manifest-#{Time.now.to_i.to_s}.txt") if File.exists?('Manifest.txt')
+  File.open('Manifest.txt', 'w') do |f|
+    files.each do |name|
+      f.write(name + "\n")
+    end
+  end
+end
+
+# desc "Build the rubygem for the SDK"
+# task 'build-gem' => [] do
+#   sh %{gem build myspaceid-sdk.gemspec}
+# end
+
+# desc "Build the online documetation for the SDK"
+# task 'build-docs' => [] do
+#   sh %{rdoc --fmt html}
+# end
+
+desc "Run the unit tests"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = 'ts_alltests.rb'
+  t.verbose = true
+end
+# Rake::RDocTask.new('rdoc') do |t|
+#   t.rdoc_files.include('README', 'lib/**/*.rb')
+#   t.main = 'README'
+#   t.title = "MySpaceID SDK documentation"
+# end
+
+# rubyforge_project = 'myspaceid-sdk'
+# rubyforge_user = 'cbaker'
+# rubyforge_path = "/var/www/gforge-projects/#{rubyforge_project}/"
+# desc 'Upload documentation to RubyForge.'
+# task 'upload-docs' => ['rdoc'] do
+#   sh "scp -r html/* " + "#{rubyforge_user}@rubyforge.org:#{rubyforge_path}"
+# end
+
+desc "Generate doc files, but deal with source control as well"
+task 'generate-docs' do
+  sh %{git rm -rf doc}
+  sh %{rake docs}
+  sh %{git add doc}
+  sh %{git commmit -m 'autogenerated docs' doc}
+end

data/lib/myspace.rb

@@ -7,7 +7,7 @@ require 'logger'
 require 'patches'
 
 module MySpace
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end
 
 require 'myspace/end_point'

data/lib/myspace/end_point.rb

@@ -26,7 +26,7 @@ module MySpace
       @method = method
       @options = options.dup
       @options.delete(:v1_json)
-      @v1_json = options.detect(:v1_json)
+      @v1_json = options.include?(:v1_json)
     end
 
     def self.parse_path(path)

data/lib/myspace/myspace.rb

@@ -16,31 +16,38 @@ module MySpace
     # 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)
+
+    EndPoint.define(:user_info,                '/v1/user',                                     :get,    :v1_json)
+    EndPoint.define(:albums,                   '/v1/users/{user_id}/albums',                   :get,    :v1_json)
+    EndPoint.define(:album_info,               '/v1/users/{user_id}/albums/{album_id}',        :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(:friends_list,             '/v1/users/{user_id}/friendslist/{friend_ids}', :get,    :v1_json)
+    EndPoint.define(:mood_get,                 '/v1/users/{user_id}/mood',                     :get,    :v1_json)
+    EndPoint.define(:mood_put,                 '/v1/users/{user_id}/mood',                     :put)
+    EndPoint.define(:moods,                    '/v1/users/{user_id}/moods',                    :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)
+    EndPoint.define(:indicators,               '/v1/users/{user_id}/indicators',               :get,    :v1_json)
+
 
     attr_reader :consumer
     attr_accessor :http_logger
@@ -74,6 +81,7 @@ module MySpace
       @consumer = ::OAuth::Consumer.new(oauth_token_key,
                                         oauth_token_secret,
                                         :scheme => :query_string,
+                                        # :scheme => :header,
                                         :http_method => :get,
                                         :site => OAUTH_SITES[site],
                                         :request_token_path => OAUTH_REQUEST_TOKEN_URL,
@@ -164,6 +172,35 @@ module MySpace
       call_myspace_api(:albums, params.dup.update(:user_id => user_id, :v1_json => true))
     end
 
+    # Get the photo album description for user +user_id+ and album +album_id+
+    #
+    # {"photosUri"=>"http://api.myspace.com/v1/users/456073223/albums/40418/photos",
+    #  "photoCount"=>1,
+    #  "location"=>"",
+    #  "title"=>"My Photos",
+    #  "id"=>40418,
+    #  "defaultImage"=>
+    #    "http://c1.ac-images.myspacecdn.com/images02/45/m_f820313641924f0f90004932c8bc310c.jpg",
+    #  "privacy"=>"Everyone",
+    #  "user"=>
+    #    {"name"=>"Bob",
+    #    "uri"=>"http://api.myspace.com/v1/users/456073223",
+    #    "webUri"=>"http://www.myspace.com/bobvontestacount",
+    #    "largeImage"=>
+    #    "http://c1.ac-images.myspacecdn.com/images02/45/l_f820313641924f0f90004932c8bc310c.jpg",
+    #    "userType"=>"RegularUser",
+    #    "userId"=>456073223,
+    #    "image"=>
+    #    "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"},
+    #  "albumUri"=>"http://api.myspace.com/v1/users/456073223/albums/40418"}
+    def get_album_info(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)
+      call_myspace_api(:album_info, params.dup.update(:user_id => user_id, :album_id => album_id, :v1_json => true))
+    end
+
     # Get the photo descriptions for the photos of album +album_id+
     # for the user +user_id+:
     #
@@ -261,6 +298,19 @@ module MySpace
       call_myspace_api(:friendship, :user_id => user_id, :friend_ids => friend_ids.join(';'), :v1_json => true)
     end
 
+    # Gets the list of friends for the user +user_id+, for the friends
+    # in +friend_ids+.  Use this call if you only need information
+    # about a specific set of friends whose ids you already know.
+    def get_friends_list(user_id, *friend_ids)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      friend_ids.each do |friend_id|
+        friend_id = friend_id.to_s
+        validate_identifier(:friend_ids, friend_id)
+      end
+      call_myspace_api(:friends_list, :user_id => user_id, :friend_ids => friend_ids.join(';'), :v1_json => true)
+    end
+
     # Gets the mood of user +user_id+:
     #
     # 	{"mood"=>"tested",
@@ -280,7 +330,48 @@ module MySpace
     def get_mood(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      call_myspace_api(:mood, params.dup.update(:user_id => user_id, :v1_json => true))
+      call_myspace_api(:mood_get, params.dup.update(:user_id => user_id, :v1_json => true))
+    end
+
+    # Sets the mood of the user +user_id+ to +mood_id+, which must be
+    # a number from this list:
+    #
+    # http://wiki.developer.myspace.com/index.php?title=Myspace_mood_data_names_codes_images
+    def set_mood(user_id, mood_id)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      mood_id = mood_id.to_s
+      validate_identifier(:mood_id, mood_id)
+      call_myspace_api(:mood_put, :user_id => user_id, :body => {:mood => mood_id})
+    end
+
+    # Gets and caches the list of available moods for user +user_id+.
+    def moods(user_id)
+      @moods ||= {}
+      @moods[user_id] ||= get_moods(user_id)
+    end
+
+    # Gets the mood names available for user +user_id+.
+    def mood_names(user_id)
+      moods(user_id).collect do |mood|
+        mood['moodName']
+      end
+    end
+
+    # Given a +user_id+ and the name of a mood, returns the
+    # corresponding mood id
+    def mood_id(user_id, name)
+      moods(user_id).each do |mood|
+        return mood['moodId'] if mood['moodName'] == name
+      end
+    end
+
+    # Gets the list of available moods for user +user_id+.
+    def get_moods(user_id, params = {})
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      moods = call_myspace_api(:moods, params.dup.update(:user_id => user_id, :v1_json => true))
+      moods['moods']
     end
 
     # Gets the photo descriptions for the photos that belong to user +user_id+:
@@ -498,20 +589,25 @@ module MySpace
       call_myspace_api(:video, params.dup.update(:user_id => user_id, :video_id => video_id, :v1_json => true))
     end
 
+    # Gets the activity stream of user +user_id+
     def get_activities(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
       call_myspace_api(:activities, params.dup.update(:user_id => user_id))
     end
 
+    # Gets the activity streams of the friends of user +user_id+
     def get_friends_activities(user_id, params = {})
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
       call_myspace_api(:friends_activities, params.dup.update(:user_id => user_id))
     end
-
+    
+    # Gets the global application data.  This can be anything the
+    # application wants.  If you pass +keys+, only return data
+    # corresponding to the passed keys.
     def get_global_appdata(*keys)
-      appdata_to_hash do
+      MySpace.appdata_to_hash do
         if keys.length > 0
           call_myspace_api(:appdata_global_keys_get, :keys => keys.join(';'), :v1_json => true)
         else
@@ -520,16 +616,6 @@ module MySpace
       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)
 
@@ -544,7 +630,7 @@ module MySpace
     def get_user_appdata(user_id, *keys)
       user_id = user_id.to_s
       validate_identifier(:user_id, user_id)
-      appdata_to_hash do
+      MySpace.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
@@ -570,23 +656,42 @@ module MySpace
     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)
+      if keys.length > 0
+        call_myspace_api(:appdata_friends_keys_get, :user_id => user_id, :keys => keys.join(';'), :v1_json => true)
+      else
+        call_myspace_api(:appdata_friends_get, :user_id => user_id, :v1_json => true)
+      end.inject({}) do |hash, friend|
+        hash.update(friend['userid'].to_s => MySpace.appdata_to_hash(friend))
+      end
+    end
+
+    protected
+
+    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 appdata_to_hash(&block)
-      appdata = yield
+    def self.appdata_to_hash(appdata = {}, &block)
+      appdata = yield if block_given?
       return {} unless appdata['keyvaluecollection']
       appdata['keyvaluecollection'].inject({}) do |hash, entry|
         hash.update(entry['key'].to_sym => entry['value'])
       end
     end
 
+    public
+
+    def get_indicators(user_id)
+      user_id = user_id.to_s
+      validate_identifier(:user_id, user_id)
+      call_myspace_api(:indicators, :user_id => user_id, :v1_json => true)
+    end
     
     def call_myspace_api(name, params = {}, &block)
       params = params.dup
@@ -629,18 +734,6 @@ module MySpace
       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
 
     ID_REGEXP = /[0-9]+/ unless const_defined?('ID_REGEXP')
@@ -664,3 +757,4 @@ module MySpace
     end
   end
 end
+

data/samples/rails/sample/app/controllers/oauth_controller.rb

@@ -1,8 +1,6 @@
 require 'myspace'
 
-key_file = File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
-raise "You must create a consumer_key.rb file with your application credentials in it.  See #{File.expand_path(File.join(File.dirname(__FILE__), "/../../../../README"))} for more info." unless File.exists?(key_file)
-require key_file
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
 
 class OauthController < ApplicationController
   include ConsumerKey

data/samples/rails/sample/app/controllers/openid_controller.rb

@@ -7,9 +7,7 @@ require 'openid/store/filesystem'
 
 require 'myspace'
 
-key_file = File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
-raise "You must create a consumer_key.rb file with your application credentials in it.  See #{File.expand_path(File.join(File.dirname(__FILE__), "/../../../../README"))} for more info." unless File.exists?(key_file)
-require key_file
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
 
 class OpenidController < ApplicationController
   include ConsumerKey

data/samples/rails/sample/app/controllers/user_controller.rb

@@ -7,9 +7,7 @@ require 'openid/store/filesystem'
 
 require 'myspace'
 
-key_file = File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
-raise "You must create a consumer_key.rb file with your application credentials in it.  See #{File.expand_path(File.join(File.dirname(__FILE__), "/../../../../README"))} for more info." unless File.exists?(key_file)
-require key_file
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../consumer_key.rb"))
 
 class UserController < ApplicationController
   include ConsumerKey

data/test/myspace_test.rb

@@ -8,9 +8,11 @@ module MySpaceTest
   include TestData
 
   def setup
-    @myspace = MySpace::MySpace.new(CONSUMER_KEY, CONSUMER_SECRET,
-                                    :access_token => TOKEN, :access_token_secret => SECRET,
-                                    :logger => Logger.new($stdout))
+    @ms_offsite = MySpace::MySpace.new(OFFSITE_KEY, OFFSITE_SECRET,
+                                       :access_token => TOKEN, :access_token_secret => SECRET,
+                                       :logger => Logger.new($stdout))
+    @ms_onsite = MySpace::MySpace.new(ONSITE_KEY, ONSITE_SECRET, :application_type => MySpace::MySpace::APPLICATION_TYPE_ONSITE,
+                                      :logger => Logger.new($stdout))
   end
 
   class Tester
@@ -29,4 +31,5 @@ module MySpaceTest
     end
     assert(tester.passed)
   end
+
 end

data/test/tc_albums.rb

@@ -6,25 +6,28 @@ class TC_Albums < Test::Unit::TestCase
 
   def test_albums
     obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_albums(value)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_albums(value)
+        end
       end
+      assert_nothing_raised do
+        obj = ms.get_albums(USER_ID)
+      end
+      assert_equal(1, obj['count'])
+      albums = obj['albums']
+      assert_instance_of(Array, albums)
+      assert_equal(1, albums.length)
+      album = albums[0]
+      assert_instance_of(Hash, album)
+      album_id = album['id'].to_s
+      assert_equal('40418', album_id)
+      title = album['title']
+      assert_instance_of(String, title)
+      # oops this is culture specific
+      # assert_equal('My Photos', title)
     end
-    assert_nothing_raised do
-      obj = @myspace.get_albums(USER_ID)
-    end
-    assert_equal(1, obj['count'])
-    albums = obj['albums']
-    assert_instance_of(Array, albums)
-    assert_equal(1, albums.length)
-    album = albums[0]
-    assert_instance_of(Hash, album)
-    album_id = album['id'].to_s
-    assert_equal('40418', album_id)
-    title = album['title']
-    assert_instance_of(String, title)
-    assert_equal('My Photos', title)
   end
 
   # {"albums"=>
@@ -62,33 +65,35 @@ class TC_Albums < Test::Unit::TestCase
 
   def test_album
     obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_album(value, ALBUM_ID)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_album(value, ALBUM_ID)
+        end
       end
-    end
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_album(USER_ID, value)
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_album(USER_ID, value)
+        end
       end
+      assert_raise(MySpace::RestException) do 
+        obj = ms.get_album(USER_ID, "1234")
+      end
+      assert_nothing_raised do
+        obj = ms.get_album(USER_ID, ALBUM_ID)
+      end
+      assert_equal(1, obj['count'])
+      photos = obj['photos']
+      assert_instance_of(Array, photos)
+      assert_equal(1, photos.length)
+      photo = photos[0]
+      assert_instance_of(Hash, photo)
+      photo_id = photo['id'].to_s
+      assert_equal(PHOTO_ID, photo_id)
+      caption = photo['caption']
+      assert_instance_of(String, caption)
+      assert_equal('', caption)
     end
-    assert_raise(MySpace::RestException) do 
-      obj = @myspace.get_album(USER_ID, "1234")
-    end
-    assert_nothing_raised do
-      obj = @myspace.get_album(USER_ID, ALBUM_ID)
-    end
-    assert_equal(1, obj['count'])
-    photos = obj['photos']
-    assert_instance_of(Array, photos)
-    assert_equal(1, photos.length)
-    photo = photos[0]
-    assert_instance_of(Hash, photo)
-    photo_id = photo['id'].to_s
-    assert_equal(PHOTO_ID, photo_id)
-    caption = photo['caption']
-    assert_instance_of(String, caption)
-    assert_equal('', caption)
   end
 
   # {"photos"=>

data/test/tc_friends.rb

@@ -6,29 +6,34 @@ class TC_Friends < Test::Unit::TestCase
 
   def test_friends
     obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_friends(value)
-      end
-    end
     assert_raise(OAuth::Problem) do
-      obj = @myspace.get_friends("6221")
+      obj = @ms_offsite.get_friends("6221")
+    end
+    assert_raise(MySpace::PermissionDenied) do
+      obj = @ms_onsite.get_friends("6221")
     end
-    assert_nothing_raised do
-      obj = @myspace.get_friends(USER_ID)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_friends(value)
+        end
+      end
+      assert_nothing_raised do
+        obj = ms.get_friends(USER_ID)
+      end
+      count = obj['count']
+      assert_instance_of(Fixnum, count)
+      assert_equal(2, count)
+      friends = obj['Friends']
+      assert_instance_of(Array, friends)
+      assert_equal(count, friends.length)
+      tom = friends[0]
+      name = tom['name']
+      assert_instance_of(String, name)
+      assert_equal('Tom', name)
+      userid = tom['userId'].to_s
+      assert_equal("6221", userid)
     end
-    count = obj['count']
-    assert_instance_of(Fixnum, count)
-    assert_equal(1, count)
-    friends = obj['Friends']
-    assert_instance_of(Array, friends)
-    assert_equal(count, friends.length)
-    tom = friends[0]
-    name = tom['name']
-    assert_instance_of(String, name)
-    assert_equal('Tom', name)
-    userid = tom['userId'].to_s
-    assert_equal("6221", userid)
   end
   # {"topFriends"=>"http://api.myspace.com/v1/users/456073223/friends?list=top",
   #   "Friends"=>
@@ -53,30 +58,33 @@ class TC_Friends < Test::Unit::TestCase
 
   def test_friendship
     obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_friendship(USER_ID, value, "12341234", "456073223")
+    [@ms_offsite, @ms_onsite].each do |ms|
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_friendship(USER_ID, value, "12341234", "456073223")
+        end
       end
-    end
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_friendship(USER_ID, 6221, value, "456073223")
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_friendship(USER_ID, 6221, value, "456073223")
+        end
       end
-    end
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_friendship(USER_ID, 6221, "12341234", value)
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_friendship(USER_ID, 6221, "12341234", value)
+        end
       end
+
+      assert_nothing_raised do
+        obj = ms.get_friendship(USER_ID, 6221, "12341234", "456073223")
+      end
+      friendship = obj['friendship']
+      assert_instance_of(Array, friendship)
+      assert_equal(3, friendship.length)
+      assert_equal(true, friendship[0]['areFriends'])
+      assert_equal(false, friendship[1]['areFriends'])
+      assert_equal(true, friendship[2]['areFriends'])
     end
-    assert_nothing_raised do
-      obj = @myspace.get_friendship(USER_ID, 6221, "12341234", "456073223")
-    end
-    friendship = obj['friendship']
-    assert_instance_of(Array, friendship)
-    assert_equal(3, friendship.length)
-    assert_equal(true, friendship[0]['areFriends'])
-    assert_equal(false, friendship[1]['areFriends'])
-    assert_equal(true, friendship[2]['areFriends'])
   end
 
   # {"friendship"=>

data/test/tc_profile.rb

@@ -10,21 +10,22 @@ class TC_Profile < Test::Unit::TestCase
   def test_userid
     user_id = nil
     assert_nothing_raised do
-      user_id = @myspace.get_userid
+      user_id = @ms_offsite.get_userid
     end
     assert_instance_of(String, user_id)
     assert_equal(USER_ID, user_id)
   end
 
   def test_profile
+    [@ms_offsite, @ms_onsite].each do |ms|
     obj = nil
     BAD_IDS.each do |value|
       assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_profile(value)
+        obj = ms.get_profile(value)
       end
     end
     assert_nothing_raised do
-      obj = @myspace.get_profile(USER_ID)
+      obj = ms.get_profile(USER_ID)
     end
     assert_instance_of(Hash, obj)
     basic_profile = obj['basicprofile']
@@ -44,74 +45,63 @@ class TC_Profile < Test::Unit::TestCase
     image = basic_profile['image']
     assert_instance_of(String, image)
     assert_equal("http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg", image)
+    end
   end
 
   def test_mood
-    obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_mood(value)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      obj = nil
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_mood(value)
+        end
       end
+      assert_nothing_raised do
+        obj = ms.get_mood(USER_ID)
+      end
+      assert_instance_of(Hash, obj)
+      mood = obj['mood']
+      assert_instance_of(String, mood)
+      # assert_equal("tested", mood)
+      # mood_image = obj['moodImageUrl']
+      # assert_instance_of(String, mood_image)
+      # assert_equal("http://x.myspacecdn.com/images/blog/moods/iBrads/confused.gif", mood_image)
     end
-    assert_nothing_raised do
-      obj = @myspace.get_mood(USER_ID)
-    end
-    assert_instance_of(Hash, obj)
-    mood = obj['mood']
-    assert_instance_of(String, mood)
-    assert_equal("tested", mood)
-    mood_image = obj['moodImageUrl']
-    assert_instance_of(String, mood_image)
-    assert_equal("http://x.myspacecdn.com/images/blog/moods/iBrads/confused.gif", mood_image)
   end
 
   def test_status
-    obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_status(value)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      obj = nil
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_status(value)
+        end
       end
-    end
-    assert_nothing_raised do
-      obj = @myspace.get_status(USER_ID)
-    end
-    assert_instance_of(Hash, obj)
-    status = obj['status']
-    assert_instance_of(String, status)
-    # assert_equal("Testing", status)
-
-    assert_nothing_raised do
-      @myspace.set_status(USER_ID, "Updating!")
-    end
-
-    assert_passes_eventually do |result|
       assert_nothing_raised do
-        obj = @myspace.get_status(USER_ID)
+        obj = ms.get_status(USER_ID)
       end
       assert_instance_of(Hash, obj)
       status = obj['status']
       assert_instance_of(String, status)
-      result.passed = true if status == "Updating!"
-    end
+      # assert_equal("Testing", status)
 
-    # 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
+        ms.set_status(USER_ID, "Updating!")
+      end
 
-    assert_nothing_raised do
-      @myspace.set_status(USER_ID, "Testing")
+      assert_passes_eventually do |result|
+        assert_nothing_raised do
+          obj = ms.get_status(USER_ID)
+        end
+        assert_instance_of(Hash, obj)
+        status = obj['status']
+        assert_instance_of(String, status)
+        result.passed = true if status == "Updating!"
+      end
+
+      assert_nothing_raised do
+        ms.set_status(USER_ID, "Testing")
+      end
     end
   end
 end

data/test/tc_videos.rb

@@ -5,26 +5,28 @@ class TC_Videos < Test::Unit::TestCase
   include MySpaceTest
 
   def test_videos
-    obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_videos(value)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      obj = nil
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_videos(value)
+        end
       end
+      assert_nothing_raised do
+        obj = ms.get_videos(USER_ID)
+      end
+      assert_instance_of(Hash, obj)
+      assert_equal(1, obj['count'])
+      videos = obj['videos']
+      assert_instance_of(Array, videos)
+      assert_equal(1, videos.length)
+      video = videos[0]
+      video_id = video['id'].to_s
+      assert_equal(VIDEO_ID, video_id)
+      video_title = video['title']
+      assert_instance_of(String, video_title)
+      assert_equal(VIDEO_TITLE, video_title)
     end
-    assert_nothing_raised do
-      obj = @myspace.get_videos(USER_ID)
-    end
-    assert_instance_of(Hash, obj)
-    assert_equal(1, obj['count'])
-    videos = obj['videos']
-    assert_instance_of(Array, videos)
-    assert_equal(1, videos.length)
-    video = videos[0]
-    video_id = video['id'].to_s
-    assert_equal(VIDEO_ID, video_id)
-    video_title = video['title']
-    assert_instance_of(String, video_title)
-    assert_equal(VIDEO_TITLE, video_title)
   end
 
   # {"videos"=>
@@ -70,26 +72,28 @@ class TC_Videos < Test::Unit::TestCase
   #     "http://c1.ac-images.myspacecdn.com/images02/45/s_f820313641924f0f90004932c8bc310c.jpg"}}
 
   def test_video
-    obj = nil
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_video(value, VIDEO_ID)
+    [@ms_offsite, @ms_onsite].each do |ms|
+      obj = nil
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_video(value, VIDEO_ID)
+        end
       end
-    end
-    BAD_IDS.each do |value|
-      assert_raise(MySpace::BadIdentifier) do
-        obj = @myspace.get_video(USER_ID, value)
+      BAD_IDS.each do |value|
+        assert_raise(MySpace::BadIdentifier) do
+          obj = ms.get_video(USER_ID, value)
+        end
       end
+      assert_nothing_raised do
+        obj = ms.get_video(USER_ID, VIDEO_ID)
+      end
+      assert_instance_of(Hash, obj)
+      video_id = obj['id'].to_s
+      assert_equal(VIDEO_ID, video_id)
+      video_title = obj['title']
+      assert_instance_of(String, video_title)
+      assert_equal(VIDEO_TITLE, video_title)
     end
-    assert_nothing_raised do
-      obj = @myspace.get_video(USER_ID, VIDEO_ID)
-    end
-    assert_instance_of(Hash, obj)
-    video_id = obj['id'].to_s
-    assert_equal(VIDEO_ID, video_id)
-    video_title = obj['title']
-    assert_instance_of(String, video_title)
-    assert_equal(VIDEO_TITLE, video_title)
   end
 
   # {"totalrating"=>"0",

data/test/test_data.rb

@@ -1,9 +1,12 @@
 module TestData
-  CONSUMER_KEY    = '5796bcaafb2a4e48a94f4c1849bb2058' unless const_defined?('CONSUMER_KEY')
-  CONSUMER_SECRET = '5311c1fbe72b47298d4db5a098ce26d0' unless const_defined?('CONSUMER_SECRET')
+  OFFSITE_KEY    = '18bed0f4247a4f79bc9941bfed5b534c' unless const_defined?('OFFSITE_KEY')
+  OFFSITE_SECRET = '2e8ebdafbef844a5929086e659e4188c' unless const_defined?('OFFSITE_SECRET')
 
-  TOKEN = '2+mefZUAJvSniIj9Shj+PMvgCaUr1rPgIrFfvbj9pxOdOxNnUQoXGWP4jQk6OzS4Jv5x8hR1QdXqosT/HdhQSpEwEPdRSv2e6jWVwtMtEXk=' unless const_defined?('TOKEN')
-  SECRET = 'a062817544804c8da349e7621a8a26cb' unless const_defined?('SECRET')
+  ONSITE_KEY = 'http://perisphere.1939worldsfair.com/app.xml' unless const_defined?('ONSITE_KEY')
+  ONSITE_SECRET = 'eda0c62773234093bea92645eea0493d' unless const_defined?('ONSITE_SECRET')
+
+  TOKEN = 'iELpLIedJM1N1oz4tbsME4v8bbGiqE8D2DGs1MHvqM9386xJAiBYV7kAbPsKH1LfvMCDNUxk4IDl3KvtKzbqFEZAKW90DK1pkNml0cK1xuU=' unless const_defined?('TOKEN')
+  SECRET = '8805c751977a4b1d8bbf0d9913ae5840' unless const_defined?('SECRET')
 
   USER_ID = '456073223' unless const_defined?('USER_ID')
   ALBUM_ID = '40418' unless const_defined?('ALBUM_ID')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myspaceid-sdk
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors: 
 - Christopher B. Baker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-03 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ extra_rdoc_files:
 - README.txt
 - samples/rails/sample/public/robots.txt
 files: 
+- Rakefile
 - README.txt
 - lib/myspace.rb
 - lib/myspace
@@ -73,7 +74,6 @@ files:
 - test/tc_profile.rb
 - test/myspace_test.rb
 - test/tc_videos.rb
-- test/data.rb
 - test/ts_alltests.rb
 - test/tc_friends.rb
 - test/tc_albums.rb

data/test/data.rb

@@ -1,8 +0,0 @@
-module TestData
-  CONSUMER_KEY    = '5796bcaafb2a4e48a94f4c1849bb2058' unless const_defined?('CONSUMER_KEY')
-  CONSUMER_SECRET = '5311c1fbe72b47298d4db5a098ce26d0' unless const_defined?('CONSUMER_SECRET')
-
-  TOKEN = 'BFKvhXYYsrP88LvZ+Yi3qJ2syRnUkwRUB2wfWL9jROL+MFVWOXSZfg7pi37DlCSkYoHtxLiapKMQRMXFh4mvJi9ze3t9lvKAMm85WMKPka0=' unless const_defined?('TOKEN')
-  SECRET = 'a062817544804c8da349e7621a8a26cb' unless const_defined?('SECRET')
-  USER_ID = '456073223' unless const_defined?('USER_ID')
-end