purdie 0.0.11 → 0.0.12

data/spec/helpers_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 module Purdie
   describe Bernard do
     it 'strips a scheme' do
-      expect(Purdie.strip_scheme 'http://foo.bar/stuff').to eq 'foo.bar/stuff'
-      expect(Purdie.strip_scheme 'https://bar.foo/stuff').to eq 'bar.foo/stuff'
+      expect(Purdie.strip_scheme 'http://foo.bar/stuff').to eq '//foo.bar/stuff'
+      expect(Purdie.strip_scheme 'https://bar.foo/stuff').to eq '//bar.foo/stuff'
     end
 
     it 'sanitises a URL' do
@@ -14,9 +14,10 @@ module Purdie
     it 'gets an id' do
       expect(Purdie.get_id 'http://foo.bar/654321').to eq 654321
       expect(Purdie.get_id 'https://www.youtube.com/watch?v=JCix1XW329g').to eq 'JCix1XW329g'
+      expect(Purdie.get_id 'https://www.flickr.com/photos/rawfunkmaharishi/15631338195/in/photostream/').to eq 15631338195
     end
 
-    it 'gets a basename for a class' do
+    context 'get a basename' do
       module Medeski
         module Martin
           class Wood
@@ -24,8 +25,14 @@ module Purdie
         end
       end
 
-      @mmw = Medeski::Martin::Wood.new
-      expect(Purdie.basename @mmw).to eq 'Wood'
+      it 'for a class' do
+        expect(Purdie.basename Medeski::Martin::Wood).to eq 'Wood'
+      end
+
+      it 'for an object' do
+        @mmw = Medeski::Martin::Wood.new
+        expect(Purdie.basename @mmw).to eq 'Wood'
+      end
     end
   end
 end

data/spec/license_manager_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Purdie
+  describe LicenseManager do
+    it 'returns a license' do
+      l = LicenseManager.get Purdie::Services::SoundCloud, 'cc-by-nc-sa'
+      expect(l['short_name']).to eq 'BY-NC-SA'
+      expect(l['full_name']).to eq 'Attribution-NonCommercial-ShareAlike'
+      expect(l.url).to eq 'http://creativecommons.org/licenses/by-nc-sa/4.0/'
+    end
+
+    it 'barfs on an unknown license' do
+      expect { l = LicenseManager.get Purdie::Services::Vimeo, 'fake-license' }.to raise_exception { |e|
+        expect(e).to be_a LicenseException
+        expect(e.service).to eq Purdie::Services::Vimeo
+        expect(e.name).to eq 'fake-license'
+      }
+    end
+  end
+end

data/spec/services/flickr_spec.rb

@@ -4,7 +4,7 @@ module Purdie
   module Services
     describe Flickr do
       before :each do
-        @f = Flickr.new Config.new
+        @f = Flickr.new
       end
 
       it 'distills data for a regular photo', :vcr do
@@ -22,23 +22,25 @@ photographer: kim
         )
       end
 
+      it 'licenses items correctly', :vcr do
+        sources = [
+          'https://www.flickr.com/photos/cluttercup/15950875724/',
+          'https://www.flickr.com/photos/cluttercup/16579675721/'
+        ]
+
+        sources.each do |source|
+          dist = @f.distill source
+          expect(dist['license']).to eq 'Attribution-NonCommercial'
+        end
+      end
+
       it 'ingests data for a photo without a specific photographer tag', :vcr do
-        @f.ingest 'https://www.flickr.com/photos/cluttercup/15950875724/'
-        expect(@f[0].to_yaml).to eq (
-"---
-title: Raw Funk Maharishi
-date: '2015-02-18'
-photo_page: https://www.flickr.com/photos/cluttercup/15950875724/
-photo_url: https://farm8.staticflickr.com/7398/15950875724_23d58be214_m.jpg
-license: Attribution-NonCommercial
-license_url: https://creativecommons.org/licenses/by-nc/2.0/
-photographer: jane
-"
-        )
+        @f.ingest 'https://www.flickr.com/photos/pikesley/16649739916/'
+        expect(@f[0].to_yaml).to match /photographer: sam/
       end
 
       it 'falls back to the default photographer name', :vcr do
