flickrie 1.1.0 → 1.1.1

data/spec/flickrie/api_methods_spec.rb

@@ -1,124 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::ApiMethods do
-  context "upload" do
-    it "should upload", :vcr do
-      photo_id = Flickrie.upload(PHOTO_PATH)
-      expect { Flickrie.delete_photo(photo_id) }.to_not raise_error
-    end
-
-    it "should upload asynchronously", :vcr do
-      ticket_id = Flickrie.upload(PHOTO_PATH, :async => 1)
-      ticket = Flickrie.check_upload_tickets(ticket_id).first
-      until ticket.complete?
-        ticket = Flickrie.check_upload_tickets(ticket_id).first
-      end
-      expect { Flickrie.delete_photo(ticket.photo_id) }.to_not raise_error
-    end
-
-    it "should replace", :vcr do
-      begin
-        photo_id = Flickrie.upload(PHOTO_PATH)
-        Flickrie.replace(PHOTO_PATH, photo_id)
-      rescue => error
-        error.message.should == "Not a pro account"
-      ensure
-        Flickrie.delete_photo(photo_id)
-      end
-    end
-  end
-
-  context "people" do
-    it "should get media from user", :vcr do
-      Flickrie.media_from_user(USER_NSID).first.id.should_not be_nil
-      Flickrie.photos_from_user(USER_NSID).first.id.should_not be_nil
-      Flickrie.videos_from_user(USER_NSID).first.id.should_not be_nil
-    end
-
-    it "should get public media from user", :vcr do
-      Flickrie.public_media_from_user(USER_NSID).first.id.should_not be_nil
-      Flickrie.public_photos_from_user(USER_NSID).first.id.should_not be_nil
-      Flickrie.public_videos_from_user(USER_NSID).first.id.should_not be_nil
-    end
-  end
-
-  # Here I test the media/photo/video aliases of the API methods (because I don't test them elsewhere)
-  context "photos" do
-    it "should add and remove tags", :vcr do
-      %w[media photo video].each do |word|
-        id = eval "#{word.upcase}_ID"
-        media = Flickrie.send("get_#{word}_info", id)
-        tags_before_change = media.tags.join(' ')
-        Flickrie.send("add_#{word}_tags", id, "janko")
-        media.get_info
-        media.tags.join(' ').should eq([tags_before_change, "janko"].join(' '))
-        tag_id = media.tags.find { |tag| tag.content == "janko" }.id
-        Flickrie.send("remove_#{word}_tag", tag_id)
-        media.get_info
-        media.tags.join(' ').should eq(tags_before_change)
-      end
-    end
-
-    it "should get from contacts", :vcr do
-      params = {:include_self => 1, :single_photo => 1}
-      Flickrie.media_from_contacts(params).first.id.should_not be_nil
-      Flickrie.photos_from_contacts(params).first.id.should_not be_nil
-      # Flickrie.videos_from_contacts(params).first.id.should_not be_nil
-    end
-
-    it "should get public from user contacts", :vcr do
-      params = {:include_self => 1, :single_photo => 1}
-      Flickrie.public_media_from_user_contacts(USER_NSID, params).first.id.should_not be_nil
-      Flickrie.public_photos_from_user_contacts(USER_NSID, params).first.id.should_not be_nil
-      # Flickrie.public_videos_from_user_contacts(USER_NSID, params).each { |object| object.should be_a_video }
-    end
-
-    it "should get context", :vcr do
-      Flickrie.get_media_context(MEDIA_ID).count.should_not be_nil
-      Flickrie.get_photo_context(PHOTO_ID).count.should_not be_nil
-      Flickrie.get_photo_context(VIDEO_ID).count.should_not be_nil
-    end
-
-    it "should get counts", :vcr do
-      dates = [DateTime.parse("19th May 2009"), DateTime.parse("19th May 2012")]
-      Flickrie.get_media_counts(:taken_dates => dates.join(',')).first.value.should_not be_nil
-      Flickrie.get_photos_counts(:taken_dates => dates.join(',')).first.value.should_not be_nil
-      Flickrie.get_videos_counts(:taken_dates => dates.join(',')).first.value.should_not be_nil
-    end
-
-    it "should get exif", :vcr do
-      Flickrie.get_photo_exif(PHOTO_ID).exif.should_not be_nil
-      Flickrie.get_video_exif(VIDEO_ID).exif.should_not be_nil
-    end
-
-    it "should get favorites", :vcr do
-      Flickrie.get_photo_favorites(PHOTO_ID).favorites.should_not be_nil
-      Flickrie.get_video_favorites(PHOTO_ID).favorites.should_not be_nil
-    end
-
-    it "should get info", :vcr do
-      Flickrie.get_media_info(MEDIA_ID).id.should_not be_nil
-      Flickrie.get_photo_info(PHOTO_ID).id.should_not be_nil
-      Flickrie.get_video_info(VIDEO_ID).id.should_not be_nil
-    end
-
-    it "should get sizes", :vcr do
-      Flickrie.get_photo_sizes(PHOTO_ID).size.should_not be_nil
-      Flickrie.get_video_sizes(VIDEO_ID).download_url.should_not be_nil
-    end
-
-    it "should search", :vcr do
-      Flickrie.search_media(:user_id => USER_NSID).first.id.should_not be_nil
-      Flickrie.search_photos(:user_id => USER_NSID).first.id.should_not be_nil
-      Flickrie.search_videos(:user_id => USER_NSID).first.id.should_not be_nil
-    end
-  end
-
-  context "photosets" do
-    it "should get media", :vcr do
-      Flickrie.media_from_set(SET_ID).first.id.should_not be_nil
-      Flickrie.photos_from_set(SET_ID).first.id.should_not be_nil
-      Flickrie.videos_from_set(SET_ID).first.id.should_not be_nil
-    end
-  end
-end

