Insert proper photographer links

lib/funkdata.rb

@@ -69,7 +69,7 @@ class App < Sinatra::Base
         end
 
         wants.html do
-          redirect to "http://rawfunkmaharishi.uk/"
+          redirect to 'http://rawfunkmaharishi.uk/'
         end
       end
     end

lib/funkdata/fetcher.rb

@@ -40,18 +40,29 @@ def self.get_thing thing
       YAML.load get([CONFIG['github']['urls']['raw'], CONFIG['github']['paths'][thing]].join('/'))
     end
 
+    def self.photographer name
+      get_photographers.select { |p| p['name'] == name }[0].delete_if { |k, v| v == {} }
+    end
+
     def self.method_missing method_name
       mname = method_name.to_s
 
       if mname[0..3] == 'get_'
         subject = mname[4..-1]
         thing = self.send(:get_thing, subject)
+
         if subject == 'videos'
           thing.each do |t|
             t['url'] = "https://vimeo.com/#{t['id']}"
           end
         end
 
+        if subject == 'pictures'
+          thing.each do |t|
+            t['photographer'] = photographer(t['photographer'])
+          end
+        end
+
         if subject == 'photographers'
           thing = thing.keys.map { |p| {'name' => p, 'website' => thing.dig(p, 'website') || {} }}
         end

spec/funkdata/photographers_data_spec.rb

@@ -5,6 +5,15 @@ module Funkdata
         expect(described_class.get_photographers).to be_an Array
         expect(described_class.get_photographers.first['name']).to eq 'kim'
       end
+
+      it 'gets a photographer', :vcr do
+        expect(described_class.photographer 'kim').to eq (
+          {
+            'name' => 'kim',
+            'website' => 'http://www.kimberlycabbott.com/'
+          }
+        )
+      end
     end
   end
 end

spec/funkdata/pictures_data_spec.rb

@@ -4,6 +4,12 @@ module Funkdata
       it 'lists the pictures', :vcr do
         expect(described_class.get_pictures).to be_an Array
         expect(described_class.get_pictures.first['date']).to eq '2015-07-06'
+        expect(described_class.get_pictures[1]['photographer']).to eq (
+          {
+            'name' => 'jane',
+            'website' => 'https://www.flickr.com/photos/cluttercup'
+          }
+        )
       end
     end
   end