lentil 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855952ce24fa3466918cbc10af3fda79a022938d
-  data.tar.gz: 60cea752bc2402326b4f6b8bc3ce24a781133a9b
+  metadata.gz: 97465eeca8fbdaaa274f0202ff41703550717f74
+  data.tar.gz: 1bf43a3507e0ea9be6d0d97873019b3afe1905c2
 SHA512:
-  metadata.gz: 2aa0c1e76c081f7a569fd3bad3a1eb0f90249da556ddd6f30c7e0aaa6b8811994f4f009672f19af8d203c656bca5b00e89b31177bb14d40b7ef303c3900cf497
-  data.tar.gz: 945f99687061485de682bc5fdfadb2bc08e7d154892a46d84be10f3ec41d2261c3e62ceb67613b4852463adf408df66e11235a6e674c0e755b6446b46bebf716
+  metadata.gz: e3527f957cf817df95f4a50d87177f83ff28a15690ba31b5960360563a6c908e867747b240b30f4fdcb7c2657f7431518e272669a1fd5d5dd5b7fef557caa25a
+  data.tar.gz: 1fcc672f9e3b5b5d323bb75d484a9cb52005ae07f45113baacafb1d55d97c02ebf905c2f12185ef9d5a57b10ce94108136269325b3ab0e2507a424a57120e916

data/README.md

@@ -47,6 +47,10 @@ bundle exec rails server
 
 Visit <http://localhost:3000>
 
+## Upgrading
+
+You may need to run `bundle exec rake lentil:install:migrations` to incorporate any new database migration files.
+
 ## Harvest Images
 
 - You will need to define your `instagram_client_id` and `instagram_client_secret` in `config/lentil_config.yml`. You can generate these strings by creating an [Instagram API](http://instagram.com/developer) client for your application.
@@ -223,8 +227,10 @@ Submit a GitHub issue or contact lentil@lists.ncsu.edu.
 
 * Jason Casden
 * Bret Davidson
+* Aniket Lawande
 * Cory Lown
 * Jason Ronallo
+* Heidi Tebbe
 
 ## Additional project team members
 

data/app/assets/javascripts/lentil/addfancybox.js

@@ -84,6 +84,7 @@ function addfancybox() {
             title   : { type : 'inside' },
             overlay : { locked : false }
         },
+        aspectRatio : true,
         afterLoad: function(current, previous) {
 
           // pushing base url so that back/close returns to image gallery

data/app/models/lentil/image.rb

@@ -35,8 +35,8 @@
 class Lentil::Image < ActiveRecord::Base
   attr_accessible :description, :title, :user_id, :state, :staff_like, :url, :long_url, :external_identifier,
                   :original_datetime, :popular_score, :taggings, :tag_id, :moderator, :moderated_at, :second_moderation,
-                  :do_not_request_donation, :donor_agreement_rejected, :media_type, :video_url
-  
+                  :do_not_request_donation, :donor_agreement_rejected, :media_type, :video_url, :suppressed
+
   attr_protected  :original_metadata
   
   has_many :won_battles, :class_name => "Battle"
@@ -84,6 +84,10 @@ class Lentil::Image < ActiveRecord::Base
   end
 
   def self.approved
+    where(state: self::States[:approved]).where(:suppressed => false)
+  end
+
+  def self.approved_all
     where(state: self::States[:approved])
   end
 

data/app/views/admin/lentil_images/_moderation_form_body.html.erb

@@ -12,6 +12,7 @@
         <% if action?("moderate_passed")%>
           <th>Moderator</th>
         <% end %>
+        <th>Suppressed</th>
         <th>Status</th>
       </tr>
     </thead>
@@ -38,6 +39,7 @@
             <% if action?("moderate_passed")%>
               <td><%= image.moderator.email %></td>
             <% end %>
+            <td><%= f.input :suppressed, :label => "Suppressed", :wrapper_html => { :class => "moderation_checkbox" } %></td>
             <td><%= f.input :state, :label => false, :as => :radio, :collection => Lentil::Image::States, :wrapper_html => { :class => "moderation_radio" } %></td>
         <% end -%>
       </tr>
@@ -50,4 +52,4 @@
   <% if params[:action] != "update_image" %>
     <div class="pagination"><%= paginate @images %></div>
   <% end %>
-</div>
+</div>

data/db/migrate/20150311004606_add_suppressed_to_images.rb

@@ -0,0 +1,5 @@
+class AddSuppressedToImages < ActiveRecord::Migration
+  def change
+    add_column :lentil_images, :suppressed, :boolean, :default => false
+  end
+end

data/db/migrate/20150422123522_add_indexes_to_images.rb

@@ -0,0 +1,15 @@
+class AddIndexesToImages < ActiveRecord::Migration
+  def change
+    add_index :lentil_images, :user_id
+    add_index :lentil_images, :state
+    add_index :lentil_images, :created_at
+    add_index :lentil_images, :updated_at
+    add_index :lentil_images, :staff_like
+    add_index :lentil_images, :original_datetime
+    add_index :lentil_images, :file_last_checked
+    add_index :lentil_images, :failed_file_checks
+    add_index :lentil_images, :do_not_request_donation
+    add_index :lentil_images, :last_donor_agreement_failure_date
+    add_index :lentil_images, :suppressed
+  end
+end

data/lib/lentil/admin/images.rb

@@ -6,6 +6,7 @@ if defined?(ActiveAdmin)
     config.per_page = 10
 
     filter :state, :as => :select, :collection => proc { Lentil::Image::States }
+    filter :suppressed
     filter :media_type, :as => :select
     filter :user_user_name, :as => :string, :label => "Username"
     filter :user_full_name, :as => :string, :label => "Full Name"
@@ -60,6 +61,7 @@ if defined?(ActiveAdmin)
         end
       end
       column "Score", :popular_score
+      column :suppressed
       column :state do |image|
         image.state_name
       end
@@ -92,6 +94,7 @@ if defined?(ActiveAdmin)
         row :do_not_request_donation
         row :donor_agreement_submitted_date
         row :file_harvested_date
+        row :suppressed
         row :state do
           image.state_name
         end
@@ -134,7 +137,8 @@ if defined?(ActiveAdmin)
           taggings = new_taggings + taggings_to_keep
 
           image.update_attributes!(:state => image_params['state'], :taggings => taggings, :staff_like => image_params['staff_like'],
-            :moderator => current_admin_user, :moderated_at => DateTime.now, :second_moderation => second_moderation, :do_not_request_donation => image_params['do_not_request_donation'])
+            :moderator => current_admin_user, :moderated_at => DateTime.now, :second_moderation => second_moderation,
+            :do_not_request_donation => image_params['do_not_request_donation'], :suppressed => image_params['suppressed'])
         end
       end
     end

data/lib/lentil/instagram_harvester.rb

@@ -54,30 +54,6 @@ module Lentil
       Instagram.tag_recent_media(tag, :count=>100)
     end
 
-    def fetch_recent_images_by_tag_with_args(tag = nil, args = {:count=>100})
-      configure_connection
-      tag ||= Lentil::Engine::APP_CONFIG["default_image_search_tag"]
-      Instagram.tag_recent_media(tag, args)
-    end
-
-    def recursive_fetch(tag=nil, max_tag_id=nil, total=0)
-      case max_tag_id
-      when nil
-        instagram_metadata = fetch_recent_images_by_tag_with_args(tag)
-      else
-        instagram_metadata = fetch_recent_images_by_tag_with_args(tag, {:max_tag_id=>max_tag_id})
-      end
-      total += save_instagram_load(instagram_metadata).size
-      next_max_id = instagram_metadata.pagination.next_max_id
-      case next_max_id
-      when nil
-        puts "nil next_max_id. Previous next_max_id: " + max_tag_id.to_s
-      else
-        subtotal = recursive_fetch(tag, next_max_id, total)
-        total += subtotal.nil? ? 0 : subtotal
-      end
-      total
-    end
 
     # Queries the Instagram API for the image metadata associated with a given ID.
     #
@@ -159,9 +135,7 @@ module Lentil
         :media_type => image_data[:media_type]
       })
 
