flickrie 0.5.2 → 0.6.0

data/test/oauth_test.rb

@@ -1,26 +1,25 @@
-require 'test/unit'
-require 'flickrie'
-
 class OAuthTest < Test::Unit::TestCase
-  def test_raising_errors
-    Flickrie.api_key = "foo"
-    Flickrie.shared_secret = "foo"
+  def test_tokens
+    VCR.use_cassette 'oauth/tokens' do
+      Flickrie.api_key = "foo"
+      Flickrie.shared_secret = "foo"
 
-    assert_raises(Flickrie::OAuth::Error) do
-      Flickrie::OAuth.get_request_token
-    end
+      assert_raises(Flickrie::OAuth::Error) do
+        Flickrie::OAuth.get_request_token
+      end
 
-    Flickrie.api_key = ENV['FLICKR_API_KEY']
-    assert_raises(Flickrie::OAuth::Error) do
-      Flickrie::OAuth.get_request_token
-    end
+      Flickrie.api_key = ENV['FLICKR_API_KEY']
+      assert_raises(Flickrie::OAuth::Error) do
+        Flickrie::OAuth.get_request_token
+      end
 
-    Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
-    assert_nothing_raised { Flickrie::OAuth.get_request_token }
+      Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
+      assert_nothing_raised { Flickrie::OAuth.get_request_token }
 
-    request_token = Flickrie::OAuth.get_request_token
-    assert_raises(Flickrie::OAuth::Error) do
-      Flickrie::OAuth.get_access_token("foo", request_token)
+      request_token = Flickrie::OAuth.get_request_token
+      assert_raises(Flickrie::OAuth::Error) do
+        Flickrie::OAuth.get_access_token("foo", request_token)
+      end
     end
   end
 end

data/test/photo_test.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'test'
-
 Flickrie::Photo.instance_eval do
   def public_new(*args)
     new(*args)
@@ -20,38 +18,52 @@ class PhotoTest < 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_photos_from_set
-    photo = Flickrie.photos_from_set(@set_id, :extras => @all_extras).
-      find { |photo| photo.id.to_i == @photo_id }
-
-    assert_sizes(photo)
+  def test_square_brackets
+    VCR.use_cassette 'photo/square_brackets' do
+      photo = Flickrie.get_photo_info(@photo_id)
+      assert_equal 1, photo['usage']['candownload'].to_i
+    end
   end
 
-  def test_public_photos_from_user
-    photo = Flickrie.public_photos_from_user(@user_nsid, :extras => @all_extras).
-      find { |photo| photo.id.to_i == @photo_id }
+  def test_from_set
+    VCR.use_cassette 'photo/from_set' do
+      photo = Flickrie.photos_from_set(@set_id, :extras => @all_extras).
+        find { |photo| photo.id.to_i == @photo_id }
 
-    assert_sizes(photo, :exclude => ['Square 150', 'Small 320', 'Medium 800'])
+      assert_sizes(photo)
+    end
   end
 
-  def test_get_photo_sizes
-    get_sizes_assertions(Flickrie.get_photo_sizes(@photo_id))
-    get_sizes_assertions(Flickrie::Photo.public_new('id' => @photo_id.to_s).get_sizes)
+  def test_public_from_user
+    VCR.use_cassette 'photo/from_user' do
+      photo = Flickrie.public_photos_from_user(@user_nsid, :extras => @all_extras).
+        find { |photo| photo.id.to_i == @photo_id }
+
+      assert_sizes(photo, :exclude => ['Square 150', 'Small 320', 'Medium 800'])
+    end
   end
 
-  def get_sizes_assertions(photo)
-    assert_equal true, photo.can_download?
-    assert_equal true, photo.can_blog?
-    assert_equal true, photo.can_print?
+  def test_get_sizes
+    VCR.use_cassette 'photo/get_sizes' do
+      [Flickrie.get_photo_sizes(@photo_id),
+       Flickrie::Photo.public_new('id' => @photo_id.to_s).get_sizes].
+        each do |photo|
+          assert_equal true, photo.can_download?
+          assert_equal true, photo.can_blog?
+          assert_equal true, photo.can_print?
 
-    assert_sizes(photo)
+          assert_sizes(photo)
+        end
+    end
   end
 
-  def test_search_photos
-    photo = Flickrie.search_photos(:user_id => @user_nsid, :extras => @all_extras).
-      find { |photo| photo.id.to_i == @photo_id }
+  def test_search
+    VCR.use_cassette 'photo/search' do
+      photo = Flickrie.search_photos(:user_id => @user_nsid, :extras => @all_extras).
+        find { |photo| photo.id.to_i == @photo_id }
 
-    assert_sizes(photo)
+      assert_sizes(photo)
+    end
   end
 
   def assert_sizes(photo, options = {})
