lentil 0.1.7 → 0.1.8

data/test/fixtures/lentil/images.yml

@@ -69,216 +69,216 @@ tres:
   win_pct: 50
 
 one:
-  description: 'one #hunttesting'
+  description: 'six #hunttesting'
   created_at: 2013-04-16 16:16:16.273698000 Z
   updated_at: 2013-04-16 16:16:16.481430000 Z
   like_votes_count: 0
-  url: http://instagram.com/p/YK-cpswMOn/
-  user: jr 
+  url: http://instagram.com/p/k5LhuktiSC/
+  user: bd
   state: 1
-  external_identifier: '435434961797956519_228379143'
-  long_url: http://distilleryimage7.s3.amazonaws.com/7deb2d9ea6ae11e28a1a22000aa81ffa_7.jpg
+  external_identifier: '664613116276253826_1128023464'
+  long_url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_8.jpg
   original_datetime: 2013-04-16 15:58:34.000000000 Z
   staff_like: true
-  moderator_id: 
-  moderated_at: 
+  moderator_id:
+  moderated_at:
   second_moderation: false
   wins_count: 5
   losses_count: 5
   win_pct: 50
   popular_score: 0
-  file_harvested_date: 
+  file_harvested_date:
   file_harvest_failed: 0
-  donor_agreement_submitted_date: 
+  donor_agreement_submitted_date:
   donor_agreement_failed: 0
   failed_file_checks: 0
-  file_last_checked: 
+  file_last_checked:
   original_metadata:
-    attribution: 
+    attribution:
     tags:
     - hunttesting
-    location: 
+    location:
     comments:
       count: 0
       data: []
-    filter: Inkwell
-    created_time: '1366127914'
-    link: http://instagram.com/p/YK-cpswMOn/
+    filter: Amaro
+    created_time: '1393448079'
+    link: http://instagram.com/p/k5LhuktiSC/
     likes:
       count: 0
       data: []
     images:
       low_resolution:
-        url: http://distilleryimage7.s3.amazonaws.com/7deb2d9ea6ae11e28a1a22000aa81ffa_6.jpg
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_6.jpg
         width: 306
         height: 306
       thumbnail:
-        url: http://distilleryimage7.s3.amazonaws.com/7deb2d9ea6ae11e28a1a22000aa81ffa_5.jpg
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_5.jpg
         width: 150
         height: 150
       standard_resolution:
-        url: http://distilleryimage7.s3.amazonaws.com/7deb2d9ea6ae11e28a1a22000aa81ffa_7.jpg
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_8.jpg
         width: 612
         height: 612
     caption:
-      created_time: '1366127959'
-      text: ! 'one #hunttesting'
+      created_time: '1393448079'
+      text: ! 'six #hunttesting'
       from:
-        username: jronallo
+        username: bddnc
         profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-        id: '228379143'
-        full_name: jronallo
-      id: '435435338345791571'
+        id: '1128023464'
+        full_name: bddnc
+      id: '664613117098338265'
     type: image
-    id: '435434961797956519_228379143'
+    id: '664613116276253826_1128023464'
     user:
-      username: jronallo
+      username: bddnc
       website: ''
       profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-      full_name: jronallo
+      full_name: bddnc
       bio: ''
-      id: '228379143'
-  
+      id: '1128023464'
+
 
 two:
-  description: 'two #hunttesting'
+  description: 'five #hunttesting'
   created_at: 2013-04-16 16:16:15.890972000 Z
   updated_at: 2013-04-16 16:16:16.097712000 Z
   like_votes_count: 0
-  url: http://instagram.com/p/YK-nyDwMO1/
-  user: jr
+  url: http://instagram.com/p/k5LdOBtiR3/
+  user: bd
   state: 0
-  external_identifier: '435435726688011189_228379143'
-  long_url: http://distilleryimage9.s3.amazonaws.com/b443124ea6ae11e286b422000a9d0dd8_7.jpg
+  external_identifier: '664612806451405943_1128023464'
+  long_url: http://distilleryimage5.s3.amazonaws.com/1679c7b09f2811e386f1127bb479206d_8.jpg
   original_metadata:
-    attribution: 
+    attribution:
     tags:
     - hunttesting
-    location: 
+    location:
     comments:
       count: 0
       data: []
-    filter: Normal
-    created_time: '1366128005'
-    link: http://instagram.com/p/YK-nyDwMO1/
+    filter: Amaro
+    created_time: '1393448042'
+    link: http://instagram.com/p/k5LdOBtiR3/
     likes:
       count: 0
       data: []
     images:
       low_resolution:
