RubyGems - flickrie - Versions diffs - 0.5.2 → 0.6.0 - Mend

flickrie 0.5.2 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

data/.gitignore +0 -1
data/CHANGELOG.md +10 -0
data/Gemfile +3 -2
data/Rakefile +7 -2
data/flickrie.gemspec +3 -0
data/lib/flickrie/api_methods.rb +5 -0
data/lib/flickrie/client.rb +17 -4
data/lib/flickrie/location.rb +23 -50
data/lib/flickrie/media/exif.rb +4 -0
data/lib/flickrie/media/tag.rb +4 -0
data/lib/flickrie/media/ticket.rb +4 -0
data/lib/flickrie/media/visibility.rb +10 -6
data/lib/flickrie/media.rb +7 -70
data/lib/flickrie/media_count.rb +4 -0
data/lib/flickrie/oauth.rb +5 -3
data/lib/flickrie/set.rb +5 -21
data/lib/flickrie/upload_client.rb +4 -2
data/lib/flickrie/user.rb +4 -1
data/lib/flickrie/version.rb +1 -1
data/lib/flickrie/video.rb +0 -13
data/test/error_test.rb +20 -0
data/test/instance_test.rb +13 -14
data/test/license_test.rb +7 -13
data/test/location_test.rb +11 -2
data/test/media_count_test.rb +20 -12
data/test/media_test.rb +319 -311
data/test/oauth_test.rb +17 -18
data/test/photo_test.rb +78 -60
data/test/set_test.rb +72 -63
data/test/{test.rb → test_helper.rb} +7 -0
data/test/user_test.rb +43 -34
data/test/vcr_cassettes/error/code.yml +1165 -0
data/test/vcr_cassettes/instance/calling_api_methods.yml +182 -0
data/test/vcr_cassettes/license/get_licenses.yml +73 -0
data/test/vcr_cassettes/location/square_brackets.yml +85 -0
data/test/vcr_cassettes/media/delete.yml +1380 -0
data/test/vcr_cassettes/media/from_contacts.yml +155 -0
data/test/vcr_cassettes/media/from_set.yml +276 -0
data/test/vcr_cassettes/media/from_user.yml +275 -0
data/test/vcr_cassettes/media/get_context.yml +73 -0
data/test/vcr_cassettes/media/get_info.yml +167 -0
data/test/vcr_cassettes/media/remove_tag.yml +264 -0
data/test/vcr_cassettes/media/replace.yml +2252 -0
data/test/vcr_cassettes/media/search.yml +275 -0
data/test/vcr_cassettes/media/tags.yml +346 -0
data/test/vcr_cassettes/media_count/get.yml +135 -0
data/test/vcr_cassettes/media_count/square_brackets.yml +69 -0
data/test/vcr_cassettes/oauth/tokens.yml +400 -0
data/test/vcr_cassettes/photo/asynchronous_upload.yml +1693 -0
data/test/vcr_cassettes/photo/from_set.yml +273 -0
data/test/vcr_cassettes/photo/from_user.yml +275 -0
data/test/vcr_cassettes/photo/get_exif.yml +239 -0
data/test/vcr_cassettes/photo/get_sizes.yml +147 -0
data/test/vcr_cassettes/photo/other_api_calls.yml +506 -0
data/test/vcr_cassettes/photo/search.yml +271 -0
data/test/vcr_cassettes/photo/square_brackets.yml +85 -0
data/test/vcr_cassettes/photo/upload.yml +1229 -0
data/test/vcr_cassettes/set/from_user.yml +477 -0
data/test/vcr_cassettes/set/get_info.yml +951 -0
data/test/vcr_cassettes/set/square_brackets.yml +73 -0
data/test/vcr_cassettes/user/find_by_email_or_username.yml +135 -0
data/test/vcr_cassettes/user/get_info.yml +151 -0
data/test/vcr_cassettes/user/square_brackets.yml +77 -0
data/test/vcr_cassettes/video/get_exif.yml +135 -0
data/test/vcr_cassettes/video/get_info.yml +86 -0
data/test/vcr_cassettes/video/get_sizes.yml +151 -0
data/test/vcr_cassettes/video/other_api_calls.yml +643 -0
data/test/vcr_cassettes/video/square_brackets.yml +86 -0
data/test/vcr_cassettes/video/upload.yml +308 -0
data/test/video_test.rb +66 -53
metadata +123 -12