-        expect(@f.distill('https://www.flickr.com/photos/pikesley/16649739916/')['photographer']).to eq 'pikesley'
+        expect(@f.distill('https://www.flickr.com/photos/cluttercup/15950875724/')['photographer']).to eq 'cluttercup'
       end
 
       context 'FlickRaw url_ methods' do
@@ -65,12 +67,19 @@ photographer: jane
 
       context 'resolve a set' do
         it 'resolves a set from a url', :vcr do
-          set = Flickr.resolve_set 'https://www.flickr.com/photos/pikesley/sets/72157649827363868/'
+          set = Flickr.resolve 'https://www.flickr.com/photos/pikesley/sets/72157649827363868/'
           expect(set.count).to eq 8
           expect(set[0]).to eq 'https://www.flickr.com/photos/pikesley/16252009191/'
           expect(set[7]).to eq 'https://www.flickr.com/photos/pikesley/16752239531/'
         end
       end
+
+      context 'do the local config lookups' do
+        it 'looks up the default title', :vcr do
+          @f.ingest 'https://www.flickr.com/photos/cluttercup/16393865760/'
+          expect(@f[0]['title']).to eq 'Raw Funk Maharishi'
+        end
+      end
     end
   end
 end

data/spec/services/soundcloud_spec.rb

@@ -4,7 +4,7 @@ module Purdie
   module Services
     describe SoundCloud do
       before :each do
-        @sc = SoundCloud.new Config.new
+        @sc = SoundCloud.new
       end
 
       it 'has a SoundCloud client' do
@@ -41,7 +41,7 @@ license_url: http://creativecommons.org/licenses/by-nc-sa/4.0/
 
       context 'resolve a set' do
         it 'resolves a set from a url', :vcr do
-          set = SoundCloud.resolve_set 'https://soundcloud.com/rawfunkmaharishi/sets/islington-academy-sessions'
+          set = SoundCloud.resolve 'https://soundcloud.com/rawfunkmaharishi/sets/islington-academy-sessions'
           expect(set[0]).to eq 'http://soundcloud.com/rawfunkmaharishi/hexaflexagon-1'
           expect(set[3]).to eq 'http://soundcloud.com/rawfunkmaharishi/bernard'
         end

data/spec/services/vimeo_spec.rb

@@ -4,7 +4,7 @@ module Purdie
   module Services
     describe Vimeo do
       before :each do
-        @v = Vimeo.new Config.new
+        @v = Vimeo.new
       end
 
       it 'gets a video', :vcr do
@@ -24,14 +24,14 @@ license_url: http://creativecommons.org/licenses/by-nc-sa/3.0/
       end
 
       context 'resolve an album' do
-        it 'resolves an album from a URL' do
+        it 'resolves an album from a URL', :vcr do
           # We're going to call this a set for consistency
-          set = Vimeo.resolve_set 'https://vimeo.com/album/3296736'
+          set = Vimeo.resolve 'https://vimeo.com/album/3296736'
           expect(set.count).to eq 3
           expect(set).to eq [
-            'https://vimeo.com/rawfunkmaharishi/safetyonboard',
-            'https://vimeo.com/rawfunkmaharishi/trappedinhawaii',
-            'https://vimeo.com/rawfunkmaharishi/discotheque-metamorphosis'
+            'https://vimeo.com/111356018',
+            'https://vimeo.com/110133117',
+            'https://vimeo.com/110132671'
           ]
         end
       end

data/spec/services/youtube_spec.rb

@@ -4,7 +4,7 @@ module Purdie
   module Services
     describe YouTube do
       before :each do
-        @yt = YouTube.new Config.new
+        @yt = YouTube.new
       end
 
       it 'gets a video', :vcr do