@@ -145,50 +157,56 @@ class PhotoTest < Test::Unit::TestCase
       end
   end
 
-  def test_photo_upload
-    photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
-    photo_id = Flickrie.upload(photo_path)
-    assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
-    Flickrie.delete_photo(photo_id)
+  def test_upload
+    VCR.use_cassette 'photo/upload' do
+      photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+      photo_id = Flickrie.upload(photo_path)
+      assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
+      Flickrie.delete_photo(photo_id)
+    end
   end
 
-  def test_asynchronous_photo_upload
-    photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
-    ticket_id = Flickrie.upload(photo_path, :async => 1)
-    begin
-      ticket = Flickrie.check_upload_tickets([ticket_id]).first
-    end until ticket.complete?
-    photo_id = ticket.photo_id
-    assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
-    Flickrie.delete_photo(photo_id)
+  def test_asynchronous_upload
+    VCR.use_cassette 'photo/asynchronous_upload' do
+      photo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'photo.jpg')
+      ticket_id = Flickrie.upload(photo_path, :async => 1)
+      begin
+        ticket = Flickrie.check_upload_tickets([ticket_id]).first
+      end until ticket.complete?
+      photo_id = ticket.photo_id
+      assert_nothing_raised(Flickrie::Error) { Flickrie.get_photo_info(photo_id) }
+      Flickrie.delete_photo(photo_id)
+    end
   end
 
-  def test_get_photo_exif
-    [
-      Flickrie.get_photo_exif(@photo_id),
-      Flickrie::Photo.public_new('id' => @photo_id).get_exif
-    ].
-      each do |photo|
-        assert_equal "Canon PowerShot G12", photo.camera
-        assert_equal "180 dpi", photo.exif.get('X-Resolution')
-        assert_equal "180 dpi", photo.exif.get('X-Resolution', :data => 'clean')
-        assert_equal "180",     photo.exif.get('X-Resolution', :data => 'raw')
-      end
+  def test_get_exif
+    VCR.use_cassette 'photo/get_exif' do
+      [Flickrie.get_photo_exif(@photo_id),
+       Flickrie::Photo.public_new('id' => @photo_id).get_exif].
+        each do |photo|
+          assert_equal "Canon PowerShot G12", photo.camera
+          assert_equal "180 dpi", photo.exif.get('X-Resolution')
+          assert_equal "180 dpi", photo.exif.get('X-Resolution', :data => 'clean')
+          assert_equal "180",     photo.exif.get('X-Resolution', :data => 'raw')
+        end
+    end
   end
 
   def test_other_api_calls
-    # add_photo_tags, get_photo_info, remove_photo_tag,
-    # search_photos, photos_from_contacts
-
-    assert_nothing_raised do
-      Flickrie.add_photo_tags(@photo_id, "janko")
-      photo = Flickrie.get_photo_info(@photo_id)
-      tag = photo.tags.find { |tag| tag.content == "janko" }
-      Flickrie.remove_photo_tag(tag.id)
-      Flickrie.photos_from_contacts(:include_self => 1)
-      Flickrie.public_photos_from_user_contacts(@user_nsid, :include_self => 1)
-      Flickrie.get_photo_context(@photo_id)
-      Flickrie.search_photos(:user_id => @user_nsid)
+    VCR.use_cassette 'photo/other_api_calls' do
+      # add_photo_tags, get_photo_info, remove_photo_tag,
+      # search_photos, photos_from_contacts
+
+      assert_nothing_raised do
+        Flickrie.add_photo_tags(@photo_id, "janko")
+        photo = Flickrie.get_photo_info(@photo_id)
+        tag = photo.tags.find { |tag| tag.content == "janko" }
+        Flickrie.remove_photo_tag(tag.id)
+        Flickrie.photos_from_contacts(:include_self => 1)
+        Flickrie.public_photos_from_user_contacts(@user_nsid, :include_self => 1)
+        Flickrie.get_photo_context(@photo_id)
+        Flickrie.search_photos(:user_id => @user_nsid)
+      end
     end
   end
 end

data/test/set_test.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'test'
 
 Flickrie::Set.instance_eval do
   def public_new(*args)
@@ -13,71 +12,81 @@ class SetTest < Test::Unit::TestCase
     @user_nsid = '67131352@N04'
   end
 
-  def test_get_set_info
-    get_info_assertions(Flickrie.get_set_info(@set_id))
-    get_info_assertions(Flickrie::Set.public_new('id' => @set_id.to_s).get_info)
+  def test_square_brackets
+    VCR.use_cassette 'set/square_brackets' do
+      set = Flickrie.get_set_info(@set_id)
+      assert_equal @set_id, set['id'].to_i
+    end
   end
 