data/test/media_test.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'test'
 Flickrie::Photo.instance_eval do
   def public_new(*args)
@@ -20,296 +19,220 @@ class MediaTest < Test::Unit::TestCase
       url_sq url_q url_t url_s url_n url_m url_z url_c url_l url_o]
   end
-  def test_get_media_info
-    get_info_assertions(Flickrie.get_media_info(@media_id))
-    get_info_assertions(Flickrie::Photo.public_new('id' => @media_id.to_s).get_info)
+  def test_get_info
+    VCR.use_cassette 'media/get_info' do
+      [Flickrie.get_media_info(@media_id),
+       Flickrie::Photo.public_new('id' => @media_id.to_s).get_info].
+        each do |media|
+          assert_equal '6946979188', media.id
+          assert_equal '25bb44852b', media.secret
+          assert_equal '7049', media.server
+          assert_equal 8, media.farm
+          assert_equal 'IMG_0796', media.title
+          assert_equal 'luka', media.tags.join(' ')
+          assert_equal @user_nsid, media.tags.first.author.nsid
+          assert_equal 'luka', media.tags.first.raw
+          assert_equal false, media.tags.first.machine_tag?
+          assert_equal 2, media.views_count
+          assert_equal 1, media.comments_count
+          assert_equal '0', media.license.id
+          assert_equal 0, media.safety_level
+          assert_equal 90, media.rotation
+          assert_equal 'Test', media.description
+          assert_not_nil media.url
+          # Time
+          assert_instance_of Time, media.uploaded_at
+          assert_instance_of Time, media.updated_at
+          assert_instance_of Time, media.taken_at
+          assert_equal 0, media.taken_at_granularity
+          assert_instance_of Time, media.posted_at
+          # Owner
+          assert_equal '67131352@N04', media.owner.nsid
+          assert_equal 'Janko Marohnić', media.owner.username
+          assert_equal 'Janko Marohnić', media.owner.real_name
+          assert_equal 'Zagreb, Croatia', media.owner.location
+          assert_equal '5464', media.owner.icon_server
+          assert_equal 6, media.owner.icon_farm
+          refute media.owner.buddy_icon_url.empty?
+          # Predicates
+          assert_equal true, media.visibility.public?
+          assert_equal false, media.visibility.friends?
+          assert_equal false, media.visibility.family?
+          assert_equal nil, media.visibility.contacts?
+          assert_equal true, media.can_comment?
+          assert_equal true, media.can_add_meta?
+          assert_equal true, media.can_everyone_comment?
+          assert_equal false, media.can_everyone_add_meta?
+          assert_equal true, media.can_download?
+          assert_equal true, media.can_blog?
+          assert_equal true, media.can_print?
+          assert_equal false, media.can_share?
+          assert_equal false, media.has_people?
+          assert_equal true, media.safe?
+          assert_equal false, media.moderate?
+          assert_equal false, media.restricted?
+          assert_equal false, media.favorite?
+          assert_equal true, media.geo_permissions.public?
+          assert_equal false, media.geo_permissions.contacts?
+          assert_equal false, media.geo_permissions.friends?
+          assert_equal false, media.geo_permissions.family?
+          # Notes
+          note = media.notes.first
+          assert_equal '72157629487842968', note.id
+          assert_equal '67131352@N04', note.author.nsid
+          assert_equal 'Janko Marohnić', note.author.username
+          assert_equal [316, 0], note.coordinates
+          assert_equal [59, 50], [note.width, note.height]
+          assert_equal 'Test', note.content
+          # Location
+          location = media.location
+          assert_equal 45.807258, location.latitude
+          assert_equal 15.967599, location.longitude
+          assert_equal '11', location.accuracy
+          assert_equal '0', location.context
+          assert_equal nil, location.neighbourhood
+          assert_equal 'Zagreb', location.locality.name
+          assert_equal '00j4IylZV7scWik', location.locality.place_id
+          assert_equal '851128', location.locality.woeid
+          assert_equal 'Zagreb', location.county.name
+          assert_equal '306dHrhQV7o6jm.ZUQ', location.county.place_id
+          assert_equal '15022257', location.county.woeid
+          assert_equal 'Grad Zagreb', location.region.name
+          assert_equal 'Js1DU.pTUrpBCIKhVw', location.region.place_id
+          assert_equal '20070170', location.region.woeid
+          assert_equal 'Croatia', location.country.name
+          assert_equal 'FunRCI5TUb6a6soTyw', location.country.place_id
+          assert_equal '23424843', location.country.woeid
+          assert_equal '00j4IylZV7scWik', location.place_id
+          assert_equal '851128', location.woeid
+        end
+    end
   end