@@ -22,6 +22,19 @@ license_url: https://creativecommons.org/licenses/by/3.0/
 "
         )
       end
+
+      it 'gets the correct license', :vcr do
+        vid = @yt.distill 'https://www.youtube.com/watch?v=baQe6MoSAHw'
+        expect(vid['license']).to eq 'YouTube'
+      end
+
+      context 'resolve a playlist' do
+        it 'resolves a playlist from a shitty YouTube URL', :vcr do
+          list = YouTube.resolve 'https://www.youtube.com/playlist?list=PLuPLM2FI60-OIgFTc9YCrGgH5XWGT6znV'
+          expect(list.count).to eq 9
+          expect(list[8]).to eq 'https://youtube.com/watch?v=P842kq0bnOc'
+        end
+      end
     end
   end
 end

data/spec/source_list_spec.rb

@@ -21,14 +21,14 @@ module Purdie
 
     context 'resolve sets' do
       it 'resolves a Flickr set', :vcr do
-        resolved = SourceList.resolve_set 'https://www.flickr.com/photos/pikesley/sets/72157649827363868/'
+        resolved = SourceList.resolve 'https://www.flickr.com/photos/pikesley/sets/72157649827363868/'
         expect(resolved.count).to eq 8
         expect(resolved[0]).to eq 'https://www.flickr.com/photos/pikesley/16252009191/'
         expect(resolved[7]).to eq 'https://www.flickr.com/photos/pikesley/16752239531/'
       end
 
       it 'resolves a SoundCloud set', :vcr do
-        resolved = SourceList.resolve_set 'https://soundcloud.com/rawfunkmaharishi/sets/islington-academy-sessions'
+        resolved = SourceList.resolve 'https://soundcloud.com/rawfunkmaharishi/sets/islington-academy-sessions'
         expect(resolved.count).to eq 4
       end
 
@@ -46,8 +46,8 @@ module Purdie
         ]
         sl = SourceList.new sources
         expect(sl.count).to eq 4
-        expect(Purdie.strip_scheme sl[0]).to eq 'soundcloud.com/rawfunkmaharishi/beer-of-course-but-why'
-        expect(Purdie.strip_scheme sl[2]).to eq 'soundcloud.com/rawfunkmaharishi/junalbandi-3'
+        expect(Purdie.strip_scheme sl[0]).to eq '//soundcloud.com/rawfunkmaharishi/beer-of-course-but-why'
+        expect(Purdie.strip_scheme sl[2]).to eq '//soundcloud.com/rawfunkmaharishi/junalbandi-3'
       end
     end
 
@@ -56,9 +56,19 @@ module Purdie
       expect(sl[3]).to eq 'https://soundcloud.com/rawfunkmaharishi/funk-taxi-berlin'
     end
 
+    it 'can be initialiased from a Vimeo file' do
+      sl = SourceList.from_file 'spec/support/fixtures/vimeo.vids'
+      expect(sl[2]).to eq 'https://vimeo.com/110132671'
+    end
+
     it 'deals with comments in a source file' do
       sl = SourceList.from_file 'spec/support/fixtures/with-comments.source'
       expect(sl.count).to eq 2
     end
+
+    it 'does something sensible with an unrecognised URL' do
+      sl = SourceList.new 'http://foo.com/bar'
+      expect(sl.count).to eq 0
+    end
   end
 end

data/spec/spec_helper.rb

@@ -26,3 +26,35 @@ RSpec.configure do |config|
     FileUtils.rmdir File.join(File.dirname(__FILE__), '..', '_sources')
   end
 end
+
+$keys = [
+  'FLICKR_API_KEY',
+  'FLICKR_SECRET',
+  'SOUNDCLOUD_CLIENT_ID',
+  'VIMEO_BEARER_TOKEN',
+  'YOUTUBE_API_KEY',
+]
+
+$envs = {} unless $envs
+
+def unset_env
+  $envs = {}
+  $keys.each do |k|
+    $envs[k] = ENV[k]
+    ENV[k] = nil
+  end
+end
+
+def randomise_env
+  $envs = {}
+  $keys.each do |k|
+    $envs[k] = ENV[k]
+    ENV[k] = Random.rand(10000000).to_s(16)
+  end
+end
+
+def reset_env
+  $keys.each do |k|
+    ENV[k] = $envs[k]
+  end
+end

