flickrie 1.0.2 → 1.1.0

data/spec/flickrie/media_spec.rb

@@ -12,7 +12,6 @@ describe Flickrie::Media do
       :media_status => 'ready',
       :path_alias => nil,
       :camera => 'Canon PowerShot G12',
-      :views_count => 4,
       :comments_count => 1,
       :location => {
         :latitude => 45.807258,
@@ -84,18 +83,7 @@ describe Flickrie::Media do
       },
       :favorite? => false,
 
-      :can_comment? => false,
-      :can_add_meta? => false,
-      :can_everyone_comment? => true,
-      :can_everyone_add_meta? => false,
-
-      :can_download? => true,
-      :can_blog? => false,
-      :can_print? => false,
-      :can_share? => false,
-
       :has_people? => false,
-      :faved? => false,
       :notes => {
         :first => {
           :id => '72157629487842968',
@@ -121,24 +109,35 @@ describe Flickrie::Media do
       ].
         each do |media|
           [
-            :id, :secret, :server, :farm, :title, :description, :views_count,
+            :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?, :can_comment?, :can_add_meta?, :can_everyone_comment?,
+            :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?, :has_people?, :notes
+            :can_print?, :can_share?
           ].
-            each { |attribute| test_recursively(media, attribute) }
+            each { |attribute| media.send(attribute).should be_a_boolean }
 
-          # other
-          media.url.empty?.should be_false
-          media['id'].should eq(PHOTO_ID)
+          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
@@ -146,23 +145,26 @@ describe Flickrie::Media do
   shared_context "common" do
     def test_common_attributes(media)
       [
-        :id, :secret, :server, :farm, :title, :media_status, :views_count,
+        :id, :secret, :server, :farm, :title, :media_status,
         :geo_permissions, :machine_tags, :license, :taken_at_granularity
       ].
-        each { |attribute| test_recursively(media, attribute) }
+        each do |attribute|
+          media.send(attribute).should correspond_to(@attributes[attribute])
+        end
 
       # the incomplete ones
-      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
+      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
 
@@ -184,7 +186,7 @@ describe Flickrie::Media do
       media = Flickrie.media_from_user(USER_NSID, :extras => EXTRAS).
         find { |media| media.id == PHOTO_ID }
       test_common_attributes(media)
-      test_recursively(media, :visibility)
+      media.visibility.should correspond_to(@attributes[:visibility])
     end
   end
 
@@ -195,7 +197,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_recursively(media, :visibility)
+      media.visibility.should correspond_to(@attributes[:visibility])
     end
   end
 
@@ -206,7 +208,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_recursively(media, :visibility)
+      media.visibility.should correspond_to(@attributes[:visibility])
     end
   end
 
@@ -218,15 +220,23 @@ describe Flickrie::Media do
         Flickrie.public_media_from_user_contacts(USER_NSID, params).first
       ].
         each do |media|
-          media.id.should eq('7093101501')
-          media.secret.should eq('9337f28800')
-          media.server.should eq('7090')
-          media.farm.should eq(8)
-          media.owner.nsid.should eq(USER_NSID)
-          media.owner.username.should eq(USER_USERNAME)
-          media.title.should eq('IMG_0917')
-          test_recursively(media, :visibility)
-          media.media_status.should eq('ready')
+          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
@@ -235,22 +245,20 @@ describe Flickrie::Media do
     it "should have all attributes correctly set", :vcr do
       context = Flickrie.get_media_context(PHOTO_ID)
       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
-
-  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
+      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
 
@@ -268,4 +276,17 @@ describe Flickrie::Media do
         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/photo_spec.rb

@@ -5,7 +5,6 @@ SIZES = ['Square 75', 'Thumbnail', 'Square 150', 'Small 240', 'Small 320',
 
 describe Flickrie::Photo do
   def test_sizes(photo)
-    # TODO: simplify this
     # non-bang versions
     [
       [[photo.square(75), photo.square75],   ['Square 75', '75x75']],
@@ -59,9 +58,9 @@ describe Flickrie::Photo do
         Flickrie::Photo.public_new('id' => PHOTO_ID).get_sizes
       ].
         each do |photo|
-          photo.can_download?.should be_true
-          photo.can_blog?.should be_false
-          photo.can_print?.should be_false
+          [: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)
@@ -84,7 +83,7 @@ describe Flickrie::Photo do
     end
   end
 
-  context "blank" do
+  context "blank photo" do
     it "should have all attributes equal to nil" do
       photo = Flickrie::Photo.public_new
 

data/spec/flickrie/set_spec.rb

@@ -13,33 +13,33 @@ describe Flickrie::Set do
       :primary_media_id => PHOTO_ID,
       :primary_photo_id => PHOTO_ID,
       :primary_video_id => PHOTO_ID,
-      :views_count => 0,
       :comments_count => 0,
       :photos_count => 97,
       :videos_count => 1,
       :media_count => 98,
       :owner => {
         :nsid => USER_NSID
-      },
-      :can_comment? => false,
+      }
     }
   end
 
   def test_common_attributes(set)
     @attributes.keys.each do |attribute|