-        url: http://distilleryimage9.s3.amazonaws.com/b443124ea6ae11e286b422000a9d0dd8_6.jpg
+        url: http://distilleryimage5.s3.amazonaws.com/1679c7b09f2811e386f1127bb479206d_6.jpg
         width: 306
         height: 306
       thumbnail:
-        url: http://distilleryimage9.s3.amazonaws.com/b443124ea6ae11e286b422000a9d0dd8_5.jpg
+        url: http://distilleryimage9.s3.amazonaws.com/1679c7b09f2811e386f1127bb479206d_5.jpg
         width: 150
         height: 150
       standard_resolution:
-        url: http://distilleryimage9.s3.amazonaws.com/b443124ea6ae11e286b422000a9d0dd8_7.jpg
+        url: http://distilleryimage5.s3.amazonaws.com/1679c7b09f2811e386f1127bb479206d_8.jpg
         width: 612
         height: 612
     caption:
-      created_time: '1366128020'
-      text: ! 'two #hunttesting'
+      created_time: '1393448042'
+      text: ! 'five #hunttesting'
       from:
-        username: jronallo
+        username: bddnc
         profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-        id: '228379143'
-        full_name: jronallo
-      id: '435435854178074722'
+        id: '1128023464'
+        full_name: bddnc
+      id: '664612806879225796'
     type: image
-    id: '435435726688011189_228379143'
+    id: '664612806451405943_1128023464'
     user:
-      username: jronallo
+      username: bddnc
       website: ''
       profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-      full_name: jronallo
+      full_name: bddnc
       bio: ''
-      id: '228379143'
+      id: '1128023464'
   original_datetime: 2013-04-16 16:00:05.000000000 Z
   staff_like: false
-  moderator_id: 
-  moderated_at: 
+  moderator_id:
+  moderated_at:
   second_moderation: false
   wins_count: 0
   losses_count: 0
-  win_pct: 
+  win_pct:
   popular_score: 0
-  file_harvested_date: 
+  file_harvested_date:
   file_harvest_failed: 0
-  donor_agreement_submitted_date: 
+  donor_agreement_submitted_date:
   donor_agreement_failed: 0
   failed_file_checks: 0
-  file_last_checked: 
+  file_last_checked:
 
 
 three:
-  description: "three #hunttesting"
+  description: "four #hunttesting"
   created_at: 2013-04-16 16:16:15.526680000 Z
   updated_at: 2013-04-16 16:16:15.739221000 Z
   like_votes_count: 0
-  url: http://instagram.com/p/YK-tp6QMO9/
-  user: jr
+  url: http://instagram.com/p/k5LZPotiRv/
+  user: bd
   state: 0
-  external_identifier: '435436130255553469_228379143'
-  long_url: http://distilleryimage1.s3.amazonaws.com/d0f10e82a6ae11e28bc322000a9d0dcb_7.jpg
+  external_identifier: '664612533301552239_1128023464'
+  long_url: http://distilleryimage7.s3.amazonaws.com/fa670c909f2711e3a7fd12b201d372bb_8.jpg
   original_metadata:
-    attribution: 
+    attribution:
     tags:
     - hunttesting
-    location: 
+    location:
     comments:
       count: 0
       data: []
     filter: Normal
-    created_time: '1366128053'
-    link: http://instagram.com/p/YK-tp6QMO9/
+    created_time: '1393448009'
+    link: http://instagram.com/p/k5LZPotiRv/
     likes:
       count: 0
       data: []
     images:
       low_resolution:
-        url: http://distilleryimage1.s3.amazonaws.com/d0f10e82a6ae11e28bc322000a9d0dcb_6.jpg
+        url: http://distilleryimage7.s3.amazonaws.com/fa670c909f2711e3a7fd12b201d372bb_6.jpg
         width: 306
         height: 306
       thumbnail:
-        url: http://distilleryimage1.s3.amazonaws.com/d0f10e82a6ae11e28bc322000a9d0dcb_5.jpg
+        url: http://distilleryimage7.s3.amazonaws.com/fa670c909f2711e3a7fd12b201d372bb_5.jpg
         width: 150
         height: 150
       standard_resolution:
-        url: http://distilleryimage1.s3.amazonaws.com/d0f10e82a6ae11e28bc322000a9d0dcb_7.jpg
+        url: http://distilleryimage7.s3.amazonaws.com/fa670c909f2711e3a7fd12b201d372bb_8.jpg
         width: 612
         height: 612
     caption:
       created_time: '1366128072'