-      # This is a temporary fix for a bug in the Hashie to_hash method.
-      # It's fixed in master and should be in the next release (>1.2.0).
-      image_record.original_metadata = JSON.parse(image_data[:original_metadata].to_json)
+      image_record.original_metadata = image_data[:original_metadata].to_hash
 
       # Default to "All Rights Reserved" until we find out more about licenses
       # FIXME: Set the default license in the app config

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/tasks/image_services.rake

@@ -60,7 +60,7 @@ namespace :lentil do
           raise "Image file already exists, will not overwrite: #{image_file_path}" if File.exist?(image_file_path)
 
           image_data = harvester.harvest_image_data(image)
-          
+
           File.open(image_file_path, "wb") do |f|
             f.write image_data
           end
@@ -72,7 +72,7 @@ namespace :lentil do
               f.write video_data
             end
           end
-          
+
           image.file_harvested_date = DateTime.now
           image.save
           puts "Harvested image #{image.id}, #{image_file_path}"
@@ -144,7 +144,7 @@ namespace :lentil do
         end
       end
     end
-    
+
     desc "Get video urls from videos previously harvested"
     task :restore_videos, [:image_service] => :environment do |t, args|
       args.with_defaults(:image_service => 'Instagram')
@@ -153,10 +153,10 @@ namespace :lentil do
 
       lentilService = Lentil::Service.unscoped.where(:name => args[:image_service]).first
       numUpdated = 0;
-      lentilService.images.unscoped.each do |image|
+      lentilService.images.unscoped.find_each do |image|
         #Skip if media type already known i.e. was properly harvested
         next if !image.media_type.blank?
-        
+
         meta = image.original_metadata
         obj = YAML.load(meta)
         type = obj["type"]
@@ -175,7 +175,7 @@ namespace :lentil do
       end
       puts numUpdated.to_s + " record(s) updated"
     end