-  def get_info_assertions(media)
-    assert_equal '6946979188', media.id
-    assert_equal '25bb44852b', media.secret
-    assert_equal '7049', media.server
-    assert_equal 8, media.farm
-    assert_equal 'IMG_0796', media.title
-    assert_equal 'luka', media.tags.join(' ')
-    assert_equal @user_nsid, media.tags.first.author.nsid
-    assert_equal 'luka', media.tags.first.raw
-    assert_equal false, media.tags.first.machine_tag?
-    assert_equal 2, media.views_count
-    assert_equal 1, media.comments_count
-    assert_equal '0', media.license.id
-    assert_equal 0, media.safety_level
-    assert_equal 90, media.rotation
-    assert_equal 'Test', media.description
-    assert_not_nil media.url
-    # Time
-    assert_instance_of Time, media.uploaded_at
-    assert_instance_of Time, media.updated_at
-    assert_instance_of Time, media.taken_at
-    assert_equal 0, media.taken_at_granularity
-    assert_instance_of Time, media.posted_at
-    # Owner
-    assert_equal '67131352@N04', media.owner.nsid
-    assert_equal 'Janko Marohnić', media.owner.username
-    assert_equal 'Janko Marohnić', media.owner.real_name
-    assert_equal 'Zagreb, Croatia', media.owner.location
-    assert_equal '5464', media.owner.icon_server
-    assert_equal 6, media.owner.icon_farm
-    refute media.owner.buddy_icon_url.empty?
-    # Predicates
-    assert_equal true, media.visibility.public?
-    assert_equal false, media.visibility.friends?
-    assert_equal false, media.visibility.family?
-    assert_equal nil, media.visibility.contacts?
-    assert_equal true, media.can_comment?
-    assert_equal true, media.can_add_meta?
-    assert_equal true, media.can_everyone_comment?
-    assert_equal false, media.can_everyone_add_meta?
-    assert_equal true, media.can_download?
-    assert_equal true, media.can_blog?
-    assert_equal true, media.can_print?
-    assert_equal false, media.can_share?
-    assert_equal false, media.has_people?
-    assert_equal true, media.safe?
-    assert_equal false, media.moderate?
-    assert_equal false, media.restricted?
-    assert_equal false, media.favorite?
-    assert_equal true, media.geo_permissions.public?
-    assert_equal false, media.geo_permissions.contacts?
-    assert_equal false, media.geo_permissions.friends?
-    assert_equal false, media.geo_permissions.family?
-    # Notes
-    note = media.notes.first
-    assert_equal '72157629487842968', note.id
-    assert_equal '67131352@N04', note.author.nsid
-    assert_equal 'Janko Marohnić', note.author.username
-    assert_equal [316, 0], note.coordinates
-    assert_equal [59, 50], [note.width, note.height]
-    assert_equal 'Test', note.content
-    # Location
-    location = media.location
-    assert_equal 45.807258, location.latitude
-    assert_equal 15.967599, location.longitude
-    assert_equal '11', location.accuracy
-    assert_equal '0', location.context
-    assert_equal nil, location.neighbourhood
-    assert_equal 'Zagreb', location.locality.name
-    assert_equal '00j4IylZV7scWik', location.locality.place_id
-    assert_equal '851128', location.locality.woeid
-    assert_equal 'Zagreb', location.county.name
-    assert_equal '306dHrhQV7o6jm.ZUQ', location.county.place_id
-    assert_equal '15022257', location.county.woeid
-    assert_equal 'Grad Zagreb', location.region.name
-    assert_equal 'Js1DU.pTUrpBCIKhVw', location.region.place_id
-    assert_equal '20070170', location.region.woeid
-    assert_equal 'Croatia', location.country.name
-    assert_equal 'FunRCI5TUb6a6soTyw', location.country.place_id
-    assert_equal '23424843', location.country.woeid
-    assert_equal '00j4IylZV7scWik', location.place_id
-    assert_equal '851128', location.woeid
-  end
+  def test_from_set
+    VCR.use_cassette 'media/from_set' do
+      media = Flickrie.media_from_set(@set_id, :extras => @all_extras).
+        find { |media| media.id.to_i == @media_id }
-  def test_media_from_set
-    media = Flickrie.media_from_set(@set_id, :extras => @all_extras).
-      find { |media| media.id.to_i == @media_id }
-    assert_equal '6946979188', media.id
-    assert_equal '25bb44852b', media.secret
-    assert_equal '7049', media.server
-    assert_equal 8, media.farm
-    assert_equal 'IMG_0796', media.title
-    assert_equal 'luka', media.tags.join(' ')
-    assert_equal '', media.machine_tags.join(' ')
-    assert_equal 2, media.views_count
-    assert_equal '0', media.license.id
-    assert_equal true, media.primary?
-    assert_not_nil media.url
-    assert_equal 'ready', media.media_status
-    # Time
-    assert_instance_of Time, media.uploaded_at
-    assert_instance_of Time, media.updated_at
-    assert_instance_of Time, media.taken_at
-    assert_equal 0, media.taken_at_granularity
-    # Location
-    assert_equal 45.807258, media.location.latitude
-    assert_equal 15.967599, media.location.longitude
-    assert_equal '11', media.location.accuracy
-    assert_equal '0', media.location.context.to_s
-    assert_equal '00j4IylZV7scWik', media.location.place_id
-    assert_equal '851128', media.location.woeid
-    assert_equal true, media.geo_permissions.public?
-    assert_equal false, media.geo_permissions.contacts?
-    assert_equal false, media.geo_permissions.friends?
-    assert_equal false, media.geo_permissions.family?
-    # Owner
-    assert_equal '67131352@N04', media.owner.nsid
-    assert_equal 'Janko Marohnić', media.owner.username
-    assert_equal '5464', media.owner.icon_server
-    assert_equal 6, media.owner.icon_farm
-    refute media.owner.buddy_icon_url.empty?
-  end
+      assert_equal '6946979188', media.id
+      assert_equal '25bb44852b', media.secret
+      assert_equal '7049', media.server
+      assert_equal 8, media.farm
+      assert_equal 'IMG_0796', media.title
+      assert_equal 'luka', media.tags.join(' ')
+      assert_equal '', media.machine_tags.join(' ')
+      assert_equal 2, media.views_count
+      assert_equal '0', media.license.id
+      assert_equal true, media.primary?
+      assert_not_nil media.url
+      assert_equal 'ready', media.media_status
-  def test_public_media_from_user
-    media = Flickrie.public_media_from_user(@user_nsid, :extras => @all_extras).
-      find { |media| media.id.to_i == @media_id }
-    assert_equal '6946979188', media.id
-    assert_equal '25bb44852b', media.secret
-    assert_equal '7049', media.server
-    assert_equal 8, media.farm
-    assert_equal 'IMG_0796', media.title
-    assert_equal 'luka', media.tags.join(' ')
-    assert_equal '', media.machine_tags.join(' ')
-    assert_equal 2, media.views_count
-    assert_equal '0', media.license.id
-    assert_not_nil media.url
-    assert_equal 'ready', media.media_status
-    # Time
-    assert_instance_of Time, media.uploaded_at
-    assert_instance_of Time, media.updated_at
-    assert_instance_of Time, media.taken_at
-    assert_equal 0, media.taken_at_granularity
-    # Location
-    assert_equal 45.807258, media.location.latitude
-    assert_equal 15.967599, media.location.longitude
-    assert_equal '11', media.location.accuracy
-    assert_equal '0', media.location.context.to_s
-    assert_equal '00j4IylZV7scWik', media.location.place_id
-    assert_equal '851128', media.location.woeid
-    assert_equal true, media.geo_permissions.public?
-    assert_equal false, media.geo_permissions.contacts?
-    assert_equal false, media.geo_permissions.friends?
-    assert_equal false, media.geo_permissions.family?
-    # Owner
-    assert_equal '67131352@N04', media.owner.nsid
-    assert_equal 'Janko Marohnić', media.owner.username
-    assert_equal '5464', media.owner.icon_server
-    assert_equal 6, media.owner.icon_farm
-    refute media.owner.buddy_icon_url.empty?
-    # Visibility (This is the difference from Flickrie.media_from_set)
-    assert_equal true, media.visibility.public?
-    assert_equal false, media.visibility.friends?
-    assert_equal false, media.visibility.family?
-    assert_equal nil, media.visibility.contacts?
-  end
+      # Time
+      assert_instance_of Time, media.uploaded_at
+      assert_instance_of Time, media.updated_at
+      assert_instance_of Time, media.taken_at
+      assert_equal 0, media.taken_at_granularity
-  def test_search_media
-    media = Flickrie.search_media(:user_id => @user_nsid, :extras => @all_extras).
-      find { |media| media.id.to_i == @media_id }
-    assert_equal '6946979188', media.id
-    assert_equal '25bb44852b', media.secret
-    assert_equal '7049', media.server
-    assert_equal 8, media.farm
-    assert_equal 'IMG_0796', media.title
-    assert_equal 'luka', media.tags.join(' ')
-    assert_equal '', media.machine_tags.join(' ')
-    assert_equal 2, media.views_count
-    assert_equal '0', media.license.id
-    assert_not_nil media.url
-    assert_equal 'ready', media.media_status
-    # Time
-    assert_instance_of Time, media.uploaded_at
-    assert_instance_of Time, media.updated_at
-    assert_instance_of Time, media.taken_at
-    assert_equal 0, media.taken_at_granularity
-    # Location
-    assert_equal 45.807258, media.location.latitude
-    assert_equal 15.967599, media.location.longitude
-    assert_equal '11', media.location.accuracy
-    assert_equal '0', media.location.context.to_s
-    assert_equal '00j4IylZV7scWik', media.location.place_id
-    assert_equal '851128', media.location.woeid
-    assert_equal true, media.geo_permissions.public?
-    assert_equal false, media.geo_permissions.contacts?
-    assert_equal false, media.geo_permissions.friends?
-    assert_equal false, media.geo_permissions.family?
-    # Owner
-    assert_equal '67131352@N04', media.owner.nsid
-    assert_equal 'Janko Marohnić', media.owner.username
-    assert_equal '5464', media.owner.icon_server
-    assert_equal 6, media.owner.icon_farm
-    refute media.owner.buddy_icon_url.empty?
-    # Visibility (This is the difference from Flickrie.media_from_set)
-    assert_equal true, media.visibility.public?
-    assert_equal false, media.visibility.friends?
-    assert_equal false, media.visibility.family?
-    assert_equal nil, media.visibility.contacts?
-  end
+      # Location
+      assert_equal 45.807258, media.location.latitude
+      assert_equal 15.967599, media.location.longitude
+      assert_equal '11', media.location.accuracy
+      assert_equal '0', media.location.context.to_s
+      assert_equal '00j4IylZV7scWik', media.location.place_id
+      assert_equal '851128', media.location.woeid
+      assert_equal true, media.geo_permissions.public?
+      assert_equal false, media.geo_permissions.contacts?
+      assert_equal false, media.geo_permissions.friends?
+      assert_equal false, media.geo_permissions.family?
-  def test_add_media_tags
-    media = Flickrie.get_media_info(@media_id)
-    tags_before_change = media.tags.join(' ')
-    Flickrie.add_media_tags(@media_id, "janko")
-    media.get_info
-    assert_equal [tags_before_change, "janko"].join(' '),
-      media.tags.join(' ')
-    tag_id = media.tags.find { |tag| tag.content == "janko" }.id
-    Flickrie.remove_media_tag(tag_id)
+      # Owner
+      assert_equal '67131352@N04', media.owner.nsid
+      assert_equal 'Janko Marohnić', media.owner.username
+      assert_equal '5464', media.owner.icon_server
+      assert_equal 6, media.owner.icon_farm
+      refute media.owner.buddy_icon_url.empty?
+    end
   end