-      text: ! 'three #hunttesting'
+      text: ! 'four #hunttesting'
       from:
-        username: jronallo
+        username: bddnc
         profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-        id: '228379143'
-        full_name: jronallo
+        id: '1128023464'
+        full_name: bddnc
       id: '435436286333993072'
     type: image
-    id: '435436130255553469_228379143'
+    id: '664612533301552239_1128023464'
     user:
-      username: jronallo
+      username: bddnc
       website: ''
       profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
-      full_name: jronallo
+      full_name: bddnc
       bio: ''
-      id: '228379143'
+      id: '1128023464'
   original_datetime: 2013-04-16 16:00:53.000000000 Z
   staff_like: false
-  moderator_id: 
-  moderated_at: 
+  moderator_id:
+  moderated_at:
   second_moderation: false
   wins_count: 0
   losses_count: 0
-  win_pct: 
+  win_pct:
   popular_score: 0
-  file_harvested_date: 
+  file_harvested_date:
   file_harvest_failed: 0
-  donor_agreement_submitted_date: 
+  donor_agreement_submitted_date:
   donor_agreement_failed: 0
   failed_file_checks: 0
-  file_last_checked: 
+  file_last_checked:

data/test/functional/lentil/images_controller_test.rb

@@ -48,4 +48,9 @@ class Lentil::ImagesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should get a tiled view for iframe" do
+    get :iframe, :use_route => :lentil
+    assert_response :success
+  end
+
 end

data/test/functional/lentil/photographers_controller_test.rb

@@ -7,7 +7,7 @@ class Lentil::PhotographersControllerTest < ActionController::TestCase
   end
 
   test "should get show view" do
-    get :show, :id => lentil_users(:jr).id, :use_route => :lentil
+    get :show, :id => lentil_users(:bd).id, :use_route => :lentil
     assert_response :success
   end
 

data/test/integration/lentil/images_index_test.rb

@@ -13,12 +13,11 @@ class ImagesIndexTest < ActionDispatch::IntegrationTest
   end
 
   test "should have the titles of the images on the index page" do
-    assert page.has_content?('Love the new @snohetta_design')
-    assert page.has_content?('one')
+    assert page.has_content?('six #hunttesting')
   end
 
   test "should have usernames of image contributors" do
-    assert page.has_content?('jronallo')
+    assert page.has_content?('bd')
   end
 
   # test "should be able to like vote for an image on the index page and see vote counts" do

data/test/integration/lentil/javascript/event_tracking_battle_test.rb

@@ -1,11 +1,10 @@
 require 'test_helper'
 
 class EventTrackingBattleTest < ActionDispatch::IntegrationTest
-
   test "battle pick image" do
     VCR.use_cassette('battle_images_events') do
       browser_start
-      Lentil::ThisorthatController.stubs(:get_images).returns([lentil_images(:one), lentil_images(:uno)])
+      Lentil::ThisorthatController.any_instance.stubs(:get_images).returns([lentil_images(:dos), lentil_images(:one)])
       visit lentil.thisorthat_battle_path
       first_image = all('.battle-form').first()
       image_id = first_image['value']

data/test/integration/lentil/javascript/image_modal_test.rb

@@ -11,10 +11,10 @@ class ImageModalTest < ActionDispatch::IntegrationTest
 
   test "should see a modal when clicking on an image" do
     visit lentil.images_path
-    assert page.has_no_content?('one #hunttesting')
+    assert page.has_no_content?('six #hunttesting')
     assert page.has_no_selector?('.fancybox-image')
     all('.fancybox').first.click
-    assert page.has_content?('one #hunttesting')
+    assert page.has_content?('six #hunttesting')
     assert page.has_selector?('.fancybox-image')
   end
 end

data/test/vcr_cassettes/battle_images.yml

@@ -1,14 +1,16 @@
 ---
 http_interactions:
 - request:
-    method: head
-    uri: http://distilleryimage3.s3.amazonaws.com/644f52a02d2f11e2b55e22000a9f09fb_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
@@ -16,79 +18,98 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      X-Amz-Id-2:
-      - qh7ZA6VeLowUfAssuoKuCMHmFPnNmT2i5pFYj6vG9YZDgnVa4FyRcLWT88YUZRH4
-      X-Amz-Request-Id:
-      - CB34B0AF2064D5C1
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - application/json
       Date:
