flickrie 0.7.3 → 1.0.0

data/spec/{location_spec.rb → flickrie/location_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe Flickrie::Location do
   context "blank" do
@@ -10,4 +10,15 @@ describe Flickrie::Location do
       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/{media_count_spec.rb → flickrie/media_count_spec.rb}

@@ -1,17 +1,21 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+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
+        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

data/spec/{media_spec.rb → flickrie/media_spec.rb}

@@ -1,5 +1,4 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe Flickrie::Media do
   before(:all) do
@@ -65,8 +64,8 @@ describe Flickrie::Media do
       :taken_at_granularity => 0,
       :owner => {
         :nsid => USER_NSID,
-        :username => "Janko Marohnić",
-        :real_name => "Janko Marohnić",
+        :username => USER_USERNAME,
+        :real_name => USER_USERNAME,
         :location => "Zagreb, Croatia",
         :icon_server => "5464",
         :icon_farm => 6
@@ -101,8 +100,8 @@ describe Flickrie::Media do
         :first => {
           :id => '72157629487842968',
           :author => {
-            :nsid => '67131352@N04',
-            :username => 'Janko Marohnić'
+            :nsid => USER_NSID,
+            :username => USER_USERNAME
           },
           :coordinates => [316, 0],
           :width => 59,
@@ -122,15 +121,15 @@ describe Flickrie::Media do
       ].
         each do |media|
           [
-            :id, :secret, :server, :farm, :title, :description,
-            :views_count, :comments_count, :location, :geo_permissions,
-            :tags, :machine_tags, :license, :taken_at_granularity, :owner,
+            :id, :secret, :server, :farm, :title, :description, :views_count,
+            :comments_count, :location, :geo_permissions, :tags,
+            :machine_tags, :license, :taken_at_granularity, :owner,
             :safety_level, :safe?, :moderate?, :restricted?, :visibility,
             :favorite?, :can_comment?, :can_add_meta?, :can_everyone_comment?,
             :can_everyone_add_meta?, :can_download?, :can_blog?,
             :can_print?, :can_share?, :has_people?, :notes
           ].
-            each { |attribute| test_attribute(media, attribute) }
+            each { |attribute| test_recursively(media, attribute) }
 
           # other
           media.url.empty?.should be_false
@@ -150,12 +149,12 @@ describe Flickrie::Media do
         :id, :secret, :server, :farm, :title, :media_status, :views_count,
         :geo_permissions, :machine_tags, :license, :taken_at_granularity
       ].
-        each { |attribute| test_attribute(media, attribute) }
+        each { |attribute| test_recursively(media, attribute) }
 
       # the incomplete ones
-      test_attribute(media, :location, @attributes[:location].except(:locality, :county, :region, :country))
-      test_attribute(media.tags, :first, @attributes[:tags][:first].except(:author, :raw, :machine_tag?))
-      test_attribute(media, :owner, @attributes[:owner].except(:real_name, :location))
+      test_recursively(media, :location, @attributes[:location].except(:locality, :county, :region, :country))
+      test_recursively(media.tags, :first, @attributes[:tags][:first].except(:author, :raw, :machine_tag?))
+      test_recursively(media, :owner, @attributes[:owner].except(:real_name, :location))
 
       # other
       media.url.empty?.should be_false
@@ -182,10 +181,10 @@ describe Flickrie::Media do
     include_context "common"
 
     it "should have all attributes correctly set", :vcr do
-      media = @flickrie.media_from_user(USER_NSID, :extras => EXTRAS).
+      media = Flickrie.media_from_user(USER_NSID, :extras => EXTRAS).
         find { |media| media.id == PHOTO_ID }
       test_common_attributes(media)
-      test_attribute(media, :visibility)
+      test_recursively(media, :visibility)
     end
   end
 
@@ -196,7 +195,7 @@ describe Flickrie::Media do
       media = Flickrie.public_media_from_user(USER_NSID, :extras => EXTRAS).
         find { |media| media.id == PHOTO_ID }
       test_common_attributes(media)
-      test_attribute(media, :visibility)
+      test_recursively(media, :visibility)
     end
   end
 
@@ -207,7 +206,7 @@ describe Flickrie::Media do
       media = Flickrie.search_media(:user_id => USER_NSID, :extras => EXTRAS).
         find { |media| media.id == PHOTO_ID }
       test_common_attributes(media)
-      test_attribute(media, :visibility)
+      test_recursively(media, :visibility)
     end
   end
 
@@ -215,8 +214,8 @@ describe Flickrie::Media 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
+        Flickrie.media_from_contacts(params).first,
+        Flickrie.public_media_from_user_contacts(USER_NSID, params).first
       ].
         each do |media|
           media.id.should eq('7093101501')
