Merge 8be0970 into f5e1a09

lib/funkdata/fetcher.rb

@@ -80,9 +80,31 @@ def self.method_missing method_name
           end
         end
 
-        thing
+        cleaned_thing = []
+        thing.each do |t|
+          clean = {}
+          field_orderer(t.keys).each do |k|
+            clean[k] = t[k] if t[k]
+          end
+          cleaned_thing.push clean
+        end
+
+        cleaned_thing
       end
     end
+
+    def self.field_orderer fields
+      fields.delete 'id'
+      prime_fields = [
+        'title',
+        'date',
+        'url',
+        'license'
+      ]
+
+      remainder = fields - prime_fields
+      prime_fields + remainder
+    end
   end
 end
 

spec/funkdata/cleaned_data_spec.rb

@@ -0,0 +1,46 @@
+module Funkdata
+  describe Fetcher do
+    it 'presents the data in a consistent order', :vcr do
+      expect(described_class.get_pictures[3]).to eq (
+        {
+          'title' => 'Raw Funk Maharishi',
+          'date' => '2015-02-18',
+          'url' => 'https://www.flickr.com/photos/cluttercup/16393865760/',
+          'license' => {
+            'type' => 'Attribution-NonCommercial',
+            'url' => 'https://creativecommons.org/licenses/by-nc/2.0/'
+          },
+          'photographer' => {
+            'name' => 'jane',
+            'website' => 'https://www.flickr.com/photos/cluttercup'
+          }
+        }
+      )
+
+      expect(described_class.get_sounds[0]).to eq (
+        {
+          'title' => 'Slinky',
+          'date' => '2015-11-25',
+          'url' => 'http://soundcloud.com/rawfunkmaharishi/slinky-2',
+          'license' => {
+            'type' => 'Attribution-NonCommercial-ShareAlike',
+            'url' => 'http://creativecommons.org/licenses/by-nc-sa/4.0/'
+          },
+          'location' => 'Rogue Studios',
+          'engineer' => 'Alessio'
+        }
+      )
+
+      expect(described_class.get_videos[0]).to eq (
+      {
+        'title' => 'Vilamendhoo 2015',
+        'url' => 'https://vimeo.com/141292006',
+        'license' => {
+          'type' => 'Attribution-NonCommercial-ShareAlike',
+          'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/'
+          }
+        }
+      )
+    end
+  end
+end

spec/funkdata/videos_data_spec.rb

@@ -3,7 +3,7 @@ module Funkdata
     context 'video data' do
       it 'lists the videos', :vcr do
         expect(described_class.get_videos).to be_an Array
-        expect(described_class.get_videos.first['id']).to eq 141292006
+        expect(described_class.get_videos.first['url']).to eq 'https://vimeo.com/141292006'
       end
     end
   end