-  def test_remove_media_tag
-    Flickrie.add_media_tags(@media_id, "janko")
-    media = Flickrie.get_media_info(@media_id)
-    tags_before_change = media.tags.join(' ')
-    tag_id = media.tags.find { |tag| tag.content == "janko" }.id
-    Flickrie.remove_media_tag(tag_id)
-    media.get_info
-    assert_equal media.tags.join(' '), tags_before_change.chomp("janko").rstrip
-  end
+  def test_public_from_user
+    VCR.use_cassette 'media/from_user' do
+      media = Flickrie.public_media_from_user(@user_nsid, :extras => @all_extras).
+        find { |media| media.id.to_i == @media_id }
+      assert_equal '6946979188', media.id
+      assert_equal '25bb44852b', media.secret
+      assert_equal '7049', media.server
+      assert_equal 8, media.farm
+      assert_equal 'IMG_0796', media.title
+      assert_equal 'luka', media.tags.join(' ')
+      assert_equal '', media.machine_tags.join(' ')
+      assert_equal 2, media.views_count
+      assert_equal '0', media.license.id
+      assert_not_nil media.url
+      assert_equal 'ready', media.media_status
+      # Time
+      assert_instance_of Time, media.uploaded_at
+      assert_instance_of Time, media.updated_at
+      assert_instance_of Time, media.taken_at
+      assert_equal 0, media.taken_at_granularity
+      # Location
+      assert_equal 45.807258, media.location.latitude
+      assert_equal 15.967599, media.location.longitude
+      assert_equal '11', media.location.accuracy
+      assert_equal '0', media.location.context.to_s
+      assert_equal '00j4IylZV7scWik', media.location.place_id
+      assert_equal '851128', media.location.woeid
+      assert_equal true, media.geo_permissions.public?
+      assert_equal false, media.geo_permissions.contacts?
+      assert_equal false, media.geo_permissions.friends?
+      assert_equal false, media.geo_permissions.family?
+      # Owner
+      assert_equal '67131352@N04', media.owner.nsid
+      assert_equal 'Janko Marohnić', media.owner.username
+      assert_equal '5464', media.owner.icon_server
+      assert_equal 6, media.owner.icon_farm
+      refute media.owner.buddy_icon_url.empty?
-  def test_delete_media
-    media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
-    media_id = Flickrie.upload(media_path)
-    assert_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
-    Flickrie.delete_media(media_id)
-    refute_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
+      # Visibility (This is the difference from Flickrie.media_from_set)
+      assert_equal true, media.visibility.public?
+      assert_equal false, media.visibility.friends?
+      assert_equal false, media.visibility.family?
+      assert_equal nil, media.visibility.contacts?
+    end
   end