data/spec/support/fixtures/vimeo.vids

@@ -0,0 +1 @@
+https://vimeo.com/album/3296736

data/spec/vcr/Purdie_Services_Flickr/do_the_local_config_lookups/looks_up_the_default_title.yml

@@ -0,0 +1,123 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: photo_id=16393865760&method=flickr.photos.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="DN8QeJNxW0mn02wxYi3XqjcAahtatxTK4YaiY6XOhGU%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426624699", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 17 Mar 2015 20:38:20 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '546'
+      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"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www63.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '0'
+      Via:
+      - http/1.1 fts105.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r07.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"photo":{"id":"16393865760","secret":"bfbfc1c267","server":"7395","farm":8,"dateuploaded":"1424360186","isfavorite":0,"license":"2","safety_level":"0","rotation":0,"originalsecret":"72a64c9506","originalformat":"jpg","owner":{"nsid":"54115632@N00","username":"cluttercup","realname":"Jane
+        Dickson","location":"London, UK","iconserver":"7338","iconfarm":8,"path_alias":"cluttercup"},"title":{"_content":""},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1424360186","taken":"2015-02-18
+        16:57:45","takengranularity":"0","takenunknown":"0","lastupdate":"1424360361"},"views":"21","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/cluttercup\/16393865760\/"}]},"media":"photo"},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 17 Mar 2015 20:38:20 GMT
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: method=flickr.photos.licenses.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="A1u5RiEY00jNjSag3Dzcu%2FcIjX7pi3%2BkQ6OBmqIEq5o%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426624700", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 17 Mar 2015 20:38:20 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '314'
+      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"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www38.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '0'
+      Via:
+      - http/1.1 fts104.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r12.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"licenses":{"license":[{"id":"0","name":"All Rights Reserved","url":""},{"id":"4","name":"Attribution
+        License","url":"https:\/\/creativecommons.org\/licenses\/by\/2.0\/"},{"id":"6","name":"Attribution-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nd\/2.0\/"},{"id":"3","name":"Attribution-NonCommercial-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-nd\/2.0\/"},{"id":"2","name":"Attribution-NonCommercial
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc\/2.0\/"},{"id":"1","name":"Attribution-NonCommercial-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-sa\/2.0\/"},{"id":"5","name":"Attribution-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-sa\/2.0\/"},{"id":"7","name":"No
+        known copyright restrictions","url":"https:\/\/www.flickr.com\/commons\/usage\/"},{"id":"8","name":"United
+        States Government Work","url":"http:\/\/www.usa.gov\/copyright.shtml"}]},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 17 Mar 2015 20:38:20 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr/Purdie_Services_Flickr/falls_back_to_the_default_photographer_name.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://api.flickr.com/services/rest/
     body:
       encoding: US-ASCII
-      string: photo_id=16649739916&method=flickr.photos.getInfo&format=json&nojsoncallback=1
+      string: photo_id=15950875724&method=flickr.photos.getInfo&format=json&nojsoncallback=1
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
@@ -15,8 +15,8 @@ http_interactions:
       - FlickRaw/0.9.8
       Authorization:
       - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
-        oauth_nonce="T0%2FZj8bw3BkeQI9Qb9A3fHR745ekZp4Hx2NyoIw1HRo%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425845861", oauth_token="",
+        oauth_nonce="9ApUVUWEN7CX6OOoAVHygvril%2BNIQpWyL%2Fugm7FWgNc%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426026155", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -26,11 +26,11 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 08 Mar 2015 20:17:42 GMT
+      - Tue, 10 Mar 2015 22:22:35 GMT
       Content-Type:
       - application/json
       Content-Length:
-      - '541'
+      - '542'
       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
@@ -38,24 +38,25 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www290.flickr.bf1.yahoo.com
+      - www39.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
-      - '2'
+      - '0'
       Via:
-      - http/1.1 fts125.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r06.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts110.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r16.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
       - keep-alive
     body:
       encoding: ASCII-8BIT
-      string: '{"photo":{"id":"16649739916","secret":"a575f69e94","server":"8661","farm":9,"dateuploaded":"1425159508","isfavorite":0,"license":"1","safety_level":"0","rotation":0,"originalsecret":"e33e9d3d4a","originalformat":"jpg","owner":{"nsid":"73135567@N00","username":"pikesley","realname":"Sam","location":"London","iconserver":"5072","iconfarm":6,"path_alias":"pikesley"},"title":{"_content":"Catface"},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1425159508","taken":"2015-02-28
-        22:36:25","takengranularity":"0","takenunknown":"0","lastupdate":"1425159602"},"views":"25","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/pikesley\/16649739916\/"}]},"media":"photo"},"stat":"ok"}'
+      string: '{"photo":{"id":"15950875724","secret":"23d58be214","server":"7398","farm":8,"dateuploaded":"1424289792","isfavorite":0,"license":"2","safety_level":"0","rotation":0,"originalsecret":"24a89b0cfe","originalformat":"jpg","owner":{"nsid":"54115632@N00","username":"cluttercup","realname":"Jane
+        Dickson","location":"London, UK","iconserver":"7338","iconfarm":8,"path_alias":"cluttercup"},"title":{"_content":""},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1424289792","taken":"2015-02-18
+        16:56:20","takengranularity":"0","takenunknown":"0","lastupdate":"1424289832"},"views":"38","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/cluttercup\/15950875724\/"}]},"media":"photo"},"stat":"ok"}'
     http_version: 
-  recorded_at: Sun, 08 Mar 2015 20:17:42 GMT
+  recorded_at: Tue, 10 Mar 2015 22:22:36 GMT
 - request:
     method: post
     uri: https://api.flickr.com/services/rest/
@@ -71,8 +72,8 @@ http_interactions:
       - FlickRaw/0.9.8
       Authorization:
       - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
-        oauth_nonce="3azzVL2Y5VJi%2FSFsX2QIVsiBxNAHOVJpobxl6Q7ne9o%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425845862", oauth_token="",
+        oauth_nonce="w80y%2Fgyi1%2BQN13OPGe5gAFKR3oDy9IZl2xXg8BdSJco%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426026156", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -82,7 +83,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 08 Mar 2015 20:17:42 GMT
+      - Tue, 10 Mar 2015 22:22:36 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -94,14 +95,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www29.flickr.bf1.yahoo.com
+      - www65.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
       - '0'
       Via:
-      - http/1.1 fts113.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r06.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts122.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r15.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -118,5 +119,5 @@ http_interactions:
         known copyright restrictions","url":"https:\/\/www.flickr.com\/commons\/usage\/"},{"id":"8","name":"United
         States Government Work","url":"http:\/\/www.usa.gov\/copyright.shtml"}]},"stat":"ok"}'
     http_version: 
-  recorded_at: Sun, 08 Mar 2015 20:17:42 GMT
+  recorded_at: Tue, 10 Mar 2015 22:22:36 GMT
 recorded_with: VCR 2.9.3

data/spec/vcr/Purdie_Services_Flickr/ingests_data_for_a_photo_without_a_specific_photographer_tag.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://api.flickr.com/services/rest/
     body:
       encoding: US-ASCII
-      string: photo_id=15950875724&method=flickr.photos.getInfo&format=json&nojsoncallback=1
+      string: photo_id=16649739916&method=flickr.photos.getInfo&format=json&nojsoncallback=1
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
@@ -15,8 +15,8 @@ http_interactions:
       - FlickRaw/0.9.8
       Authorization:
       - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
-        oauth_nonce="sS%2FWvDGTDFmFWZjG2mc52eH%2F%2F%2F8QqIZCcYapDuT%2FKpE%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425845860", oauth_token="",
+        oauth_nonce="QXvZvg5zlaaj%2FTeTiJWkAWmKsoHZ5x24w4xM%2BsOq5bQ%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426026284", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -26,11 +26,11 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 08 Mar 2015 20:17:40 GMT
+      - Tue, 10 Mar 2015 22:24:45 GMT
       Content-Type:
       - application/json
       Content-Length:
-      - '542'
+      - '541'
       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
@@ -38,25 +38,24 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www7.flickr.bf1.yahoo.com
+      - www70.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
-      - '0'
+      - '2'
       Via:
-      - http/1.1 fts125.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r24.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts119.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r15.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
       - keep-alive
     body:
       encoding: ASCII-8BIT
-      string: '{"photo":{"id":"15950875724","secret":"23d58be214","server":"7398","farm":8,"dateuploaded":"1424289792","isfavorite":0,"license":"2","safety_level":"0","rotation":0,"originalsecret":"24a89b0cfe","originalformat":"jpg","owner":{"nsid":"54115632@N00","username":"cluttercup","realname":"Jane
-        Dickson","location":"London, UK","iconserver":"7338","iconfarm":8,"path_alias":"cluttercup"},"title":{"_content":""},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1424289792","taken":"2015-02-18
-        16:56:20","takengranularity":"0","takenunknown":"0","lastupdate":"1424289832"},"views":"38","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/cluttercup\/15950875724\/"}]},"media":"photo"},"stat":"ok"}'
+      string: '{"photo":{"id":"16649739916","secret":"a575f69e94","server":"8661","farm":9,"dateuploaded":"1425159508","isfavorite":0,"license":"1","safety_level":"0","rotation":0,"originalsecret":"e33e9d3d4a","originalformat":"jpg","owner":{"nsid":"73135567@N00","username":"pikesley","realname":"Sam","location":"London","iconserver":"5072","iconfarm":6,"path_alias":"pikesley"},"title":{"_content":"Catface"},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1425159508","taken":"2015-02-28
+        22:36:25","takengranularity":"0","takenunknown":"0","lastupdate":"1425159602"},"views":"25","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/pikesley\/16649739916\/"}]},"media":"photo"},"stat":"ok"}'
     http_version: 
-  recorded_at: Sun, 08 Mar 2015 20:17:40 GMT
+  recorded_at: Tue, 10 Mar 2015 22:24:45 GMT
 - request:
     method: post
     uri: https://api.flickr.com/services/rest/
@@ -72,8 +71,8 @@ http_interactions:
       - FlickRaw/0.9.8
       Authorization:
       - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
-        oauth_nonce="boov2Wa6DkpsQqDjok%2Fv7VCptew%2FiegvEBwN%2FeTQHIc%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425845860", oauth_token="",
+        oauth_nonce="P87mENs3jhXehfeaOtD7W2XUg%2FL4Di1eHRq3J59LftY%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1426026285", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -83,7 +82,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 08 Mar 2015 20:17:41 GMT
+      - Tue, 10 Mar 2015 22:24:45 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -95,14 +94,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www348.flickr.bf1.yahoo.com
+      - www296.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
-      - '2'
+      - '0'
       Via:
-      - http/1.1 fts108.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r06.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts110.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r16.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -119,5 +118,5 @@ http_interactions:
         known copyright restrictions","url":"https:\/\/www.flickr.com\/commons\/usage\/"},{"id":"8","name":"United
         States Government Work","url":"http:\/\/www.usa.gov\/copyright.shtml"}]},"stat":"ok"}'
     http_version: 
-  recorded_at: Sun, 08 Mar 2015 20:17:41 GMT
+  recorded_at: Tue, 10 Mar 2015 22:24:45 GMT
 recorded_with: VCR 2.9.3