purdie 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb654a275f2bdd4ec1639b56b9da200c275b23b8
-  data.tar.gz: 87a9eac82f83c0d9040881a681d47195b0dc7edc
+  metadata.gz: 6314b14d1a49792e8ddba81c1b032a9808acf82b
+  data.tar.gz: c0148ec17e50269e87b1c50d5d3d07b2d671dfa4
 SHA512:
-  metadata.gz: 8b3f745cf82ad61dbc61c0479f0d99e1a32fa39d10b8e8259b4faff2191b12d2baa1d2f02f663c23122a5da9e96d6a15be2b36150717bdd4c770d16f7651d1f9
-  data.tar.gz: 82050344fe0a0138aa776ca5ce2e82b7c194eab50532af8330b7de190b9c8ad5698884cedf976527ac41594a76695437f856fcb6bd2d1b2af59817693072361c
+  metadata.gz: 033cdf84d4c8c35bdb4fad4c8ce8cb9835b7ad8b0a0abf3c5d1474913b82d4a00aa982d54ef6d386d7835dd7154f835c5d117a4429bc8d6bca90595f2da53fea
+  data.tar.gz: 9b40ec18044f0e25e7937381844b306ea2075972059dc74e92de97e880377eacc7fe96a33ffc52fbb09ecfedc899622021aa08b10c094ac03157eaa0a8a16c8f

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .env
+cruft.rb

data/cruft.rb

@@ -1,9 +1,10 @@
+require 'active_support/inflector'
+
 class Thing
   def hello
     puts "I am a #{self.class.name}"
   end
 end
 
-Thing.new.hello
-
-t = "Thing"
+t = "Thing".constantize.new
+t.hello

data/lib/purdie/bernard.rb

@@ -15,51 +15,23 @@ module Purdie
     end
 
     def fetch
-      s = Purdie::Services::SoundCloud.new @config
-      soundclouds = []
-
-      f = Purdie::Services::Flickr.new @config
-      flickrs = []
-
-      v = Purdie::Services::Vimeo.new @config
-      vimeos = []
+      services = {}
+      @config['services'].each do |s|
+        services[s[0].downcase.to_sym] = "Purdie::Services::#{s[0]}".constantize.new(@config)
+      end
 
       @sources.each do |source|
-        lines = File.readlines source
-        lines.each do |line|
-          print "Processing #{line.strip}... "
-          case line
-            when /soundcloud/
-              soundclouds.push s.distill line
-
-            when /flickr/
-              flickrs.push f.distill line
+        File.readlines(source).each do |line|
+          next if line[0] == '#'
 
