flickrie 0.7.2 → 0.7.3

data/spec/fixtures/vcr_cassettes/{oauth → o_auth}/incorrect_credentials.yml

@@ -8,30 +8,30 @@ http_interactions:
       string: ""
     headers: 
       Authorization: 
-      - OAuth oauth_consumer_key="foo", oauth_nonce="f0b516bcf18b7ce5361015b2f3e16825", oauth_signature="3yBzvaPpjWcvd9MYwfFycmDwL4w%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337013923", oauth_version="1.0"
+      - OAuth oauth_consumer_key="foo", oauth_nonce="343828b763700300dc63df28dee85a7c", oauth_signature="qv48Khp9bvT4WvEhHMMbtSFCnQE%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337106972", oauth_version="1.0"
   response: 
     status: 
       code: 401
       message: 
     headers: 
       date: 
-      - Mon, 14 May 2012 16:45:23 GMT
+      - Tue, 15 May 2012 18:36:13 GMT
       p3p: 
       - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
       set-cookie: 
-      - localization=en-us%3Bus%3Bus; expires=Mon, 12-May-2014 16:45:23 GMT; path=/; domain=.flickr.com
+      - localization=en-us%3Bus%3Bus; expires=Tue, 13-May-2014 18:36:13 GMT; path=/; domain=.flickr.com
       cache-control: 
       - private
       x-served-by: 
-      - www148.flickr.mud.yahoo.com
+      - www150.flickr.mud.yahoo.com
       vary: 
       - Accept-Encoding
       content-type: 
       - text/plain;charset=UTF-8
       age: 
-      - "2"
+      - "0"
       via: 
-      - HTTP/1.1 r17.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r11.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
+      - HTTP/1.1 r39.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r12.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
       server: 
       - YTS/1.20.16
       connection: 
@@ -40,7 +40,7 @@ http_interactions:
       encoding: ASCII-8BIT
       string: oauth_problem=consumer_key_unknown
     http_version: 
-  recorded_at: Mon, 14 May 2012 16:45:24 GMT
+  recorded_at: Tue, 15 May 2012 18:36:13 GMT
 - request: 
     method: get
     uri: http://www.flickr.com/services/oauth/request_token?oauth_callback=oob
@@ -49,22 +49,22 @@ http_interactions:
       string: ""
     headers: 
       Authorization: 
-      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="fd7c73dbb8eeabcc3a3827ff05e3620c", oauth_signature="wfkELOLgWkl0DRjZVdLbg39OabQ%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337013924", oauth_version="1.0"
+      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="74d7fa04db335e2937437ae76ee1f0d7", oauth_signature="FLbia4X%2FI%2B2YNi2JOImB1aUzCiU%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337106973", oauth_version="1.0"
   response: 
     status: 
       code: 401
       message: 
     headers: 
       date: 
-      - Mon, 14 May 2012 16:45:24 GMT
+      - Tue, 15 May 2012 18:36:13 GMT
       p3p: 
       - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
       set-cookie: 
-      - localization=en-us%3Bus%3Bus; expires=Mon, 12-May-2014 16:45:24 GMT; path=/; domain=.flickr.com
+      - localization=en-us%3Bus%3Bus; expires=Tue, 13-May-2014 18:36:13 GMT; path=/; domain=.flickr.com
       cache-control: 
       - private
       x-served-by: 
-      - www214.flickr.mud.yahoo.com
+      - www43.flickr.mud.yahoo.com
       vary: 
       - Accept-Encoding
       content-type: 
@@ -72,16 +72,16 @@ http_interactions:
       age: 
       - "0"
       via: 
-      - HTTP/1.1 r44.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r20.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
+      - HTTP/1.1 r41.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r17.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
       server: 
       - YTS/1.20.16
       connection: 
       - close
     body: 
       encoding: ASCII-8BIT
-      string: oauth_problem=signature_invalid&debug_sbs=GET&http%3A%2F%2Fwww.flickr.com%2Fservices%2Foauth%2Frequest_token&oauth_callback%3Doob%26oauth_consumer_key%3DAPI_KEY%26oauth_nonce%3Dfd7c73dbb8eeabcc3a3827ff05e3620c%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1337013924%26oauth_version%3D1.0
+      string: oauth_problem=signature_invalid&debug_sbs=GET&http%3A%2F%2Fwww.flickr.com%2Fservices%2Foauth%2Frequest_token&oauth_callback%3Doob%26oauth_consumer_key%3DAPI_KEY%26oauth_nonce%3D74d7fa04db335e2937437ae76ee1f0d7%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1337106973%26oauth_version%3D1.0
     http_version: 