-    
+
     desc "Dump image metadata for archiving"
     task :dump_metadata, [:image_service, :base_directory] => :environment do |t, args|
       args.with_defaults(:image_service => 'Instagram')
@@ -184,7 +184,7 @@ namespace :lentil do
 
       lentilService = Lentil::Service.unscoped.where(:name => args[:image_service]).first
       numArchived = 0;
-      lentilService.images.unscoped.each do |image|
+      lentilService.images.unscoped.find_each do |image|
         begin
           raise "Destination directory does not exist or is not a directory: #{base_dir}" unless File.directory?(base_dir)
 
@@ -199,24 +199,20 @@ namespace :lentil do
           Rails.logger.error e.message
           raise e
         end
-      
-        @jsonobj = JSON.parse(image.to_json)
-        @jsonobj.delete("id")
-        @jsonobj["tags"] = JSON.parse(image.tags.to_json)
-        @jsonobj["licenses"] = JSON.parse(image.licenses.to_json)
-        @jsonobj["licenses"].each do |lic|
-          lic.delete("id")
-        end
-        
-        @jsonobj["like_votes"] = JSON.parse(image.like_votes.to_json)
-        @jsonobj["flags"] = JSON.parse(image.flags.to_json)
-        
-        @jsonobj["service"] = JSON.parse(image.service.to_json).except("id")
-        @jsonobj["user"] = JSON.parse(image.user.to_json).except("id", "service_id")
-        
+
+        jsonobj = image.serializable_hash
+        jsonobj["tags"] = image.tags.all
+        jsonobj["licenses"] = image.licenses.all
+
+        jsonobj["like_votes"] = image.like_votes.all
+        jsonobj["flags"] = image.flags.all
+
+        jsonobj["service"] = image.service
+        jsonobj["user"] = image.user
+
         image_file_path += "/#{image.external_identifier}.json"
         File.open(image_file_path, "w") do |f|
-          f.write @jsonobj.to_json
+          f.write jsonobj.to_json
           numArchived += 1
         end
       end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141106172834) do
+ActiveRecord::Schema.define(:version => 20150422123522) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -92,10 +92,22 @@ ActiveRecord::Schema.define(:version => 20141106172834) do
     t.datetime "last_donor_agreement_failure_date"
     t.string   "media_type"
     t.string   "video_url"
+    t.boolean  "suppressed",                        :default => false
   end
 
+  add_index "lentil_images", ["created_at"], :name => "index_lentil_images_on_created_at"
+  add_index "lentil_images", ["do_not_request_donation"], :name => "index_lentil_images_on_do_not_request_donation"
   add_index "lentil_images", ["external_identifier"], :name => "index_images_on_external_identifier"
+  add_index "lentil_images", ["failed_file_checks"], :name => "index_lentil_images_on_failed_file_checks"
+  add_index "lentil_images", ["file_last_checked"], :name => "index_lentil_images_on_file_last_checked"
+  add_index "lentil_images", ["last_donor_agreement_failure_date"], :name => "index_lentil_images_on_last_donor_agreement_failure_date"
   add_index "lentil_images", ["moderator_id"], :name => "index_images_on_moderator_id"
+  add_index "lentil_images", ["original_datetime"], :name => "index_lentil_images_on_original_datetime"
+  add_index "lentil_images", ["staff_like"], :name => "index_lentil_images_on_staff_like"
+  add_index "lentil_images", ["state"], :name => "index_lentil_images_on_state"
+  add_index "lentil_images", ["suppressed"], :name => "index_lentil_images_on_suppressed"
+  add_index "lentil_images", ["updated_at"], :name => "index_lentil_images_on_updated_at"
+  add_index "lentil_images", ["user_id"], :name => "index_lentil_images_on_user_id"
 
   create_table "lentil_licenses", :force => true do |t|
     t.string   "name"

data/test/unit/lentil/image_test.rb

@@ -91,4 +91,13 @@ class ImageTest < ActiveSupport::TestCase
       assert_equal image.valid?, true
     end
   end
+
+  test 'Suppressed images should not be returned with approved images' do
+    assert_difference 'Lentil::Image.approved.count', -1,
+      'A suppressed image should not be treated as approved' do
+      img = Lentil::Image.approved.first
+      img.suppressed = true
+      img.save
+    end
+  end
 end

data/test/vcr_cassettes/battle_images.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
+    uri: https://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
     body:
       encoding: US-ASCII
       string: ''
@@ -10,98 +10,66 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
-      - Ruby
+      - Mozilla/5.0 (compatible; ruby-oembed/0.8.13)
   response:
     status:
       code: 200
       message: OK
     headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Language:
-      - en
-      Content-Type:
-      - application/json
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
-      Expires:
-      - Sat, 01 Jan 2000 00:00:00 GMT
-      Pragma:
-      - no-cache
       Server:
       - 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: 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: Thu, 27 Feb 2014 19:42:54 GMT
-- request:
-    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: 404
-      message: NOT FOUND
-    headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
+      Date:
+      - Fri, 24 Apr 2015 14:06:25 GMT
+      Content-Type:
+      - application/json
       Content-Language:
       - en