data/spec/flickrie/error_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::Error do
-  context "a request was made and failed" do
-    it "should be raised", :vcr do
-      Flickrie.api_key = nil
-      expect { Flickrie.get_licenses }.to raise_error(described_class)
-      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(described_class)
-    end
-
-    it "should have #code attribute present", :vcr do
-      Flickrie.api_key = nil
-      begin
-        Flickrie.get_licenses
-      rescue => exception
-        exception.code.should eq(100)
-      end
-
-      begin
-        Flickrie.upload(PHOTO_PATH)
-      rescue => exception
-        exception.code.should eq(100)
-      end
-    end
-  end
-end

data/spec/flickrie/instance_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::Instance do
-  context "client is already initialized" do
-    it "should be able to call API methods", :vcr do
-      # this is to see if the client and upload_client were reset
-      Flickrie.get_photo_info(PHOTO_ID)
-      id = Flickrie.upload(PHOTO_PATH)
-      Flickrie.delete_photo(id)
-      Flickrie.access_token = Flickrie.access_secret = nil
-
-      instance = Flickrie::Instance.new(ENV['FLICKR_ACCESS_TOKEN'], ENV['FLICKR_ACCESS_SECRET'])
-      user = instance.test_login
-      user.username.should eq(USER_USERNAME)
-    end
-  end
-end

data/spec/flickrie/license_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::License do
-  context "get" do
-    it "should have all attributes correctly set", :vcr do
-      licenses = Flickrie.get_licenses
-
-      licenses.each do |license|
-        ('0'..'8').should cover(license.id)
-        license.name.should be_an_instance_of(String)
-        license.url.should be_an_instance_of(String)
-      end
-    end
-  end
-end

data/spec/flickrie/location_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::Location do
-  context "blank" do
-    it "should have all attributes equal to nil" do
-      location = Flickrie::Location.public_new
-      attributes = location.methods - Object.instance_methods - [:[]]
-      attributes.each do |attribute|
-        location.send(attribute).should be_nil
-      end
-    end
-  end
-
-  context "accessing areas" do
-    it "should have #to_s defined on them" do
-      location = Flickrie::Location.public_new \
-        'neighbourhood' => {
-          '_content' => 'A gangsta ghetto, yo'
-        }
-
-      location.neighbourhood.to_s.should eq('A gangsta ghetto, yo')
-    end
-  end
-end