-      - Tue, 07 May 2013 14:57:26 GMT
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 15 Apr 2020 20:00:00 GMT
-      Last-Modified:
-      - Tue, 13 Nov 2012 01:13:55 GMT
-      Etag:
-      - ! '"c4f4b4b37c4e33c16c31092bd8ebf05d"'
-      Accept-Ranges:
-      - bytes
-      Content-Type:
-      - image/jpeg
-      Content-Length:
-      - '87450'
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
       Server:
-      - AmazonS3
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=e081cc0702791acd6a3fa8ff8b1a5513; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAFy8J-uIsSZp_EdCnnn; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
+      Content-Length:
+      - '249'
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: '{"provider_url":"http:\/\/instagram.com\/","media_id":"323374234042685415_31727100","title":"Bubble
+        bubble...","url":"http:\/\/distilleryimage3.ak.instagram.com\/644f52a02d2f11e2b55e22000a9f09fb_7.jpg","author_name":"cazzerson","height":612,"width":612,"version":"1.0","author_url":"http:\/\/instagram.com\/cazzerson","author_id":31727100,"type":"photo","provider_name":"Instagram"}'
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:25 GMT
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
 - request:
-    method: head
-    uri: http://distilleryimage6.ak.instagram.com/ef3c7ff0b71d11e2b1b722000a1d0aba_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/ZA1L0nINXi/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
     status:
-      code: 403
-      message: Forbidden
+      code: 404
+      message: NOT FOUND
     headers:
-      X-Amz-Request-Id:
-      - 8C9749C453F0CCA0
-      X-Amz-Id-2:
-      - y8u+O12gNGHzkhkovPHyfLzfNEUHqVrr4xr4n4zgNho2UqIF6AQ4KhD3AGq0fZSv
-      Content-Type:
-      - application/xml
-      Server:
-      - AmazonS3
       Cache-Control:
-      - max-age=129600
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - text/html; charset=utf-8
+      Date:
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 09 May 2013 02:57:26 GMT
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=c9d44bf3281ffa60168cf219fece1006; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAE6MIQcBg24mIuWY8fR; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language
       Content-Length:
-      - '1'
-      Date:
-      - Tue, 07 May 2013 14:57:26 GMT
+      - '34'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: No Media Match
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:26 GMT
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
 - request:
-    method: head
-    uri: http://distilleryimage7.s3.amazonaws.com/55dcf0ba2a8c11e29cc822000a1f96e3_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/k5LhuktiSC/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
@@ -96,40 +117,49 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      X-Amz-Id-2:
-      - 7aJgYS88E3F2XKl+jDPBOITPBjslVA78YU8GG92NQVyjojY/8Te76DndySmGhnfQ
-      X-Amz-Request-Id:
-      - 0473A9C23A7A8690
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - application/json
       Date:
-      - Tue, 07 May 2013 14:57:27 GMT
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 15 Apr 2020 20:00:00 GMT
-      Last-Modified:
-      - Fri, 09 Nov 2012 16:41:40 GMT
-      Etag:
-      - ! '"ec1196c1b6349e7e25ef2aa1d462b4e1"'
-      Accept-Ranges:
-      - bytes
-      Content-Type:
-      - image/jpeg
-      Content-Length:
-      - '84579'
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
       Server:
-      - AmazonS3
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=0433d840e863edb10666afa87b2a068b; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAH3fw8MDboIOffN0zE2; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
+      Content-Length:
+      - '245'
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: '{"provider_url":"http:\/\/instagram.com\/","media_id":"664613116276253826_1128023464","title":"six
+        #hunttesting","url":"http:\/\/distilleryimage8.ak.instagram.com\/28b09b209f2811e38e831293e346cce0_8.jpg","author_name":"bddnc","height":640,"width":640,"version":"1.0","author_url":"http:\/\/instagram.com\/bddnc","author_id":1128023464,"type":"photo","provider_name":"Instagram"}'
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:26 GMT
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
 - request:
-    method: head
-    uri: http://distilleryimage3.s3.amazonaws.com/644f52a02d2f11e2b55e22000a9f09fb_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
@@ -137,79 +167,98 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      X-Amz-Id-2:
-      - egiEhZusJOHp5tBxITJ+0yMZ0sd8E8L45BBJ514LxOeQys66xTCgme9Sh/sWed1Z
-      X-Amz-Request-Id:
-      - 950B07CB3806414A
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - application/json
       Date:
-      - Tue, 07 May 2013 14:57:27 GMT
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 15 Apr 2020 20:00:00 GMT
-      Last-Modified:
-      - Tue, 13 Nov 2012 01:13:55 GMT
-      Etag:
-      - ! '"c4f4b4b37c4e33c16c31092bd8ebf05d"'
-      Accept-Ranges:
-      - bytes
-      Content-Type:
-      - image/jpeg
-      Content-Length:
-      - '87450'
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
       Server:
-      - AmazonS3
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=55845d2b97bc7fb8c3f8f9d4d3fe9409; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAEij81IRus_AlKNWNP7; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
+      Content-Length:
+      - '249'
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: '{"provider_url":"http:\/\/instagram.com\/","media_id":"323374234042685415_31727100","title":"Bubble
+        bubble...","url":"http:\/\/distilleryimage3.ak.instagram.com\/644f52a02d2f11e2b55e22000a9f09fb_7.jpg","author_name":"cazzerson","height":612,"width":612,"version":"1.0","author_url":"http:\/\/instagram.com\/cazzerson","author_id":31727100,"type":"photo","provider_name":"Instagram"}'
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:26 GMT
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
 - request:
-    method: head
-    uri: http://distilleryimage6.ak.instagram.com/ef3c7ff0b71d11e2b1b722000a1d0aba_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/ZA1L0nINXi/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
     status:
-      code: 403
-      message: Forbidden
+      code: 404
+      message: NOT FOUND
     headers:
-      X-Amz-Request-Id:
-      - CF6B07CC1112F2AD
-      X-Amz-Id-2:
-      - WXuXnlrapSZRoDjF9z/k5aWvIsPpFsZHrEvPDTQe4djnmT2ohYhDqfaX4e7vwW/S
-      Content-Type:
-      - application/xml
-      Server:
-      - AmazonS3
       Cache-Control:
-      - max-age=129600
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - text/html; charset=utf-8
+      Date:
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 09 May 2013 02:57:26 GMT
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=d6266caf663f9909c87673d4d8f895a8; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAE-mydLNVv49vMpmJT4; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language
       Content-Length:
-      - '1'
-      Date:
-      - Tue, 07 May 2013 14:57:26 GMT
+      - '34'
       Connection:
       - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: No Media Match
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:26 GMT
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
 - request:
-    method: head
-    uri: http://distilleryimage7.s3.amazonaws.com/7deb2d9ea6ae11e28a1a22000aa81ffa_7.jpg
+    method: get
+    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R0NyCsK_xf/
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - ! '*/*'
+      - '*/*'
       User-Agent:
       - Ruby
   response:
@@ -217,29 +266,35 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      X-Amz-Id-2:
-      - ALRfjdlKJqkh4Hf6JeyIPBJoW1JWEfBsqkpLc4ivfRl5u94eO+sWZP6/R4zVxmTQ
-      X-Amz-Request-Id:
-      - DB9CFAC9A11074F3
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Language:
+      - en
+      Content-Type:
+      - application/json
       Date:
-      - Tue, 07 May 2013 14:57:27 GMT
+      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
-      - Thu, 15 Apr 2020 20:00:00 GMT
-      Last-Modified:
-      - Tue, 16 Apr 2013 15:58:35 GMT
-      Etag:
-      - ! '"2b4e035b520a465d18472ce01dfb6dfd"'
-      Accept-Ranges:
-      - bytes
-      Content-Type:
-      - image/jpeg
-      Content-Length:
-      - '87726'
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
       Server:
-      - AmazonS3
+      - nginx
+      Set-Cookie:
+      - ccode=US; Path=/
+      - csrftoken=65113997a68a232330752b7f4ecfc78e; expires=Thu, 26-Feb-2015 19:42:54
+        GMT; Max-Age=31449600; Path=/
+      - mid=Uw-VPgAEAAFdCNfvK9phYZ52i0ao; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+        Path=/
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
+      Content-Length:
+      - '243'
+      Connection:
+      - keep-alive
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: '{"provider_url":"http:\/\/instagram.com\/","media_id":"320942086917192799_244467814","title":"Tethered","url":"http:\/\/distilleryimage7.ak.instagram.com\/55dcf0ba2a8c11e29cc822000a1f96e3_7.jpg","author_name":"corylown","height":612,"width":612,"version":"1.0","author_url":"http:\/\/instagram.com\/corylown","author_id":244467814,"type":"photo","provider_name":"Instagram"}'
     http_version: 
-  recorded_at: Tue, 07 May 2013 14:57:26 GMT
-recorded_with: VCR 2.4.0
+  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
+recorded_with: VCR 2.7.0