-      Content-Type:
-      - text/html; charset=utf-8
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
       Pragma:
       - no-cache
-      Server:
-      - nginx
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
       Set-Cookie:
-      - ccode=US; Path=/
-      - csrftoken=c9d44bf3281ffa60168cf219fece1006; expires=Thu, 26-Feb-2015 19:42:54
+      - csrftoken=90bcd97d51e11c0c4cfee1df6eaea696; expires=Fri, 22-Apr-2016 14:06:25
         GMT; Max-Age=31449600; Path=/
-      - mid=Uw-VPgAEAAE6MIQcBg24mIuWY8fR; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+      - mid=VTpN4QAEAAHAmPRsIL3gjnyQqmLw; expires=Thu, 19-Apr-2035 14:06:25 GMT; Max-Age=630720000;
         Path=/
-      Vary:
-      - Cookie, Accept-Language
-      Content-Length:
-      - '34'
       Connection:
       - keep-alive
+      Content-Length:
+      - '1393'
     body:
       encoding: UTF-8
-      string: No Media Match
+      string: '{"provider_url":"https:\/\/instagram.com\/","media_id":"323374234042685415_31727100","author_name":"cazzerson","height":null,"thumbnail_url":"https:\/\/igcdn-photos-c-a.akamaihd.net\/hphotos-ak-xaf1\/outbound-distilleryimage3\/t0.0-17\/OBPTH\/644f52a02d2f11e2b55e22000a9f09fb_7.jpg","thumbnail_width":612,"thumbnail_height":612,"provider_name":"Instagram","title":"Bubble
+        bubble...","html":"\u003cblockquote class=\"instagram-media\" data-instgrm-captioned
+        data-instgrm-version=\"4\" style=\" background:#FFF; border:0; border-radius:3px;
+        box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin:
+        1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% -
+        2px); width:calc(100% - 2px);\"\u003e\u003cdiv style=\"padding:8px;\"\u003e
+        \u003cdiv style=\" background:#F8F8F8; line-height:0; margin-top:40px; padding:50%
+        0; text-align:center; width:100%;\"\u003e \u003cdiv style=\" background:url(data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAGFBMVEUiIiI9PT0eHh4gIB4hIBkcHBwcHBwcHBydr+JQAAAACHRSTlMABA4YHyQsM5jtaMwAAADfSURBVDjL7ZVBEgMhCAQBAf\/\/42xcNbpAqakcM0ftUmFAAIBE81IqBJdS3lS6zs3bIpB9WED3YYXFPmHRfT8sgyrCP1x8uEUxLMzNWElFOYCV6mHWWwMzdPEKHlhLw7NWJqkHc4uIZphavDzA2JPzUDsBZziNae2S6owH8xPmX8G7zzgKEOPUoYHvGz1TBCxMkd3kwNVbU0gKHkx+iZILf77IofhrY1nYFnB\/lQPb79drWOyJVa\/DAvg9B\/rLB4cC+Nqgdz\/TvBbBnr6GBReqn\/nRmDgaQEej7WhonozjF+Y2I\/fZou\/qAAAAAElFTkSuQmCC);
+        display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px;
+        width:44px;\"\u003e\u003c\/div\u003e\u003c\/div\u003e \u003cp style=\" margin:8px
+        0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https:\/\/instagram.com\/p\/R82ycNoNfn\/\"
+        style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal;
+        font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\"
+        target=\"_top\"\u003eBubble bubble...\u003c\/a\u003e\u003c\/p\u003e \u003cp
+        style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px;
+        margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center;
+        text-overflow:ellipsis; white-space:nowrap;\"\u003eA photo posted by @cazzerson
+        on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\"
+        datetime=\"2012-11-13T01:13:54+00:00\"\u003eNov 12, 2012 at 5:13pm PST\u003c\/time\u003e\u003c\/p\u003e\u003c\/div\u003e\u003c\/blockquote\u003e\n\u003cscript
+        async defer src=\"\/\/platform.instagram.com\/en_US\/embeds.js\"\u003e\u003c\/script\u003e","width":658,"version":"1.0","author_url":"https:\/\/instagram.com\/cazzerson","author_id":31727100,"type":"rich"}'
     http_version: 
-  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
+  recorded_at: Fri, 24 Apr 2015 14:06:25 GMT
 - request:
     method: get
-    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/k5LhuktiSC/
+    uri: https://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R0NyCsK_xf/
     body:
       encoding: US-ASCII
       string: ''
@@ -109,49 +77,66 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
-      - Ruby
+      - Mozilla/5.0 (compatible; ruby-oembed/0.8.13)
   response:
     status:
       code: 200
       message: OK
     headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Language:
-      - en
+      Server:
+      - nginx
+      Date:
+      - Fri, 24 Apr 2015 14:06:25 GMT
       Content-Type:
       - application/json
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
+      Content-Language:
+      - en
       Expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
       Pragma:
       - no-cache
-      Server:
-      - nginx
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
       Set-Cookie:
-      - ccode=US; Path=/
-      - csrftoken=0433d840e863edb10666afa87b2a068b; expires=Thu, 26-Feb-2015 19:42:54
+      - csrftoken=77fceb42170f31889c0d18c1b719de25; expires=Fri, 22-Apr-2016 14:06:25
         GMT; Max-Age=31449600; Path=/
-      - mid=Uw-VPgAEAAH3fw8MDboIOffN0zE2; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+      - mid=VTpN4QAEAAHu4KvWNVG6zftRYgfJ; expires=Thu, 19-Apr-2035 14:06:25 GMT; Max-Age=630720000;
         Path=/
-      Vary:
-      - Cookie, Accept-Language, Accept-Encoding
-      Content-Length:
-      - '245'
       Connection:
       - keep-alive
+      Content-Length:
+      - '1351'
     body:
       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"}'
+      string: '{"provider_url":"https:\/\/instagram.com\/","media_id":"320942086917192799_244467814","author_name":"corylown","height":null,"thumbnail_url":"https:\/\/distilleryimage7-a.akamaihd.net\/55dcf0ba2a8c11e29cc822000a1f96e3_7.jpg","thumbnail_width":612,"thumbnail_height":612,"provider_name":"Instagram","title":"Tethered","html":"\u003cblockquote
+        class=\"instagram-media\" data-instgrm-captioned data-instgrm-version=\"4\"
+        style=\" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px
+        0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px;
+        padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100%
+        - 2px);\"\u003e\u003cdiv style=\"padding:8px;\"\u003e \u003cdiv style=\" background:#F8F8F8;
+        line-height:0; margin-top:40px; padding:50% 0; text-align:center; width:100%;\"\u003e
+        \u003cdiv style=\" background:url(data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAGFBMVEUiIiI9PT0eHh4gIB4hIBkcHBwcHBwcHBydr+JQAAAACHRSTlMABA4YHyQsM5jtaMwAAADfSURBVDjL7ZVBEgMhCAQBAf\/\/42xcNbpAqakcM0ftUmFAAIBE81IqBJdS3lS6zs3bIpB9WED3YYXFPmHRfT8sgyrCP1x8uEUxLMzNWElFOYCV6mHWWwMzdPEKHlhLw7NWJqkHc4uIZphavDzA2JPzUDsBZziNae2S6owH8xPmX8G7zzgKEOPUoYHvGz1TBCxMkd3kwNVbU0gKHkx+iZILf77IofhrY1nYFnB\/lQPb79drWOyJVa\/DAvg9B\/rLB4cC+Nqgdz\/TvBbBnr6GBReqn\/nRmDgaQEej7WhonozjF+Y2I\/fZou\/qAAAAAElFTkSuQmCC);
+        display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px;
+        width:44px;\"\u003e\u003c\/div\u003e\u003c\/div\u003e \u003cp style=\" margin:8px
+        0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https:\/\/instagram.com\/p\/R0NyCsK_xf\/\"
+        style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal;
+        font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\"
+        target=\"_top\"\u003eTethered\u003c\/a\u003e\u003c\/p\u003e \u003cp style=\"
+        color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px;
+        margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center;
+        text-overflow:ellipsis; white-space:nowrap;\"\u003eA photo posted by @corylown
+        on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\"
+        datetime=\"2012-11-09T16:41:39+00:00\"\u003eNov 9, 2012 at 8:41am PST\u003c\/time\u003e\u003c\/p\u003e\u003c\/div\u003e\u003c\/blockquote\u003e\n\u003cscript
+        async defer src=\"\/\/platform.instagram.com\/en_US\/embeds.js\"\u003e\u003c\/script\u003e","width":658,"version":"1.0","author_url":"https:\/\/instagram.com\/corylown","author_id":244467814,"type":"rich"}'
     http_version: 
-  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
+  recorded_at: Fri, 24 Apr 2015 14:06:25 GMT
 - request:
     method: get
-    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
+    uri: https://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R82ycNoNfn/
     body:
       encoding: US-ASCII
       string: ''
@@ -159,98 +144,66 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
-      - Ruby
+      - Mozilla/5.0 (compatible; ruby-oembed/0.8.13)
   response:
     status:
       code: 200
       message: OK
     headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Language:
-      - en
-      Content-Type:
-      - application/json
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
-      Expires:
-      - Sat, 01 Jan 2000 00:00:00 GMT
-      Pragma:
-      - no-cache
       Server:
       - 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: 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: Thu, 27 Feb 2014 19:42:54 GMT
-- request:
-    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: 404
-      message: NOT FOUND
-    headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
+      Date:
+      - Fri, 24 Apr 2015 14:06:25 GMT
+      Content-Type:
+      - application/json
       Content-Language:
       - en
-      Content-Type:
-      - text/html; charset=utf-8
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
       Expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
       Pragma:
       - no-cache
-      Server:
-      - nginx
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
       Set-Cookie:
-      - ccode=US; Path=/
-      - csrftoken=d6266caf663f9909c87673d4d8f895a8; expires=Thu, 26-Feb-2015 19:42:54
+      - csrftoken=a357ae75d73113c0ea09f6a5920acacc; expires=Fri, 22-Apr-2016 14:06:25
         GMT; Max-Age=31449600; Path=/
-      - mid=Uw-VPgAEAAE-mydLNVv49vMpmJT4; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+      - mid=VTpN4QAEAAGkXM9mXRPGp1GE9UtC; expires=Thu, 19-Apr-2035 14:06:25 GMT; Max-Age=630720000;
         Path=/
-      Vary:
-      - Cookie, Accept-Language
-      Content-Length:
-      - '34'
       Connection:
       - keep-alive
+      Content-Length:
+      - '1393'
     body:
       encoding: UTF-8
-      string: No Media Match
+      string: '{"provider_url":"https:\/\/instagram.com\/","media_id":"323374234042685415_31727100","author_name":"cazzerson","height":null,"thumbnail_url":"https:\/\/igcdn-photos-c-a.akamaihd.net\/hphotos-ak-xaf1\/outbound-distilleryimage3\/t0.0-17\/OBPTH\/644f52a02d2f11e2b55e22000a9f09fb_7.jpg","thumbnail_width":612,"thumbnail_height":612,"provider_name":"Instagram","title":"Bubble
+        bubble...","html":"\u003cblockquote class=\"instagram-media\" data-instgrm-captioned
+        data-instgrm-version=\"4\" style=\" background:#FFF; border:0; border-radius:3px;
+        box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin:
+        1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% -
+        2px); width:calc(100% - 2px);\"\u003e\u003cdiv style=\"padding:8px;\"\u003e
+        \u003cdiv style=\" background:#F8F8F8; line-height:0; margin-top:40px; padding:50%
+        0; text-align:center; width:100%;\"\u003e \u003cdiv style=\" background:url(data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAGFBMVEUiIiI9PT0eHh4gIB4hIBkcHBwcHBwcHBydr+JQAAAACHRSTlMABA4YHyQsM5jtaMwAAADfSURBVDjL7ZVBEgMhCAQBAf\/\/42xcNbpAqakcM0ftUmFAAIBE81IqBJdS3lS6zs3bIpB9WED3YYXFPmHRfT8sgyrCP1x8uEUxLMzNWElFOYCV6mHWWwMzdPEKHlhLw7NWJqkHc4uIZphavDzA2JPzUDsBZziNae2S6owH8xPmX8G7zzgKEOPUoYHvGz1TBCxMkd3kwNVbU0gKHkx+iZILf77IofhrY1nYFnB\/lQPb79drWOyJVa\/DAvg9B\/rLB4cC+Nqgdz\/TvBbBnr6GBReqn\/nRmDgaQEej7WhonozjF+Y2I\/fZou\/qAAAAAElFTkSuQmCC);
+        display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px;
+        width:44px;\"\u003e\u003c\/div\u003e\u003c\/div\u003e \u003cp style=\" margin:8px
+        0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https:\/\/instagram.com\/p\/R82ycNoNfn\/\"
+        style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal;
+        font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\"
+        target=\"_top\"\u003eBubble bubble...\u003c\/a\u003e\u003c\/p\u003e \u003cp
+        style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px;
+        margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center;
+        text-overflow:ellipsis; white-space:nowrap;\"\u003eA photo posted by @cazzerson
+        on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\"
+        datetime=\"2012-11-13T01:13:54+00:00\"\u003eNov 12, 2012 at 5:13pm PST\u003c\/time\u003e\u003c\/p\u003e\u003c\/div\u003e\u003c\/blockquote\u003e\n\u003cscript
+        async defer src=\"\/\/platform.instagram.com\/en_US\/embeds.js\"\u003e\u003c\/script\u003e","width":658,"version":"1.0","author_url":"https:\/\/instagram.com\/cazzerson","author_id":31727100,"type":"rich"}'
     http_version: 
-  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
+  recorded_at: Fri, 24 Apr 2015 14:06:25 GMT
 - request:
     method: get
-    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R0NyCsK_xf/
+    uri: https://api.instagram.com/oembed?format=json&url=http://instagram.com/p/k5LhuktiSC/
     body:
       encoding: US-ASCII
       string: ''
@@ -258,43 +211,61 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
-      - Ruby
+      - Mozilla/5.0 (compatible; ruby-oembed/0.8.13)
   response:
     status:
       code: 200
       message: OK
     headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Language:
-      - en
+      Server:
+      - nginx
+      Date:
+      - Fri, 24 Apr 2015 14:06:26 GMT
       Content-Type:
       - application/json
-      Date:
-      - Thu, 27 Feb 2014 19:42:54 GMT
+      Content-Language:
+      - en
       Expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
       Pragma:
       - no-cache
-      Server:
-      - nginx
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
       Set-Cookie:
-      - ccode=US; Path=/
-      - csrftoken=65113997a68a232330752b7f4ecfc78e; expires=Thu, 26-Feb-2015 19:42:54
+      - csrftoken=06d3bb3b1f7a4ba826522411e4285e54; expires=Fri, 22-Apr-2016 14:06:26
         GMT; Max-Age=31449600; Path=/