@@ -224,9 +223,9 @@ describe Flickrie::Media do
           media.server.should eq('7090')
           media.farm.should eq(8)
           media.owner.nsid.should eq(USER_NSID)
-          media.owner.username.should eq('Janko Marohnić')
+          media.owner.username.should eq(USER_USERNAME)
           media.title.should eq('IMG_0917')
-          test_attribute(media, :visibility)
+          test_recursively(media, :visibility)
           media.media_status.should eq('ready')
         end
     end
@@ -235,10 +234,10 @@ describe Flickrie::Media do
   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)
-      context['prevphoto'].title.should eq('IMG_0795')
-      context['prevphoto'].url.should_not be_empty
-      context['prevphoto'].faved?.should be_false
+      context.count.should eq(98)
+      context.previous.title.should eq('IMG_0795')
+      context.previous.url.should_not be_empty
+      context.previous.faved?.should be_false
     end
   end
 

data/spec/flickrie/oauth_spec.rb

@@ -0,0 +1,25 @@
+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/{photo_spec.rb → flickrie/photo_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 SIZES = ['Square 75', 'Thumbnail', 'Square 150', 'Small 240', 'Small 320',
   'Medium 500', 'Medium 640', 'Medium 800', 'Large 1024']

data/spec/{set_spec.rb → flickrie/set_spec.rb}

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe Flickrie::Set do
   before(:all) do
@@ -27,7 +27,7 @@ describe Flickrie::Set do
 
   def test_common_attributes(set)
     @attributes.keys.each do |attribute|
-      test_attribute(set, attribute)
+      test_recursively(set, attribute)
     end
 
     set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }.should be_true

data/spec/flickrie/upload_client_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Flickrie::UploadClient do
+  context "content type" do
+    it "should pass the content type", :vcr do
+      photo_path = File.expand_path("../../files/photo.bla", __FILE__)
+      photo_id = Flickrie.upload(photo_path, :content_type => "image/jpeg")
+      Flickrie.photos_from_user(USER_NSID).map(&:id).should include(photo_id)
+      Flickrie.delete_photo(photo_id)
+    end
+
+    it "should raise an error on unknown content type", :vcr do
+      photo_path = File.expand_path("../../files/photo.bla", __FILE__)
+      expect { Flickrie.upload(photo_path) }.to raise_error(Flickrie::Error)
+    end
+  end
+
+  context "invalid credentials" do
+    it "should raise errors", :vcr do
+      Flickrie.api_key = nil
+      Flickrie.shared_secret = nil
+      Flickrie.access_token = nil
+      Flickrie.access_secret = nil
+
+      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(Flickrie::Error)
+
+      Flickrie.api_key = ENV['FLICKR_API_KEY']
+      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(Flickrie::Error)
+
+      Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
+      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(Flickrie::Error)
+
+      Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
+      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(Flickrie::Error)
+
+      Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
+      expect { Flickrie.upload(PHOTO_PATH) }.to_not raise_error
+    end
+  end
+end

data/spec/flickrie/user_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Flickrie::User do
+  before(:all) do
+    @attributes = {
+      :id => USER_NSID,
+      :nsid => USER_NSID,
+      :username => USER_USERNAME,
+      :real_name => USER_USERNAME,
+      :location => "Zagreb, Croatia",
+      :time_zone => {
+        :label => "Sarajevo, Skopje, Warsaw, Zagreb",
+        :offset => "+01:00"
+      },
+      :description => "I'm a programmer, and I'm gonna program a badass Ruby library for Flickr.",
+      :icon_server => "5464",
+      :icon_farm => 6,
+      :pro? => false,
+      :media_count => 98
+    }
+  end
+
+  context "get info" do
+    it "should have all attributes correctly set", :vcr do
+      [
+        Flickrie.get_user_info(USER_NSID),
+        Flickrie::User.public_new('nsid' => USER_NSID).get_info
+      ].
+        each do |user|
+          @attributes.keys.each do |attribute|
+            test_recursively(user, attribute)
+          end
+
+          [:profile_url, :mobile_url, :photos_url, :buddy_icon_url].each do |attribute|
+            user.send(attribute).should_not be_empty
+          end
+
+          [:first_taken, :first_uploaded].each do |time_attribute|
+            user.send(time_attribute).should be_an_instance_of(Time)
+          end
+        end
+    end
+  end
+
+  context "find by username or email" do
+    it "should have all attributes correctly set", :vcr do
+      [
+        Flickrie.find_user_by_username(USER_USERNAME),
+        Flickrie.find_user_by_email('janko.marohnic@gmail.com')
+      ].
+        each do |user|
+          [:id, :nsid, :username].each do |attribute|
+            test_recursively(user, attribute)
+          end
+        end
+    end
+  end
+end