-      test_recursively(set, attribute)
+      set.send(attribute).should correspond_to(@attributes[attribute])
     end
 
-    set.photos.all? { |photo| photo.is_a?(Flickrie::Photo) }.should be_true
-    set.videos.all? { |video| video.is_a?(Flickrie::Video) }.should be_true
-    set.media.all? do |media|
-      media.is_a?(Flickrie::Photo) or media.is_a?(Flickrie::Video)
-    end.should be_true
+    set.photos.each { |object| object.should be_a_photo }
+    set.videos.each { |object| object.should be_a_video }
+    set.media.each  { |object| object.should be_a_media }
 
+    # Time
     set.created_at.should be_an_instance_of(Time)
     set.updated_at.should be_an_instance_of(Time)
 
+    # Other
     set.url.should_not be_empty
+    set.views_count.should be_a_number
+    set.can_comment?.should be_a_boolean
   end
 
   context "get info" do
@@ -48,9 +48,7 @@ describe Flickrie::Set do
         Flickrie.get_set_info(SET_ID),
         Flickrie::Set.public_new('id' => SET_ID).get_info
       ].
-        each do |set|
-          test_common_attributes(set)
-        end
+        each { |set| test_common_attributes(set) }
     end
   end
 
@@ -62,4 +60,17 @@ describe Flickrie::Set do
       set.visibility_can_see_set?.should be_true
     end
   end
+
+  context "blank set" do
+    it "should have all attributes equal to nil" do
+      attributes = Flickrie::Set.instance_methods -
+        Object.instance_methods -
+        [:photos, :videos, :media, :[], :get_info]
+      set = Flickrie::Set.public_new
+
+      attributes.each do |attribute|
+        set.send(attribute).should be_nil
+      end
+    end
+  end
 end

data/spec/flickrie/upload_client_spec.rb

@@ -35,6 +35,9 @@ describe Flickrie::UploadClient do
 
       Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
       expect { Flickrie.upload(PHOTO_PATH) }.to_not raise_error
+
+      photo = Flickrie.photos_from_user(USER_NSID).find { |photo| photo.title == "photo" }
+      Flickrie.delete_photo(photo.id)
     end
   end
 end

data/spec/flickrie/user_spec.rb

@@ -28,7 +28,7 @@ describe Flickrie::User do
       ].
         each do |user|
           @attributes.keys.each do |attribute|
-            test_recursively(user, attribute)
+            user.send(attribute).should correspond_to(@attributes[attribute])
           end
 
           [:profile_url, :mobile_url, :photos_url, :buddy_icon_url].each do |attribute|
@@ -46,13 +46,39 @@ describe Flickrie::User 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')
+        Flickrie.find_user_by_email(USER_EMAIL)
       ].
         each do |user|
-          [:id, :nsid, :username].each do |attribute|
-            test_recursively(user, attribute)
-          end
+          user.id.should == USER_NSID
+          user.nsid.should == USER_NSID
+          user.username.should == USER_USERNAME
         end
     end
   end
+
+  context "getting media" do
+    it "should get the right kind of media", :vcr do
+      user = Flickrie::User.public_new('nsid' => USER_NSID)
+      user.public_photos.each { |object| object.should be_a_photo }
+      user.public_videos.each { |object| object.should be_a_video }
+      user.public_media.each  { |object| object.should be_a_media }
+      user.photos.each { |object| object.should be_a_photo }
+      user.videos.each { |object| object.should be_a_video }
+      user.media.each  { |object| object.should be_a_media }
+    end
+  end
+
+  context "blank user" do
+    it "should have all attributes equal to nil" do
+      attributes = Flickrie::User.instance_methods -
+        Object.instance_methods -
+        [:public_photos, :public_videos, :public_media,
+         :photos, :videos, :media, :[], :get_info]
+      user = Flickrie::User.public_new
+
+      attributes.each do |attribute|
+        user.send(attribute).should be_nil
+      end
+    end
+  end
 end

data/spec/flickrie/video_spec.rb

@@ -9,9 +9,9 @@ describe Flickrie::Video do
       video.failed?.should be_false
       video.pending?.should be_false
 
-      video.duration.should eq(16)
-      video.width.should eq(352)
-      video.height.should eq(288)
+      video.duration.should == 16
+      video.width.should == 352
+      video.height.should == 288
 
       video.source_url.should be_nil
       video.download_url.should be_nil
@@ -26,9 +26,9 @@ describe Flickrie::Video do
         Flickrie::Video.public_new('id' => VIDEO_ID).get_sizes
       ].
         each do |video|
-          video.can_download?.should be_true
-          video.can_blog?.should be_false
-          video.can_blog?.should be_false
+          [:can_download?, :can_blog?, :can_print?].each do |attribute|
+            video.send(attribute).should be_a_boolean
+          end
 
           video.source_url.should_not be_empty
           video.download_url.should_not be_empty
@@ -39,14 +39,14 @@ describe Flickrie::Video do
 
   context "blank" do
     it "should have attributes equal to nil" do