-            when /vimeo/
-              vimeos.push v.distill line
-          end
+          print "Processing #{line.strip}... "
+          services[services.keys.select{ |s| line =~ /#{s.to_s}/ }[0]].ingest line
           puts 'done'
         end
       end
 
-      FileUtils.mkdir_p @config['output-dir']
-
-      if soundclouds[0]
-        sf = File.open "#{@config['output-dir']}/#{@config['services']['SoundCloud']['output-file']}", 'w'
-        sf.write soundclouds.to_yaml
-        sf.close
-      end
-
-      if flickrs[0]
-        ff = File.open "#{@config['output-dir']}/#{@config['services']['Flickr']['output-file']}", 'w'
-        ff.write flickrs.to_yaml
-        ff.close
-      end
-
-      if vimeos[0]
-        vf = File.open "#{@config['output-dir']}/#{@config['services']['Vimeo']['output-file']}", 'w'
-        vf.write vimeos.to_yaml
-        vf.close
+      services.each_key do |k|
+        services[k].write
       end
     end
   end

data/lib/purdie/ingester.rb

@@ -0,0 +1,29 @@
+module Purdie
+  module Ingester
+    def ingest url
+      @items.push distill url
+    end
+
+    def [] key
+      @items[key]
+    end
+
+    def has_items?
+      @items.count > 0
+    end
+
+    def to_yaml
+      @items.to_yaml
+    end
+
+    def write
+      if self.has_items?
+        FileUtils.mkdir_p @config['output-dir']
+
+        File.open "#{@config['output-dir']}/#{@config['services'][self.class.name.split('::')[-1]]['output-file']}", 'w' do |f|
+          f.write self.to_yaml
+        end
+      end
+    end
+  end
+end

data/lib/purdie/services/flickr.rb

@@ -1,24 +1,26 @@
 require 'purdie'
-require 'flickraw-cached'
 
 Dotenv.load
 
 module Purdie
   module Services
     class Flickr
+      include Purdie::Ingester
+
       def initialize config
         @config = config
+        @items = []
 
         FlickRaw.api_key = ENV['FLICKR_API_KEY']
         FlickRaw.shared_secret = ENV['FLICKR_SECRET']
       end
 
-      def get_photo url
-        url.strip!
-        url = url[0..-2] if url[-1] == '/'
-        id = url.split('/')[-1].to_i
+      def licenses
+        @licenses ||= flickr.photos.licenses.getInfo
+      end
 
-        flickr.photos.getInfo(photo_id: id)
+      def get_photo url
+        flickr.photos.getInfo photo_id: Purdie.get_id(url)
       end
 
       def distill url
@@ -31,8 +33,7 @@ module Purdie
         results['photo_page'] = photo['urls'][0]['_content']
         results['photo_url'] = FlickRaw.url_m(photo)
 
-        @licenses = flickr.photos.licenses.getInfo
-        license = @licenses.select {|l| l['id'] == photo['license']}[0]
+        license = licenses.select {|l| l['id'] == photo['license']}[0]
         results['license'] = license['name'].split(' License')[0]
         results['license_url'] = license['url']
 

data/lib/purdie/services/soundcloud.rb

@@ -5,13 +5,16 @@ Dotenv.load
 module Purdie
   module Services
     class SoundCloud
+      include Purdie::Ingester
+
       def initialize config
         @config = config
+        @items = []
       end
 
       def all_tracks
         @all_tracks ||= begin
-          url = "#{@config['services']['SoundCloud']['host']}/users/#{ENV['SOUNDCLOUD_USER_ID']}/tracks?client_id=#{ENV['SOUNDCLOUD_CLIENT_ID']}"
+          url = "#{@config['services'][self.class.name.split('::')[-1]]['host']}/users/#{ENV['SOUNDCLOUD_USER_ID']}/tracks?client_id=#{ENV['SOUNDCLOUD_CLIENT_ID']}"
           response = HTTParty.get url
           JSON.parse response.body
         end

data/lib/purdie/services/vimeo.rb

@@ -5,16 +5,17 @@ Dotenv.load
 module Purdie
   module Services
     class Vimeo
+      include Purdie::Ingester
+      
       def initialize config
         @config = config
+        @items = []
       end
 
       def get_video url
-        url.strip!
-        url = url[0..-2] if url[-1] == '/'
-        @id = url.split('/')[-1].to_i
+        @id = Purdie.get_id url
 
-        target = "#{@config['services']['Vimeo']['host']}/videos/#{@id}"
+        target = "#{@config['services'][self.class.name.split('::')[-1]]['host']}/videos/#{@id}"
         headers = {
           'Authorization' => "bearer #{ENV['VIMEO_BEARER_TOKEN']}",
           'Accept' => 'application/json'

data/lib/purdie/version.rb

@@ -1,3 +1,3 @@
 module Purdie
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/purdie.rb

@@ -3,10 +3,13 @@ require 'yaml'
 require 'deep_merge'
 require 'httparty'
 require 'dotenv'
+require 'flickraw-cached'
+require 'active_support/inflector'
 
 require 'purdie/version'
 require 'purdie/bernard'
 require 'purdie/config'
+require 'purdie/ingester'
 
 require 'purdie/services/soundcloud'
 require 'purdie/services/flickr'
@@ -16,4 +19,15 @@ module Purdie
   def Purdie.strip_scheme url
     url.match(/http[s]?:\/\/(.*)/)[1]
   end
+
+  def Purdie.sanitise_url url
+    url.strip!
+    url = url[0..-2] if url[-1] == '/'
+
+    url
+  end
+
+  def Purdie.get_id url
+    Purdie.sanitise_url(url).split('/')[-1].to_i
+  end
 end

data/purdie.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deep_merge', '~> 1.0'
   spec.add_dependency 'dotenv', '~> 1.0'
   spec.add_dependency 'flickraw-cached', '= 20120701'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/spec/purdie_spec.rb

@@ -11,5 +11,13 @@ module Purdie
       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
+      expect(Purdie.sanitise_url 'http://foo.bar/stuff/').to eq 'http://foo.bar/stuff'
+    end
+
+    it 'gets an id' do
+      expect(Purdie.get_id 'http://foo.bar/654321').to eq 654321
+    end
   end
 end

data/spec/services/flickr_spec.rb

@@ -19,8 +19,9 @@ module Purdie
         })
       end
 
-      it 'distills data for a photo without a specific photographer tag', :vcr do
-        expect(@f.distill 'https://www.flickr.com/photos/cluttercup/15950875724/').to eq ({
+      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 eq ({
           "title"=>"Raw Funk Maharishi",
           "date"=>"2015-02-18",
           "photo_page"=>"https://www.flickr.com/photos/cluttercup/15950875724/",

data/spec/services/soundcloud_spec.rb

@@ -28,9 +28,9 @@ module Purdie
           "license_url"=>"http://creativecommons.org/licenses/by-nc-sa/4.0/"})
       end
 
-      it 'deals with a troublesome bawbag', :vcr do
-        distilld = @sc.distill 'https://soundcloud.com/rawfunkmaharishi/bernard'
-        expect(distilld).to eq({
+      it 'ingests a track', :vcr do
+        @sc.ingest 'https://soundcloud.com/rawfunkmaharishi/bernard'
+        expect(@sc[0]).to eq({
           "title"=>"Bernard",
           "id"=>192841052,
           "location"=>"Islington Academy",

data/spec/services/vimeo_spec.rb

@@ -11,8 +11,9 @@ module Purdie
         expect(@v.get_video 'https://vimeo.com/117102891').to be_a Hash
       end
 
-      it 'distills a video', :vcr do
-        expect(@v.distill 'https://vimeo.com/117102891').to eq({
+      it 'ingests a video', :vcr do
+        @v.ingest 'https://vimeo.com/117102891'
+        expect(@v[0]).to eq({
           "title"=>"Bernard",
           "id"=>117102891,
           "license"=>"Attribution-NonCommercial-ShareAlike",

data/spec/vcr/Purdie_Services_Flickr/distills_data_for_a_regular_photo.yml

@@ -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="VVYdZIrfyfpFHuMOqg2BA%2Bisgir1ml4%2B%2FFFmDO3gr14%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416098", oauth_token="",
+        oauth_nonce="V1Kr4%2B%2B5DuKytgeoW5%2FxA62qRAb75bpRdBhp3nqEuSI%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422845", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -26,7 +26,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Tue, 03 Mar 2015 20:54:58 GMT
+      - Tue, 03 Mar 2015 22:47:25 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -38,13 +38,13 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www319.flickr.bf1.yahoo.com
+      - www243.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 fts101.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
         http/1.1 r07.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
@@ -58,7 +58,7 @@ http_interactions:
         15:54:24","takengranularity":"0","takenunknown":"0","lastupdate":"1416111853"},"views":"92","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":[{"id":"128898522-15631479625-1422028","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"the
         comedy","_content":"thecomedy","machine_tag":0},{"id":"128898522-15631479625-17975","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"gigs","_content":"gigs","machine_tag":0},{"id":"128898522-15631479625-228989594","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"photographer:kim","_content":"photographerkim","machine_tag":0}]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/rawfunkmaharishi\/15631479625\/"}]},"media":"photo"},"stat":"ok"}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 20:54:58 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:25 GMT
 - request:
     method: post
     uri: https://api.flickr.com/services/rest/
@@ -74,8 +74,8 @@ http_interactions:
       - FlickRaw/0.9.8
       Authorization:
       - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
-        oauth_nonce="POoToL2%2BHBEVSE1Lt50VRY9qCMAlqvJ9oJpBo9JAzZE%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416098", oauth_token="",
+        oauth_nonce="suO%2BYgwuYjwuvcncWHF82uBNLN24OqTrmocpEWQRZe8%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422845", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -85,7 +85,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Tue, 03 Mar 2015 20:54:59 GMT
+      - Tue, 03 Mar 2015 22:47:26 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -97,14 +97,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www295.flickr.bf1.yahoo.com
+      - www41.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
       - '0'
       Via:
-      - http/1.1 fts122.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r19.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts121.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r09.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -121,5 +121,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: Tue, 03 Mar 2015 20:54:59 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:26 GMT
 recorded_with: VCR 2.9.3

data/spec/vcr/Purdie_Services_Flickr/falls_back_to_the_default_photographer_name.yml

@@ -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="6Myoiw%2BiAA7g2sP4Z5tnoU7%2B9hR%2FdqtMPx6eFQLK%2F1I%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425307190", oauth_token="",
+        oauth_nonce="Wc2tv7NmVQhpvNXeGqIdotmU8Sr5wuD0pnvoeFYoxnk%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422843", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -26,7 +26,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 02 Mar 2015 14:39:59 GMT
+      - Tue, 03 Mar 2015 22:47:24 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -38,14 +38,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www30.flickr.bf1.yahoo.com
+      - www256.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
-      - '0'
+      - '2'
       Via:
-      - http/1.1 fts113.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r15.ycpi.dea.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts112.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r14.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -53,9 +53,9 @@ http_interactions:
     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":"19","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"}'
+        22:36:25","takengranularity":"0","takenunknown":"0","lastupdate":"1425159602"},"views":"24","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: Mon, 02 Mar 2015 14:39:59 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:24 GMT
 - request:
     method: post
     uri: https://api.flickr.com/services/rest/
@@ -71,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="2T5dLPn6PimygG664wjU5l7XkhPrU0ceUD3z53FpGZs%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425307199", oauth_token="",
+        oauth_nonce="Ihq0IzNChUshX474Cl9Rkdl03oLjmlyALBalVGSFzXk%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422844", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -82,7 +82,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 02 Mar 2015 14:39:59 GMT
+      - Tue, 03 Mar 2015 22:47:24 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -94,14 +94,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www304.flickr.bf1.yahoo.com
+      - www26.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
       - '0'
       Via:
-      - http/1.1 fts117.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r12.ycpi.dea.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts120.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r14.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -118,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: Mon, 02 Mar 2015 14:39:59 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:24 GMT
 recorded_with: VCR 2.9.3

data/spec/vcr/Purdie_Services_Flickr/{distills_data_for_a_photo_without_a_specific_photographer_tag.yml → ingests_data_for_a_photo_without_a_specific_photographer_tag.yml}

@@ -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="zeLROUaoZ6bzHPl1DdzMUvDMPR3YjSprpYdFxtfoklU%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416099", oauth_token="",
+        oauth_nonce="CKcZOZ7BxeocCr%2F1yj2R3KzYmdcDcn27JCwGbuHGShk%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422844", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -26,7 +26,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Tue, 03 Mar 2015 20:54:59 GMT
+      - Tue, 03 Mar 2015 22:47:24 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -38,7 +38,7 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www22.flickr.bf1.yahoo.com
+      - www55.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
@@ -56,7 +56,7 @@ http_interactions:
         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":"37","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: Tue, 03 Mar 2015 20:54:59 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:24 GMT
 - request:
     method: post
     uri: https://api.flickr.com/services/rest/
@@ -72,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="VY2qScign6PYW0Ro7fZX%2BkSmyRBQKejSHNZR%2B5rYl3I%3D", oauth_signature="<FLICKR_SECRET>%26",
-        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416099", oauth_token="",
+        oauth_nonce="ETyAm8OsxWXkgjtBML1%2FeNzpZUH2ElmvCB9kksmzlsk%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425422844", oauth_token="",
         oauth_version="1.0"
       Content-Type:
       - application/x-www-form-urlencoded
@@ -83,7 +83,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Tue, 03 Mar 2015 20:55:00 GMT
+      - Tue, 03 Mar 2015 22:47:25 GMT
       Content-Type:
       - application/json
       Content-Length:
@@ -95,14 +95,14 @@ http_interactions:
       Cache-Control:
       - private
       X-Served-By:
-      - www252.flickr.bf1.yahoo.com
+      - www261.flickr.bf1.yahoo.com
       Vary:
       - Accept-Encoding
       Age:
       - '2'
       Via:
-      - http/1.1 fts123.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
-        http/1.1 r17.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      - http/1.1 fts103.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r07.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
       Server:
       - ATS
       Connection:
@@ -119,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: Tue, 03 Mar 2015 20:55:00 GMT
+  recorded_at: Tue, 03 Mar 2015 22:47:25 GMT
 recorded_with: VCR 2.9.3