-  def test_media_from_contacts
-    medias = [
-      Flickrie.media_from_contacts(
-        :include_self => 1, :single_photo => 1, :extras => @all_extras).first,
-      Flickrie.public_media_from_user_contacts(@user_nsid,
-        :include_self => 1, :single_photo => 1, :extras => @all_extras).first
-    ]
-    medias.each do |media|
-      assert_equal '7093101501', media.id
-      assert_equal '9337f28800', media.secret
-      assert_equal '7090', media.server
+  def test_search
+    VCR.use_cassette 'media/search' do
+      media = Flickrie.search_media(:user_id => @user_nsid, :extras => @all_extras).
+        find { |media| media.id.to_i == @media_id }
+      assert_equal '6946979188', media.id
+      assert_equal '25bb44852b', media.secret
+      assert_equal '7049', media.server
       assert_equal 8, media.farm
-      assert_equal 'IMG_0917', media.title
-      assert_equal '', media.tags.join(' ')
+      assert_equal 'IMG_0796', media.title
+      assert_equal 'luka', media.tags.join(' ')
       assert_equal '', media.machine_tags.join(' ')
-      assert_equal 0, media.views_count
+      assert_equal 2, media.views_count
       assert_equal '0', media.license.id
       assert_not_nil media.url
       assert_equal 'ready', media.media_status