-  def get_info_assertions(set)
-    assert_equal @set_id, set.id.to_i
-    assert_equal @user_nsid, set.owner.nsid
-    assert_equal '6946979188', set.primary_media_id
-    assert_equal '25bb44852b', set.secret
-    assert_equal '7049', set.server
-    assert_equal 8, set.farm
-    assert_equal 'Speleologija', set.title
-    assert_equal 'Slike sa škole speleologije Velebit.', set.description
-
-    assert_equal 98, set.media_count
-    assert_equal 97, set.photos_count
-    assert_equal 1, set.videos_count
-    assert_equal 0, set.comments_count
-    assert_equal 0, set.views_count
-
-    assert set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }
-    assert set.videos.all? { |video| video.is_a?(Flickrie::Video) }
-    assert set.media.find { |media| media.is_a?(Flickrie::Photo) }
-    assert set.media.find { |media| media.is_a?(Flickrie::Video) }
-
-    assert_equal true, set.can_comment?
-
-    assert_instance_of Time, set.created_at
-    assert_instance_of Time, set.updated_at
-
-    refute set.url.empty?
+  def test_get_info
+    VCR.use_cassette 'set/get_info' do
+      [Flickrie.get_set_info(@set_id),
+       Flickrie::Set.public_new('id' => @set_id.to_s).get_info].
+        each do |set|
+          assert_equal @set_id, set.id.to_i
+          assert_equal @user_nsid, set.owner.nsid
+          assert_equal '6946979188', set.primary_media_id
+          assert_equal '25bb44852b', set.secret
+          assert_equal '7049', set.server
+          assert_equal 8, set.farm
+          assert_equal 'Speleologija', set.title
+          assert_equal 'Slike sa škole speleologije Velebit.', set.description
+
+          assert_equal 98, set.media_count
+          assert_equal 97, set.photos_count
+          assert_equal 1, set.videos_count
+          assert_equal 0, set.comments_count
+          assert_equal 0, set.views_count
+
+          assert set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }
+          assert set.videos.all? { |video| video.is_a?(Flickrie::Video) }
+          assert set.media.find { |media| media.is_a?(Flickrie::Photo) }
+          assert set.media.find { |media| media.is_a?(Flickrie::Video) }
+
+          assert_equal true, set.can_comment?
+
+          assert_instance_of Time, set.created_at
+          assert_instance_of Time, set.updated_at
+
+          refute set.url.empty?
+        end
+    end
   end
 
-  def test_sets_from_user
-    set = Flickrie.sets_from_user(@user_nsid).
-      find { |set| set.id.to_i == @set_id }
-
-    assert_equal @set_id, set.id.to_i
-    assert_equal @user_nsid, set.owner.nsid
-    assert_equal '6946979188', set.primary_media_id
-    assert_equal '25bb44852b', set.secret
-    assert_equal '7049', set.server
-    assert_equal 8, set.farm
-    assert_equal 'Speleologija', set.title
-    assert_equal 'Slike sa škole speleologije Velebit.', set.description
-
-    assert_equal 98, set.media_count
-    assert_equal 97, set.photos_count
-    assert_equal 1, set.videos_count
-    assert_equal 0, set.comments_count
-    assert_equal 0, set.views_count
-
-    assert set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }
-    assert set.videos.all? { |video| video.is_a?(Flickrie::Video) }
-    assert set.media.find { |media| media.is_a?(Flickrie::Photo) }
-    assert set.media.find { |media| media.is_a?(Flickrie::Video) }
-
-    assert_equal true, set.can_comment?
-    assert_equal false, set.needs_interstitial?
-    assert_equal true, set.visibility_can_see_set?
-
-    assert_instance_of Time, set.created_at
-    assert_instance_of Time, set.updated_at
-
-    refute set.url.empty?
+  def test_from_user
+    VCR.use_cassette 'set/from_user' do
+      set = Flickrie.sets_from_user(@user_nsid).
+        find { |set| set.id.to_i == @set_id }
+
+      assert_equal @set_id, set.id.to_i
+      assert_equal @user_nsid, set.owner.nsid
+      assert_equal '6946979188', set.primary_media_id
+      assert_equal '25bb44852b', set.secret
+      assert_equal '7049', set.server
+      assert_equal 8, set.farm
+      assert_equal 'Speleologija', set.title
+      assert_equal 'Slike sa škole speleologije Velebit.', set.description
+
+      assert_equal 98, set.media_count
+      assert_equal 97, set.photos_count
+      assert_equal 1, set.videos_count
+      assert_equal 0, set.comments_count
+      assert_equal 0, set.views_count
+
+      assert set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }
+      assert set.videos.all? { |video| video.is_a?(Flickrie::Video) }
+      assert set.media.find { |media| media.is_a?(Flickrie::Photo) }
+      assert set.media.find { |media| media.is_a?(Flickrie::Video) }
+
+      assert_equal true, set.can_comment?
+      assert_equal false, set.needs_interstitial?
+      assert_equal true, set.visibility_can_see_set?
+
+      assert_instance_of Time, set.created_at
+      assert_instance_of Time, set.updated_at
+
+      refute set.url.empty?
+    end
   end
 end