-      - mid=Uw-VPgAEAAFdCNfvK9phYZ52i0ao; expires=Wed, 22-Feb-2034 19:42:54 GMT; Max-Age=630720000;
+      - mid=VTpN4gAEAAFyrp01nR8WxGLcwi82; expires=Thu, 19-Apr-2035 14:06:26 GMT; Max-Age=630720000;
         Path=/
-      Vary:
-      - Cookie, Accept-Language, Accept-Encoding
-      Content-Length:
-      - '243'
       Connection:
       - keep-alive
+      Content-Length:
+      - '1368'
     body:
       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"}'
+      string: '{"provider_url":"https:\/\/instagram.com\/","media_id":"664613116276253826_1128023464","author_name":"bddnc","height":null,"thumbnail_url":"https:\/\/scontent.cdninstagram.com\/hphotos-xfp1\/t51.2885-15\/1725673_1407639456161936_589510248_n.jpg","thumbnail_width":640,"thumbnail_height":640,"provider_name":"Instagram","title":"six
+        #hunttesting","html":"\u003cblockquote class=\"instagram-media\" data-instgrm-captioned
+        data-instgrm-version=\"4\" style=\" background:#FFF; border:0; border-radius:3px;
+        box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin:
+        1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% -
+        2px); width:calc(100% - 2px);\"\u003e\u003cdiv style=\"padding:8px;\"\u003e
+        \u003cdiv style=\" background:#F8F8F8; line-height:0; margin-top:40px; padding:50%
+        0; text-align:center; width:100%;\"\u003e \u003cdiv style=\" background:url(data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAGFBMVEUiIiI9PT0eHh4gIB4hIBkcHBwcHBwcHBydr+JQAAAACHRSTlMABA4YHyQsM5jtaMwAAADfSURBVDjL7ZVBEgMhCAQBAf\/\/42xcNbpAqakcM0ftUmFAAIBE81IqBJdS3lS6zs3bIpB9WED3YYXFPmHRfT8sgyrCP1x8uEUxLMzNWElFOYCV6mHWWwMzdPEKHlhLw7NWJqkHc4uIZphavDzA2JPzUDsBZziNae2S6owH8xPmX8G7zzgKEOPUoYHvGz1TBCxMkd3kwNVbU0gKHkx+iZILf77IofhrY1nYFnB\/lQPb79drWOyJVa\/DAvg9B\/rLB4cC+Nqgdz\/TvBbBnr6GBReqn\/nRmDgaQEej7WhonozjF+Y2I\/fZou\/qAAAAAElFTkSuQmCC);
+        display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px;
+        width:44px;\"\u003e\u003c\/div\u003e\u003c\/div\u003e \u003cp style=\" margin:8px
+        0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https:\/\/instagram.com\/p\/k5LhuktiSC\/\"
+        style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal;
+        font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\"
+        target=\"_top\"\u003esix #hunttesting\u003c\/a\u003e\u003c\/p\u003e \u003cp
+        style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px;
+        margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center;
+        text-overflow:ellipsis; white-space:nowrap;\"\u003eA photo posted by @bddnc
+        on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\"
+        datetime=\"2014-02-26T20:54:39+00:00\"\u003eFeb 26, 2014 at 12:54pm PST\u003c\/time\u003e\u003c\/p\u003e\u003c\/div\u003e\u003c\/blockquote\u003e\n\u003cscript
+        async defer src=\"\/\/platform.instagram.com\/en_US\/embeds.js\"\u003e\u003c\/script\u003e","width":658,"version":"1.0","author_url":"https:\/\/instagram.com\/bddnc","author_id":1128023464,"type":"rich"}'
     http_version: 
-  recorded_at: Thu, 27 Feb 2014 19:42:54 GMT
-recorded_with: VCR 2.7.0
+  recorded_at: Fri, 24 Apr 2015 14:06:26 GMT
+recorded_with: VCR 2.9.3

data/test/vcr_cassettes/instagram_oembed.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R0NyCsK_xf/
+    uri: https://api.instagram.com/oembed?format=json&url=http://instagram.com/p/R0NyCsK_xf/
     body:
       encoding: US-ASCII
       string: ''
@@ -10,43 +10,61 @@ http_interactions:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
       User-Agent:
-      - Ruby
+      - Mozilla/5.0 (compatible; ruby-oembed/0.8.13)
   response:
     status:
       code: 200
       message: OK
     headers:
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Language:
-      - en
+      Server:
+      - nginx
+      Date:
+      - Fri, 24 Apr 2015 14:02:19 GMT
       Content-Type:
       - application/json
-      Date:
-      - Wed, 26 Feb 2014 21:56:54 GMT
+      Content-Language:
+      - en
       Expires:
       - Sat, 01 Jan 2000 00:00:00 GMT
+      Vary:
+      - Cookie, Accept-Language, Accept-Encoding
       Pragma:
       - no-cache
-      Server:
-      - nginx
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
       Set-Cookie:
-      - ccode=US; Path=/
-      - csrftoken=e2b7546b8f6205ce3b63f01ddd5ed9e8; expires=Wed, 25-Feb-2015 21:56:54
+      - csrftoken=38177ebb04cbab402bd6873db2c70d5c; expires=Fri, 22-Apr-2016 14:02:19
         GMT; Max-Age=31449600; Path=/
-      - mid=Uw5jJgAEAAGFSpf5tlLPwEjb_CCP; expires=Tue, 21-Feb-2034 21:56:54 GMT; Max-Age=630720000;
+      - mid=VTpM6wAEAAFkIMLVGldYscBUFcuc; expires=Thu, 19-Apr-2035 14:02:19 GMT; Max-Age=630720000;
         Path=/
-      Vary:
-      - Cookie, Accept-Language, Accept-Encoding
-      Content-Length:
-      - '243'
       Connection:
       - keep-alive
+      Content-Length:
+      - '1351'
     body:
       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"}'
+      string: '{"provider_url":"https:\/\/instagram.com\/","media_id":"320942086917192799_244467814","author_name":"corylown","height":null,"thumbnail_url":"https:\/\/distilleryimage7-a.akamaihd.net\/55dcf0ba2a8c11e29cc822000a1f96e3_7.jpg","thumbnail_width":612,"thumbnail_height":612,"provider_name":"Instagram","title":"Tethered","html":"\u003cblockquote
+        class=\"instagram-media\" data-instgrm-captioned data-instgrm-version=\"4\"
+        style=\" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px
+        0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px;
+        padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100%
+        - 2px);\"\u003e\u003cdiv style=\"padding:8px;\"\u003e \u003cdiv style=\" background:#F8F8F8;
+        line-height:0; margin-top:40px; padding:50% 0; text-align:center; width:100%;\"\u003e
+        \u003cdiv style=\" background:url(data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAGFBMVEUiIiI9PT0eHh4gIB4hIBkcHBwcHBwcHBydr+JQAAAACHRSTlMABA4YHyQsM5jtaMwAAADfSURBVDjL7ZVBEgMhCAQBAf\/\/42xcNbpAqakcM0ftUmFAAIBE81IqBJdS3lS6zs3bIpB9WED3YYXFPmHRfT8sgyrCP1x8uEUxLMzNWElFOYCV6mHWWwMzdPEKHlhLw7NWJqkHc4uIZphavDzA2JPzUDsBZziNae2S6owH8xPmX8G7zzgKEOPUoYHvGz1TBCxMkd3kwNVbU0gKHkx+iZILf77IofhrY1nYFnB\/lQPb79drWOyJVa\/DAvg9B\/rLB4cC+Nqgdz\/TvBbBnr6GBReqn\/nRmDgaQEej7WhonozjF+Y2I\/fZou\/qAAAAAElFTkSuQmCC);
+        display:block; height:44px; margin:0 auto -44px; position:relative; top:-22px;
+        width:44px;\"\u003e\u003c\/div\u003e\u003c\/div\u003e \u003cp style=\" margin:8px
+        0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https:\/\/instagram.com\/p\/R0NyCsK_xf\/\"
+        style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal;
+        font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\"
+        target=\"_top\"\u003eTethered\u003c\/a\u003e\u003c\/p\u003e \u003cp style=\"
+        color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px;
+        margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center;
+        text-overflow:ellipsis; white-space:nowrap;\"\u003eA photo posted by @corylown
+        on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\"
+        datetime=\"2012-11-09T16:41:39+00:00\"\u003eNov 9, 2012 at 8:41am PST\u003c\/time\u003e\u003c\/p\u003e\u003c\/div\u003e\u003c\/blockquote\u003e\n\u003cscript
+        async defer src=\"\/\/platform.instagram.com\/en_US\/embeds.js\"\u003e\u003c\/script\u003e","width":658,"version":"1.0","author_url":"https:\/\/instagram.com\/corylown","author_id":244467814,"type":"rich"}'
     http_version: 
-  recorded_at: Wed, 26 Feb 2014 21:56:54 GMT
-recorded_with: VCR 2.7.0
+  recorded_at: Fri, 24 Apr 2015 14:02:19 GMT
+recorded_with: VCR 2.9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,6 +111,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
   requirement: !ruby/object:Gem::Requirement
@@ -285,14 +299,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +321,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.4
+- !ruby/object:Gem::Dependency
+  name: oj_mimic_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -397,14 +439,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -467,14 +509,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -647,6 +689,8 @@ files:
 - db/migrate/20130506205348_add_do_not_request_donation_to_lentil_images.rb
 - db/migrate/20131205181204_add_last_donor_agreement_failure_date_to_lentil_images.rb
 - db/migrate/20141106172834_add_type_to_images.rb
+- db/migrate/20150311004606_add_suppressed_to_images.rb
+- db/migrate/20150422123522_add_indexes_to_images.rb
 - db/seeds.rb
 - lib/generators/lentil/USAGE
 - lib/generators/lentil/install_generator.rb