@@ -321,7 +244,16 @@ class MediaTest < Test::Unit::TestCase
       assert_equal 0, media.taken_at_granularity
       # Location
-      assert_nil media.location
+      assert_equal 45.807258, media.location.latitude
+      assert_equal 15.967599, media.location.longitude
+      assert_equal '11', media.location.accuracy
+      assert_equal '0', media.location.context.to_s
+      assert_equal '00j4IylZV7scWik', media.location.place_id
+      assert_equal '851128', media.location.woeid
+      assert_equal true, media.geo_permissions.public?
+      assert_equal false, media.geo_permissions.contacts?
+      assert_equal false, media.geo_permissions.friends?
+      assert_equal false, media.geo_permissions.family?
       # Owner
       assert_equal '67131352@N04', media.owner.nsid
@@ -338,42 +270,118 @@ class MediaTest < Test::Unit::TestCase
     end
   end
-  def test_get_media_context
-    context = Flickrie.get_media_context(@media_id)
-    assert_equal 98, context['count']
-    previous_media = context['prevphoto']
-    assert_equal '6946978706', previous_media.id
-    assert_equal 'b38270bbd6', previous_media.secret
-    assert_equal '7216', previous_media.server
-    assert_equal 8, previous_media.farm
-    assert_equal 'IMG_0795', previous_media.title
-    refute previous_media.url.empty?
-    assert_equal '0', previous_media.license.id
-    assert_equal false, previous_media.faved?
-    next_media = context['nextphoto']
-    assert_equal '6946979704', next_media.id
-    assert_equal '74513ff732', next_media.secret
-    assert_equal '7234', next_media.server
-    assert_equal 8, next_media.farm
-    assert_equal 'IMG_0797', next_media.title
-    refute next_media.url.empty?
-    assert_equal '0', next_media.license.id
-    assert_equal false, next_media.faved?
+  def test_tags
+    VCR.use_cassette 'media/tags' do
+      media = Flickrie.get_media_info(@media_id)
+      tags_before_change = media.tags.join(' ')
+      Flickrie.add_media_tags(@media_id, "janko")
+      media.get_info
+      assert_equal [tags_before_change, "janko"].join(' '),
+        media.tags.join(' ')
+      tag_id = media.tags.find { |tag| tag.content == "janko" }.id
+      Flickrie.remove_media_tag(tag_id)
+      media.get_info
+      assert_equal tags_before_change, media.tags.join(' ')
+    end
   end