data/test/{test.rb → test_helper.rb}

@@ -5,3 +5,10 @@ Flickrie.api_key = ENV['FLICKR_API_KEY']
 Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
 Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
 Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
+
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'test/vcr_cassettes'
+  c.hook_into :webmock
+end

data/test/user_test.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'test'
 
 Flickrie::User.instance_eval do
   def public_new(*args)
@@ -12,50 +11,60 @@ class UserTest < Test::Unit::TestCase
     @user_nsid = '67131352@N04'
   end
 
-  def test_get_user_info
-    get_info_assertions(Flickrie.get_user_info(@user_nsid))
-    get_info_assertions(Flickrie::User.public_new('nsid' => @user_nsid).get_info)
+  def test_square_brackets
+    VCR.use_cassette 'user/square_brackets' do
+      user = Flickrie.get_user_info(@user_nsid)
+      assert_equal user['nsid'], user.nsid
+    end
   end
 
-  def get_info_assertions(user)
-    assert_equal @user_nsid, user.id
-    assert_equal @user_nsid, user.nsid
-    assert_equal 'Janko Marohnić', user.username
-    assert_equal 'Janko Marohnić', user.real_name
-    assert_equal 'Zagreb, Croatia', user.location
-    assert_equal 'Sarajevo, Skopje, Warsaw, Zagreb', user.time_zone['label']
-    assert_equal '+01:00', user.time_zone['offset']
-    assert_equal <<-DESCRIPTION.chomp, user.description
-I'm a programmer, and I'm gonna program a badass Ruby library for Flickr.
-    DESCRIPTION
+  def test_get_info
+    VCR.use_cassette 'user/get_info' do
+      [Flickrie.get_user_info(@user_nsid),
+       Flickrie::User.public_new('nsid' => @user_nsid).get_info].
+        each do |user|
+          assert_equal @user_nsid, user.id
+          assert_equal @user_nsid, user.nsid
+          assert_equal 'Janko Marohnić', user.username
+          assert_equal 'Janko Marohnić', user.real_name
+          assert_equal 'Zagreb, Croatia', user.location
+          assert_equal 'Sarajevo, Skopje, Warsaw, Zagreb', user.time_zone['label']
+          assert_equal '+01:00', user.time_zone['offset']
+          assert_equal <<-DESCRIPTION.chomp.lstrip, user.description
+            I'm a programmer, and I'm gonna program a badass Ruby library for Flickr.
+          DESCRIPTION
 
-    refute user.profile_url.empty?
-    refute user.mobile_url.empty?
-    refute user.photos_url.empty?
+          refute user.profile_url.empty?
+          refute user.mobile_url.empty?
+          refute user.photos_url.empty?
 
-    assert_equal '5464', user.icon_server
-    assert_equal 6, user.icon_farm
-    refute user.buddy_icon_url.empty?
+          assert_equal '5464', user.icon_server
+          assert_equal 6, user.icon_farm
+          refute user.buddy_icon_url.empty?
 
-    assert_equal false, user.pro?
+          assert_equal false, user.pro?
 
-    assert_instance_of Time, user.first_taken
-    assert_instance_of Time, user.first_uploaded
+          assert_instance_of Time, user.first_taken
+          assert_instance_of Time, user.first_uploaded
 
-    assert_equal 98, user.media_count
+          assert_equal 98, user.media_count
+        end
+    end
   end
 
-  def test_find_user_by_username_or_email
-    user = Flickrie.find_user_by_username('Janko Marohnić')
+  def test_find_by_username_or_email
+    VCR.use_cassette 'user/find_by_email_or_username' do
+      user = Flickrie.find_user_by_username('Janko Marohnić')
 
-    assert_equal @user_nsid, user.id
-    assert_equal @user_nsid, user.nsid
-    assert_equal 'Janko Marohnić', user.username
+      assert_equal @user_nsid, user.id
+      assert_equal @user_nsid, user.nsid
+      assert_equal 'Janko Marohnić', user.username
 
-    user = Flickrie.find_user_by_email('janko.marohnic@gmail.com')
+      user = Flickrie.find_user_by_email('janko.marohnic@gmail.com')
 
-    assert_equal @user_nsid, user.id
-    assert_equal @user_nsid, user.nsid
-    assert_equal 'Janko Marohnić', user.username
+      assert_equal @user_nsid, user.id
+      assert_equal @user_nsid, user.nsid
+      assert_equal 'Janko Marohnić', user.username
+    end
   end
 end