-  recorded_at: Mon, 14 May 2012 16:45:25 GMT
+  recorded_at: Tue, 15 May 2012 18:36:13 GMT
 - request: 
     method: get
     uri: http://www.flickr.com/services/oauth/request_token?oauth_callback=oob
@@ -90,39 +90,39 @@ http_interactions:
       string: ""
     headers: 
       Authorization: 
-      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="9c017e63fa165872fb6bdb47f67ced4c", oauth_signature="oHHbLzs%2B37XDu8X%2FZkDp7tjUuek%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337013925", oauth_version="1.0"
+      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="f281211235ee00e5e804b0bced07db86", oauth_signature="FEFxXucnkU1vqcapGXSmFFQV3RA%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337106973", oauth_version="1.0"
   response: 
     status: 
       code: 200
       message: 
     headers: 
       date: 
-      - Mon, 14 May 2012 16:45:25 GMT
+      - Tue, 15 May 2012 18:36:13 GMT
       p3p: 
       - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
       set-cookie: 
-      - localization=en-us%3Bus%3Bus; expires=Mon, 12-May-2014 16:45:25 GMT; path=/; domain=.flickr.com
+      - localization=en-us%3Bus%3Bus; expires=Tue, 13-May-2014 18:36:14 GMT; path=/; domain=.flickr.com
       cache-control: 
       - private
       x-served-by: 
-      - www86.flickr.mud.yahoo.com
+      - www197.flickr.mud.yahoo.com
       vary: 
       - Accept-Encoding
       content-type: 
       - text/plain;charset=UTF-8
       age: 
-      - "0"
+      - "3"
       via: 
-      - HTTP/1.1 r19.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r15.ycpi.dee.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
+      - HTTP/1.1 r27.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r08.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
       server: 
       - YTS/1.20.16
       connection: 
       - close
     body: 
       encoding: ASCII-8BIT
-      string: oauth_callback_confirmed=true&oauth_token=72157629726432998-b6e8086eed4dedfc&oauth_token_secret=1255246a9fb043cc
+      string: oauth_callback_confirmed=true&oauth_token=72157629743800246-00b99df825d26ba8&oauth_token_secret=c196d84eb9991116
     http_version: 
-  recorded_at: Mon, 14 May 2012 16:45:26 GMT
+  recorded_at: Tue, 15 May 2012 18:36:14 GMT
 - request: 
     method: get
     uri: http://www.flickr.com/services/oauth/access_token?oauth_verifier=foo
@@ -131,22 +131,22 @@ http_interactions:
       string: ""
     headers: 
       Authorization: 
-      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="566aea9d42357131ea898b99198db774", oauth_signature="jITn0YkQQKofllBp0m3w8kOn%2Bqg%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337013926", oauth_token="72157629726432998-b6e8086eed4dedfc", oauth_version="1.0"
+      - OAuth oauth_consumer_key="API_KEY", oauth_nonce="269c50cc0bb64d4d1a6278ba0fd444a5", oauth_signature="%2FjkXnUp9knnhzs9zhRCmUM8%2FLJo%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1337106974", oauth_token="72157629743800246-00b99df825d26ba8", oauth_version="1.0"
   response: 
     status: 
       code: 401
       message: 
     headers: 
       date: 
-      - Mon, 14 May 2012 16:45:26 GMT
+      - Tue, 15 May 2012 18:36:15 GMT
       p3p: 
       - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
       set-cookie: 
-      - localization=en-us%3Bus%3Bus; expires=Mon, 12-May-2014 16:45:26 GMT; path=/; domain=.flickr.com
+      - localization=en-us%3Bus%3Bus; expires=Tue, 13-May-2014 18:36:15 GMT; path=/; domain=.flickr.com
       cache-control: 
       - private
       x-served-by: 
-      - www131.flickr.mud.yahoo.com
+      - www111.flickr.mud.yahoo.com
       vary: 
       - Accept-Encoding
       content-type: 
@@ -154,7 +154,7 @@ http_interactions:
       age: 
       - "0"
       via: 