data/spec/flickrie/media_count_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::MediaCount do
-  context "get" do
-    it "should have correctly set all attributes", :vcr do
-      dates = [DateTime.parse("1st March 2012"), DateTime.parse("5th May 2012")].map(&:to_time)
-      [
-        Flickrie.get_media_counts(:taken_dates => dates.join(',')).first,
-        Flickrie.get_media_counts(:dates => dates.map(&:to_i).join(',')).first
-      ].
-        each do |count|
-          count.value.should be_an_instance_of(Fixnum)
-
-          count.date_range.begin.should eq(dates.first)
-          count.from.should eq(dates.first)
-
-          count.date_range.end.should eq(dates.last)
-          count.to.should eq(dates.last)
-        end
-    end
-  end
-end

data/spec/flickrie/media_spec.rb

@@ -1,292 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::Media do
-  before(:all) do
-    @attributes = {
-      :id => PHOTO_ID,
-      :secret => '25bb44852b',
-      :server => '7049',
-      :farm => 8,
-      :title => 'IMG_0796',
-      :description => 'Test',
-      :media_status => 'ready',
-      :path_alias => nil,
-      :camera => 'Canon PowerShot G12',
-      :comments_count => 1,
-      :location => {
-        :latitude => 45.807258,
-        :longitude => 15.967599,
-        :accuracy => '11',
-        :context => 0,
-        :neighbourhood => nil,
-        :locality => {
-          :name => 'Zagreb',
-          :place_id => '00j4IylZV7scWik',
-          :woeid => '851128'
-        },
-        :county => {
-          :name => 'Zagreb',
-          :place_id => '306dHrhQV7o6jm.ZUQ',
-          :woeid => '15022257'
-        },
-        :region => {
-          :name => 'Grad Zagreb',
-          :place_id => 'Js1DU.pTUrpBCIKhVw',
-          :woeid => '20070170'
-        },
-        :country => {
-          :name => 'Croatia',
-          :place_id => 'FunRCI5TUb6a6soTyw',
-          :woeid => '23424843'
-        },
-        :place_id => '00j4IylZV7scWik',
-        :woeid => '851128'
-      },
-      :geo_permissions => {
-        :public? => true,
-        :contacts? => false,
-        :friends? => false,
-        :family? => false
-      },
-      :tags => {
-        :first => {
-          :content => 'luka',
-          :author => {
-            :nsid => USER_NSID
-          },
-          :raw => 'luka',
-          :machine_tag? => false
-        }
-      },
-      :machine_tags => [],
-      :license => {:id => '0'},
-      :taken_at_granularity => 0,
-      :owner => {
-        :nsid => USER_NSID,
-        :username => USER_USERNAME,
-        :real_name => USER_USERNAME,
-        :location => "Zagreb, Croatia",
-        :icon_server => "5464",
-        :icon_farm => 6
-      },
-
-      :safety_level => 0,
-      :safe? => true,
-      :moderate? => false,
-      :restricted? => false,
-
-      :visibility => {
-        :public? => true,
-        :family? => false,
-        :friends? => false,
-        :contacts? => nil
-      },
-      :favorite? => false,
-
-      :has_people? => false,
-      :notes => {
-        :first => {
-          :id => '72157629487842968',
-          :author => {
-            :nsid => USER_NSID,
-            :username => USER_USERNAME
-          },
-          :coordinates => [316, 0],
-          :width => 59,
-          :height => 50,
-          :content => 'Test'
-        }
-      }
-    }
-  end
-
-  context "get info" do
-    it "should have all attributes correctly set", :vcr do
-      [
-        Flickrie.get_media_info(PHOTO_ID),
-        Flickrie::Photo.public_new('id' => PHOTO_ID).get_info,
-        Flickrie::Video.public_new('id' => PHOTO_ID).get_info
-      ].
-        each do |media|
-          [
-            :id, :secret, :server, :farm, :title, :description,
-            :comments_count, :location, :geo_permissions, :tags,
-            :machine_tags, :license, :taken_at_granularity, :owner,
-            :safety_level, :safe?, :moderate?, :restricted?, :visibility,
-            :favorite?, :has_people?, :notes
-          ].
-            each do |attribute|
-              media.send(attribute).should correspond_to(@attributes[attribute])
-            end
-
-          # can change, so just checking the type
-          [
-            :can_comment?, :can_add_meta?, :can_everyone_comment?,
-            :can_everyone_add_meta?, :can_download?, :can_blog?,
-            :can_print?, :can_share?
-          ].
-            each { |attribute| media.send(attribute).should be_a_boolean }
-
-          media.views_count.should be_a_number
-
-          # time
-          [:posted_at, :uploaded_at, :updated_at, :taken_at].each do |time_attribute|
-            media.send(time_attribute).should be_an_instance_of(Time)
-          end
-
-          # other
-          media.url.should_not be_empty
-          media['id'].should eq(PHOTO_ID)
-          media.hash['id'].should eq(PHOTO_ID)
-        end
-    end
-  end
-
-  shared_context "common" do
-    def test_common_attributes(media)
-      [
-        :id, :secret, :server, :farm, :title, :media_status,
-        :geo_permissions, :machine_tags, :license, :taken_at_granularity
-      ].
-        each do |attribute|
-          media.send(attribute).should correspond_to(@attributes[attribute])
-        end
-
-      # the incomplete ones
-      media.location.should correspond_to(@attributes[:location].except(:locality, :county, :region, :country))
-      media.tags.first.should correspond_to(@attributes[:tags][:first].except(:author, :raw, :machine_tag?))
-      media.owner.should correspond_to(@attributes[:owner].except(:real_name, :location))
-
-      # time
-      [:uploaded_at, :updated_at, :taken_at].each do |time_attribute|
-        media.send(time_attribute).should be_an_instance_of(Time)
-      end
-
-      # other
-      media.url.should_not be_empty
-      media.views_count.should be_a_number
-    end
-  end
-
-  context "from set" do
-    include_context "common"
-
-    it "should have all attributes correctly set", :vcr do
-      media = Flickrie.media_from_set(SET_ID, :extras => EXTRAS).
-        find { |media| media.id == PHOTO_ID }
-      test_common_attributes(media)
-      media.primary?.should be_true
-    end
-  end
-
-  context "from user" do
-    include_context "common"
-
-    it "should have all attributes correctly set", :vcr do
-      media = Flickrie.media_from_user(USER_NSID, :extras => EXTRAS).
-        find { |media| media.id == PHOTO_ID }
-      test_common_attributes(media)
-      media.visibility.should correspond_to(@attributes[:visibility])
-    end
-  end
-
-  context "public from user" do
-    include_context "common"
-
-    it "should have all attributes correctly set", :vcr do
-      media = Flickrie.public_media_from_user(USER_NSID, :extras => EXTRAS).
-        find { |media| media.id == PHOTO_ID }
-      test_common_attributes(media)
-      media.visibility.should correspond_to(@attributes[:visibility])
-    end
-  end
-
-  context "search" do
-    include_context "common"
-
-    it "should have all attributes correctly set", :vcr do
-      media = Flickrie.search_media(:user_id => USER_NSID, :extras => EXTRAS).
-        find { |media| media.id == PHOTO_ID }
-      test_common_attributes(media)
-      media.visibility.should correspond_to(@attributes[:visibility])
-    end
-  end
-
-  context "from contacts" do
-    it "should have all attributes correctly set", :vcr do
-      params = {:include_self => 1, :single_photo => 1}
-      [
-        Flickrie.media_from_contacts(params).first,
-        Flickrie.public_media_from_user_contacts(USER_NSID, params).first
-      ].
-        each do |media|
-          attributes = {
-            :id => '7093101501',
-            :secret => '9337f28800',
-            :server => '7090',
-            :farm => 8,
-            :owner => {
-              :nsid => USER_NSID,
-              :username => USER_USERNAME
-            },
-            :title => 'IMG_0917',
-            :visibility => {:public? => true},
-            :media_status => 'ready'
-          }
-
-          attributes.keys.each do |attribute|
-            media.send(attribute).should correspond_to(attributes[attribute])
-          end
-        end
-    end
-  end
-
-  context "get context" do
-    it "should have all attributes correctly set", :vcr do
-      context = Flickrie.get_media_context(PHOTO_ID)
-      context.count.should eq(98)
-
-      attributes = {
-        :id => '6946978706',
-        :secret => 'b38270bbd6',
-        :server => '7216',
-        :farm => 8,
-        :title => 'IMG_0795',
-        :license => {:id => '0'},
-        :faved? => false
-      }
-      attributes.keys.each do |attribute|
-        context.previous.send(attribute).should correspond_to(attributes[attribute])
-      end
-      context.previous.url.should_not be_empty
-    end
-  end
-
-  context "get exif" do
-    it "should get exif correctly", :vcr do
-      [
-        Flickrie.get_photo_exif(PHOTO_ID),
-        Flickrie::Photo.public_new('id' => PHOTO_ID).get_exif
-      ].
-        each do |photo|
-          photo.camera.should eq('Canon PowerShot G12')
-          photo.exif.get('X-Resolution').should eq('180 dpi')
-          photo.exif.get('X-Resolution', :data => 'clean').should eq('180 dpi')
-          photo.exif.get('X-Resolution', :data => 'raw').should eq('180')
-        end
-    end
-  end
-
-  context "blank media" do
-    it "should have all attributes equal to nil" do
-      attributes = Flickrie::Media.instance_methods -
-        Object.instance_methods -
-        [:[], :get_info, :get_exif, :get_favorites]
-
-      media = Flickrie::Photo.public_new
-      attributes.each do |attribute|
-        media.send(attribute).should be_nil
-      end
-    end
-  end
-end