+      attributes = Flickrie::Video.instance_methods -
+        Flickrie::Media.instance_methods -
+        Object.instance_methods -
+        [:get_info, :get_sizes, :[]]
       video = Flickrie::Video.public_new
-      [
-        :ready?, :failed?, :pending?, :duration, :width, :height,
-        :source_url, :download_url, :mobile_download_url
-      ].
-        each do |attribute|
-          video.send(attribute).should be_nil
-        end
+      attributes.each do |attribute|
+        video.send(attribute).should be_nil
+      end
     end
   end
 end

data/spec/flickrie_spec.rb

@@ -0,0 +1,15 @@
+describe Flickrie do
+  context "a new credential is filled in" do
+    it "should reset the client", :vcr do
+      Flickrie.api_key = nil
+      expect { Flickrie.get_licenses }.to raise_error(Flickrie::Error)
+      expect { Flickrie.upload(PHOTO_PATH) }.to raise_error(Flickrie::Error)
+      Flickrie.api_key = ENV['FLICKR_API_KEY']
+      expect { Flickrie.get_licenses }.to_not raise_error(Flickrie::Error)
+      expect { Flickrie.upload(PHOTO_PATH) }.to_not raise_error(Flickrie::Error)
+
+      photo = Flickrie.photos_from_user(USER_NSID).find { |photo| photo.title == "photo" }
+      Flickrie.delete_photo(photo.id)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,43 +1,10 @@
 # encoding: utf-8
 require 'flickrie'
 require 'vcr'
-begin
-  require 'debugger'
-rescue LoadError
-end
-
-module RSpecHelpers
-  def test_recursively(object, attribute, hash = nil)
-    expectation = hash || @attributes[attribute]
-    unless expectation.is_a?(Hash)
-      object.send(attribute).should eq(expectation)
-    else
-      iterate(object.send(attribute), expectation) do |actual, expected|
-        actual.should eq(expected)
-      end
-    end
-  end
-
-  def iterate(object, rest, &block)
-    rest.each do |key, value|
-      if value.is_a?(Hash)
-        iterate(object.send(key), value, &block)
-      else
-        yield [object.send(key), value]
-      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
+begin require 'debugger'; rescue LoadError; end
+require 'custom_matchers'
 
 RSpec.configure do |c|
-  c.include RSpecHelpers
   c.before(:all) do
     Flickrie.api_key = ENV['FLICKR_API_KEY']
     Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
@@ -46,18 +13,12 @@ RSpec.configure do |c|
   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 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
-      # the example isn't wrapped in a 'context' block
-      class_name = example.metadata[:example_group][:description_args].first.to_s
-      cassette_name = example.metadata[:cassette]
-    end
-
-    folder = to_file_path(class_name.match(/^Flickrie::/).post_match)
-    VCR.use_cassette("#{folder}/#{cassette_name}") { example.call }
+    # If you want to tag an example with :vcr, you have to wrap it in a context block
+    klass = example.metadata[:example_group][:example_group][:description_args].first
+    folder = klass.to_s.split('::').last.split(/(?=[A-Z])/).map(&:downcase).join('_')
+    subfolder = example.metadata[:example_group][:description_args].first
+    cassette_name = example.metadata[:description_args].first.match(/^should /).post_match
+    VCR.use_cassette("#{folder}/#{subfolder}/#{cassette_name}") { example.call }
   end
   c.fail_fast = true
 end
@@ -67,19 +28,21 @@ VCR.configure do |c|
   c.hook_into :faraday
   c.default_cassette_options = {
     :record => :new_episodes,
-    :serialize_with => :syck,
-    :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:api_key)]
+    :serialize_with => :syck, # So it doesn't output in binary form
+    :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:api_key)] # Don't require the API key
   }
   c.filter_sensitive_data('API_KEY') { ENV['FLICKR_API_KEY'] }
   c.filter_sensitive_data('ACCESS_TOKEN') { ENV['FLICKR_ACCESS_TOKEN'] }
 end
 
 PHOTO_PATH = File.expand_path('../files/photo.jpg', __FILE__).freeze
+MEDIA_ID = '6946979188'.freeze
 PHOTO_ID = '6946979188'.freeze
 VIDEO_ID = '7093038981'.freeze
 SET_ID = '72157629851991663'.freeze
 USER_NSID = '67131352@N04'.freeze
 USER_USERNAME = 'Janko Marohnić'.freeze
+USER_EMAIL = 'janko.marohnic@gmail.com'.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
@@ -87,7 +50,7 @@ EXTRAS = %w[license date_upload date_taken owner_name
 # for copying:
 #   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,url_m,url_z,url_c,url_l,url_o
 
-klasses = [Flickrie::Set, Flickrie::Photo, Flickrie::Video, Flickrie::User, Flickrie::Location]
+klasses = [Flickrie::Set, Flickrie::Photo, Flickrie::Video, Flickrie::Location, Flickrie::User]
 klasses.each do |klass|
   klass.instance_eval do
     def public_new(*args)