-      - HTTP/1.1 r46.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r08.ycpi.ams.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
+      - HTTP/1.1 r23.ycpi.mud.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ]), HTTP/1.1 r10.ycpi.ukl.yahoo.net (YahooTrafficServer/1.20.16 [cMsSf ])
       server: 
       - YTS/1.20.16
       connection: 
@@ -163,5 +163,5 @@ http_interactions:
       encoding: ASCII-8BIT
       string: oauth_problem=token_rejected
     http_version: 
-  recorded_at: Mon, 14 May 2012 16:45:26 GMT
+  recorded_at: Tue, 15 May 2012 18:36:15 GMT
 recorded_with: VCR 2.1.1

data/spec/instance_spec.rb

@@ -2,23 +2,19 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::Instance do
-  context "calling api methods" do
-    use_vcr_cassette "instance/calling_api_methods"
+  it "should be able to call API methods", :vcr, :cassette => "calling api methods" do
+    # this is to see if the client and upload_client were reset
+    Flickrie.get_photo_info(PHOTO_ID)
+    Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
+    Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
+    id = Flickrie.upload(PHOTO_PATH)
+    Flickrie.delete_photo(id)
+    Flickrie.access_token = Flickrie.access_secret = nil
 
-    it "should be able to call API methods" do
-      # this is to see if the client and upload_client were reset
-      Flickrie.get_photo_info(PHOTO_ID)
-      Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
-      Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
-      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("Janko Marohnić")
-      id = instance.upload(PHOTO_PATH)
-      instance.delete_photo(id)
-    end
+    instance = Flickrie::Instance.new(ENV['FLICKR_ACCESS_TOKEN'], ENV['FLICKR_ACCESS_SECRET'])
+    user = instance.test_login
+    user.username.should eq("Janko Marohnić")
+    id = instance.upload(PHOTO_PATH)
+    instance.delete_photo(id)
   end
 end

data/spec/license_spec.rb

@@ -1,10 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::License do
-  context "get licenses" do
-    use_vcr_cassette "license/get"
-
-    it "should have all attributes correctly set" do
+  context "get" do
+    it "should have all attributes correctly set", :vcr do
       licenses = Flickrie.get_licenses
 
       licenses.each do |license|

data/spec/media_count_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::MediaCount do
   context "get" do
-    use_vcr_cassette "media_count/get"
-
-    it "should have correctly set all attributes" 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,

data/spec/media_spec.rb

@@ -114,9 +114,7 @@ describe Flickrie::Media do
   end
 
   context "get info" do
-    use_vcr_cassette "media/get_info"
-
-    it "should have all attributes correctly set" 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,
@@ -171,9 +169,8 @@ describe Flickrie::Media do
 
   context "from set" do
     include_context "common"
-    use_vcr_cassette "media/from_set"
 
-    it "should have all attributes correctly set" do
+    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)
@@ -181,11 +178,21 @@ describe Flickrie::Media do
     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)
+      test_attribute(media, :visibility)
+    end
+  end
+
   context "public from user" do
     include_context "common"
-    use_vcr_cassette "media/public_from_user"
 
-    it "should have all attributes correctly set" do
+    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)
@@ -195,9 +202,8 @@ describe Flickrie::Media do
 
   context "search" do
     include_context "common"
-    use_vcr_cassette "media/search"
 
-    it "should have all attributes correctly set" do
+    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)
@@ -206,9 +212,7 @@ describe Flickrie::Media do
   end
 
   context "from contacts" do