data/spec/{video_spec.rb → flickrie/video_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe Flickrie::Video do
   context "get info" do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'flickrie'
 require 'vcr'
 begin
@@ -6,7 +7,7 @@ rescue LoadError
 end
 
 module RSpecHelpers
-  def test_attribute(object, attribute, hash = nil)
+  def test_recursively(object, attribute, hash = nil)
     expectation = hash || @attributes[attribute]
     unless expectation.is_a?(Hash)
       object.send(attribute).should eq(expectation)
@@ -26,6 +27,13 @@ module RSpecHelpers
       end
     end
   end
+
+  # SomeModule::AnotherModule::Class => "some_module/another_module/class"
+  def to_file_path(constants)
+    constants.split("::").collect do |constant|
+      constant.split(/(?=[A-Z])/).map(&:downcase).join('_')
+    end.join('/')
+  end
 end
 
 RSpec.configure do |c|
@@ -33,13 +41,13 @@ RSpec.configure do |c|
   c.before(:all) do
     Flickrie.api_key = ENV['FLICKR_API_KEY']
     Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
-    # so that I can use the '@instance' object when I want to make authenticated API calls
-    @flickrie = Flickrie::Instance.new(ENV['FLICKR_ACCESS_TOKEN'], ENV['FLICKR_ACCESS_SECRET'])
+    Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
+    Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
   end
   c.treat_symbols_as_metadata_keys_with_true_values = true
   c.around(:each, :vcr) do |example|
     if example.metadata[:cassette].nil?
-      # the example is also wrapped in a 'context' block
+      # the example is wrapped in a 'context' block
       class_name = example.metadata[:example_group][:example_group][:description_args].first.to_s
       cassette_name = example.metadata[:example_group][:description_args].first
     else
@@ -48,14 +56,14 @@ RSpec.configure do |c|
       cassette_name = example.metadata[:cassette]
     end
 
-    folder = class_name.to_s.match(/^Flickrie::/).post_match.to_file_path
+    folder = to_file_path(class_name.match(/^Flickrie::/).post_match)
     VCR.use_cassette("#{folder}/#{cassette_name}") { example.call }
   end
   c.fail_fast = true
 end
 
 VCR.configure do |c|
-  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  c.cassette_library_dir = 'spec/vcr_cassettes'
   c.hook_into :faraday
   c.default_cassette_options = {
     :record => :new_episodes,
@@ -66,11 +74,12 @@ VCR.configure do |c|
   c.filter_sensitive_data('ACCESS_TOKEN') { ENV['FLICKR_ACCESS_TOKEN'] }
 end
 
-PHOTO_PATH = File.join(File.expand_path(File.dirname(__FILE__)), 'files/photo.jpg').freeze
+PHOTO_PATH = File.expand_path('../files/photo.jpg', __FILE__).freeze
 PHOTO_ID = '6946979188'.freeze
 VIDEO_ID = '7093038981'.freeze
 SET_ID = '72157629851991663'.freeze
 USER_NSID = '67131352@N04'.freeze
+USER_USERNAME = 'Janko Marohnić'.freeze
 EXTRAS = %w[license date_upload date_taken owner_name
   icon_server original_format last_update geo tags machine_tags
   o_dims views media path_alias url_sq url_q url_t url_s url_n
@@ -97,9 +106,3 @@ class Hash
     self.dup.except!(*keys)
   end
 end
-
-class String
-  def to_file_path
-    split("::").collect { |klass| klass.split(/(?=[A-Z])/).map(&:downcase).join('_') }.join('/')
-  end
-end