-  def test_media_replace
-    media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
-    begin
+  def test_delete
+    VCR.use_cassette 'media/delete' do
+      media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
       media_id = Flickrie.upload(media_path)
-      Flickrie.replace(media_path, media_id)
-      flunk
-    rescue => exception
-      assert_equal "Not a pro account", exception.message
-    ensure
+      assert_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
       Flickrie.delete_media(media_id)
+      refute_includes Flickrie.public_media_from_user(@user_nsid).map(&:id), media_id
+    end
+  end
+  def test_from_contacts
+    VCR.use_cassette 'media/from_contacts' do
+      medias = [
+        Flickrie.media_from_contacts(
+          :include_self => 1, :single_photo => 1, :extras => @all_extras).first,
+        Flickrie.public_media_from_user_contacts(@user_nsid,
+          :include_self => 1, :single_photo => 1, :extras => @all_extras).first
+      ]
+      medias.each do |media|
+        assert_equal '7093101501', media.id
+        assert_equal '9337f28800', media.secret
+        assert_equal '7090', media.server
+        assert_equal 8, media.farm
+        assert_equal 'IMG_0917', media.title
+        assert_equal '', media.tags.join(' ')
+        assert_equal '', media.machine_tags.join(' ')
+        assert_equal 0, media.views_count
+        assert_equal '0', media.license.id
+        assert_not_nil media.url
+        assert_equal 'ready', media.media_status
+        # Time
+        assert_instance_of Time, media.uploaded_at
+        assert_instance_of Time, media.updated_at
+        assert_instance_of Time, media.taken_at
+        assert_equal 0, media.taken_at_granularity
+        # Location
+        assert_nil media.location
+        # Owner
+        assert_equal '67131352@N04', media.owner.nsid
+        assert_equal 'Janko Marohnić', media.owner.username
+        assert_equal '5464', media.owner.icon_server
+        assert_equal 6, media.owner.icon_farm
+        refute media.owner.buddy_icon_url.empty?
+        # Visibility (This is the difference from Flickrie.media_from_set)
+        assert_equal true, media.visibility.public?
+        assert_equal false, media.visibility.friends?
+        assert_equal false, media.visibility.family?
+        assert_equal nil, media.visibility.contacts?
+      end
+    end
+  end
+  def test_get_context
+    VCR.use_cassette 'media/get_context' do
+      context = Flickrie.get_media_context(@media_id)
+      assert_equal 98, context['count']
+      previous_media = context['prevphoto']
+      assert_equal '6946978706', previous_media.id
+      assert_equal 'b38270bbd6', previous_media.secret
+      assert_equal '7216', previous_media.server
+      assert_equal 8, previous_media.farm
+      assert_equal 'IMG_0795', previous_media.title
+      refute previous_media.url.empty?
+      assert_equal '0', previous_media.license.id
+      assert_equal false, previous_media.faved?
+      next_media = context['nextphoto']
+      assert_equal '6946979704', next_media.id
+      assert_equal '74513ff732', next_media.secret
+      assert_equal '7234', next_media.server
+      assert_equal 8, next_media.farm
+      assert_equal 'IMG_0797', next_media.title
+      refute next_media.url.empty?
+      assert_equal '0', next_media.license.id
+      assert_equal false, next_media.faved?
+    end
+  end
+  def test_replace
+    VCR.use_cassette 'media/replace' do
+      media_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+      begin
+        media_id = Flickrie.upload(media_path)
+        Flickrie.replace(media_path, media_id)
+        flunk
+      rescue => exception
+        assert_equal "Not a pro account", exception.message
+      ensure
+        Flickrie.delete_media(media_id)
+      end
     end
   end