data/spec/flickrie/oauth_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe Flickrie::OAuth do
-  context "incorrect credentials" do
-    it "should raise exceptions", :vcr do
-      Flickrie.api_key = "foo"
-      Flickrie.shared_secret = "foo"
-
-      expect { Flickrie::OAuth.get_request_token }.to raise_error(Flickrie::Error)
-
-      Flickrie.api_key = ENV['FLICKR_API_KEY']
-      expect { Flickrie::OAuth.get_request_token }.to raise_error(Flickrie::Error)
-
-      Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
-      expect { Flickrie::OAuth.get_request_token }.to_not raise_error(Flickrie::Error)
-
-      request_token = Flickrie::OAuth.get_request_token
-      request_token.authorize_url.should_not be_empty
-      request_token.get_authorization_url.should_not be_empty
-
-      expect { Flickrie::OAuth.get_access_token("foo", request_token) }.to raise_error(Flickrie::Error)
-      expect { request_token.get_access_token("foo") }.to raise_error(Flickrie::Error)
-    end
-  end
-end

data/spec/flickrie/photo_spec.rb

@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-SIZES = ['Square 75', 'Thumbnail', 'Square 150', 'Small 240', 'Small 320',
-  'Medium 500', 'Medium 640', 'Medium 800', 'Large 1024']
-
-describe Flickrie::Photo do
-  def test_sizes(photo)
-    # non-bang versions
-    [
-      [[photo.square(75), photo.square75],   ['Square 75', '75x75']],
-      [[photo.thumbnail],                    ['Thumbnail', '75x100']],
-      [[photo.square(150), photo.square150], ['Square 150', '150x150']],
-      [[photo.small(240), photo.small240],   ['Small 240', '180x240']],
-      [[photo.small(320), photo.small320],   ['Small 320', '240x320']],
-      [[photo.medium(500), photo.medium500], ['Medium 500', '375x500']],
-      [[photo.medium(640), photo.medium640], ['Medium 640', '480x640']],
-      [[photo.medium(800), photo.medium800], ['Medium 800', '600x800']],
-      [[photo.large(1024), photo.large1024], ['Large 1024', '768x1024']]
-    ].
-      each do |photos, expected_values|
-        flickr_size, size = expected_values
-        photos.each do |photo|
-          photo.size.should eq(flickr_size)
-          [photo.width, photo.height].join('x').should eq(size)
-          photo.source_url.should_not be_empty
-        end
-      end
-
-    # bang versions
-    [
-      [[proc { photo.square!(75) }, proc { photo.square75! }],   ['Square 75', '75x75']],
-      [[proc { photo.thumbnail! }],                              ['Thumbnail', '75x100']],
-      [[proc { photo.square!(150) }, proc { photo.square150! }], ['Square 150', '150x150']],
-      [[proc { photo.small!(240) }, proc { photo.small240! }],   ['Small 240', '180x240']],
-      [[proc { photo.small!(320) }, proc { photo.small320! }],   ['Small 320', '240x320']],
-      [[proc { photo.medium!(500) }, proc { photo.medium500! }], ['Medium 500', '375x500']],
-      [[proc { photo.medium!(640) }, proc { photo.medium640! }], ['Medium 640', '480x640']],
-      [[proc { photo.medium!(800) }, proc { photo.medium800! }], ['Medium 800', '600x800']],
-      [[proc { photo.large!(1024) }, proc { photo.large1024! }], ['Large 1024', '768x1024']]
-    ].
-      each do |blocks, expected_values|
-        flickr_size, size = expected_values
-        blocks.each do |block|
-          result_photo = block.call
-          [result_photo, photo].each do |photo|
-            photo.size.should eq(flickr_size)
-            [photo.width, photo.height].join('x').should eq(size)
-            photo.source_url.should_not be_empty
-          end
-        end
-      end
-  end
-
-  context "get sizes" do
-    it "should have attributes correctly set", :vcr do
-      [
-        Flickrie.get_photo_sizes(PHOTO_ID),
-        Flickrie::Photo.public_new('id' => PHOTO_ID).get_sizes
-      ].
-        each do |photo|
-          [:can_download?, :can_blog?, :can_print?].each do |attribute|
-            photo.send(attribute).should be_a_boolean
-          end
-
-          test_sizes(photo)
-          photo.available_sizes.should eq(SIZES)
-        end
-    end
-  end
-
-  context "search" do
-    it "should have all sizes available", :vcr do
-      photo = Flickrie.search_photos(:user_id => USER_NSID, :extras => EXTRAS).
-        find { |photo| photo.id == PHOTO_ID }
-      photo.available_sizes.should eq(SIZES)
-    end
-  end
-
-  context "get info" do
-    it "should have all attributes correctly set", :vcr do
-      photo = Flickrie.get_photo_info(PHOTO_ID)
-      photo.rotation.should eq(90)
-    end
-  end
-
-  context "blank photo" do
-    it "should have all attributes equal to nil" do
-      photo = Flickrie::Photo.public_new
-
-      photo.width.should be_nil
-      photo.height.should be_nil
-      photo.source_url.should be_nil
-      photo.rotation.should be_nil
-      photo.available_sizes.should be_empty
-      photo.size.should be_nil
-
-      [
-        photo.square(75), photo.square(150), photo.thumbnail,
-        photo.small(240), photo.small(320), photo.medium(500),
-        photo.medium(640), photo.medium(800), photo.large(1024),
-        photo.original, photo.square75, photo.square150,
-        photo.small240, photo.small320, photo.medium500,
-        photo.medium640, photo.medium800, photo.large1024,
-        photo.largest
-      ].
-        each do |photo|
-          photo.source_url.should be_nil
-          photo.width.should be_nil
-          photo.height.should be_nil
-        end
-
-      [
-        proc { photo.square!(75) }, proc { photo.square!(150) },
-        proc { photo.thumbnail! }, proc { photo.small!(240) },
-        proc { photo.small!(320) }, proc { photo.medium!(500) },
-        proc { photo.medium!(640) }, proc { photo.medium!(800) },
-        proc { photo.large!(1024) }, proc { photo.original! },
-        proc { photo.square75! }, proc { photo.square150! },
-        proc { photo.small240! }, proc { photo.small320! },
-        proc { photo.medium500! }, proc { photo.medium640! },
-        proc { photo.medium800! }, proc { photo.large1024! },
-        proc { photo.largest! }
-      ].
-        each do |prok|
-          prok.call
-          photo.source_url.should be_nil
-          photo.width.should be_nil
-          photo.height.should be_nil
-        end
-    end
-  end
-end