-    use_vcr_cassette "media/from_contacts"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       params = {:include_self => 1, :single_photo => 1}
       [
         @flickrie.media_from_contacts(params).first,
@@ -229,9 +233,7 @@ describe Flickrie::Media do
   end
 
   context "get context" do
-    use_vcr_cassette "media/get_context"
-
-    it "should have all attributes correctly set" 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')
@@ -254,9 +256,7 @@ describe Flickrie::Media do
   end
 
   context "get exif" do
-    use_vcr_cassette "media/get_exif"
-
-    it "should get exif correctly" do
+    it "should get exif correctly", :vcr do
       [
         Flickrie.get_photo_exif(PHOTO_ID),
         Flickrie::Photo.public_new('id' => PHOTO_ID).get_exif

data/spec/oauth_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::OAuth do
   context "incorrect credentials" do
-    use_vcr_cassette "oauth/incorrect_credentials"
-
-    it "should raise exceptions" do
+    it "should raise exceptions", :vcr do
       Flickrie.api_key = "foo"
       Flickrie.shared_secret = "foo"
 

data/spec/photo_spec.rb

@@ -53,9 +53,7 @@ describe Flickrie::Photo do
   end
 
   context "get sizes" do
-    use_vcr_cassette "photo/get_sizes"
-
-    it "should have attributes correctly set" do
+    it "should have attributes correctly set", :vcr do
       [
         Flickrie.get_photo_sizes(PHOTO_ID),
         Flickrie::Photo.public_new('id' => PHOTO_ID).get_sizes
@@ -72,9 +70,7 @@ describe Flickrie::Photo do
   end
 
   context "search" do
-    use_vcr_cassette "photo/search"
-
-    it "should have all sizes available" 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)
@@ -82,9 +78,7 @@ describe Flickrie::Photo do
   end
 
   context "get info" do
-    use_vcr_cassette "photo/get_info"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       photo = Flickrie.get_photo_info(PHOTO_ID)
       photo.rotation.should eq(90)
     end

data/spec/set_spec.rb

@@ -43,9 +43,7 @@ describe Flickrie::Set do
   end
 
   context "get info" do
-    use_vcr_cassette "set/get_info"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       [
         Flickrie.get_set_info(SET_ID),
         Flickrie::Set.public_new('id' => SET_ID).get_info
@@ -57,9 +55,7 @@ describe Flickrie::Set do
   end
 
   context "from user" do
-    use_vcr_cassette "set/from_user"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       set = Flickrie.sets_from_user(USER_NSID).find { |set| set.id == SET_ID }
       test_common_attributes(set)
       set.needs_interstitial?.should be_false

data/spec/spec_helper.rb

@@ -5,18 +5,6 @@ begin
 rescue LoadError
 end
 
-VCR.configure do |config|
-  config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  config.hook_into :faraday
-  config.default_cassette_options = {
-    :record => :new_episodes,
-    :serialize_with => :syck,
-    :match_requests_on => [:method, VCR.request_matchers.uri_without_param(:api_key)]
-  }
-  config.filter_sensitive_data('API_KEY') { ENV['FLICKR_API_KEY'] }
-  config.filter_sensitive_data('ACCESS_TOKEN') { ENV['FLICKR_ACCESS_TOKEN'] }
-end
-
 module RSpecHelpers
   def test_attribute(object, attribute, hash = nil)
     expectation = hash || @attributes[attribute]
@@ -40,16 +28,42 @@ module RSpecHelpers
   end
 end
 
-RSpec.configure do |config|
-  config.extend VCR::RSpec::Macros
-  config.include RSpecHelpers
-  config.before(:all) do
+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']
     # 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'])
   end
-  config.fail_fast = true
+  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
+      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 = class_name.to_s.match(/^Flickrie::/).post_match.to_file_path
+    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.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)]
+  }
+  c.filter_sensitive_data('API_KEY') { ENV['FLICKR_API_KEY'] }
+  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
@@ -83,3 +97,9 @@ 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

data/spec/user_spec.rb

@@ -3,9 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::User do
   context "get info" do
-    use_vcr_cassette "user/get_info"
-
-    it "should have all attributes correctly set" 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
@@ -40,9 +38,7 @@ describe Flickrie::User do
   end
 
   context "find by username or email" do
-    use_vcr_cassette "user/find_by_username_or_email"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       [
         Flickrie.find_user_by_username('Janko Marohnić'),
         Flickrie.find_user_by_email('janko.marohnic@gmail.com')

data/spec/video_spec.rb

@@ -2,9 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe Flickrie::Video do
   context "get info" do
-    use_vcr_cassette "video/get_info"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       video = Flickrie.get_video_info(VIDEO_ID)
 
       video.ready?.should be_true
@@ -22,9 +20,7 @@ describe Flickrie::Video do
   end
 
   context "get sizes" do
-    use_vcr_cassette "video/get_sizes"
-
-    it "should have all attributes correctly set" do
+    it "should have all attributes correctly set", :vcr do
       [
         Flickrie.get_video_sizes(VIDEO_ID),
         Flickrie::Video.public_new('id' => VIDEO_ID).get_sizes