lentil 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd98f997f2495b12ae5d38bc8d23ac3b2de72109
-  data.tar.gz: 0ad51644acda26f24c9673d168b29edb0d9486d9
+  metadata.gz: 942c1dd9c7d9d2eeffd3950d921c979fc969399a
+  data.tar.gz: 10b00660f681388bd87560f94bb4f594c643d072
 SHA512:
-  metadata.gz: d39613263f4c4f043d64cb9264d0fb5eebfba32f50e8fa0115aa7907cf19cd9893bf80ab6162468457b6343e8b7d1b63e06cef1b1117a2591b2a4e30e539e969
-  data.tar.gz: 5e5bc82f305c6058f6e51a73ca0d820b075e10e2bd7e968204acf1059782b5c9a8bbf7ebf519d833fca07beed7f1bdf73d4b2f262894891b24eafe9eee46b533
+  metadata.gz: d7536b168f00124322e37b23d9d6f93cbc048a3da9ae04375d639b3d3f27ad05ee254a2a398a653b48e24ca28a602b1353693407b1bef300aa30c0f392583076
+  data.tar.gz: 9ca11239e8fa46c2c0c96803b49578df3d01358da04d0b101fc9d48b786d4e9026b18ee047277194f093e2c588dc35cbb0c6dc812f0874a3954f864c9b84fb29

data/README.md

@@ -72,6 +72,19 @@ You ought to see a message like: "15 new images added"
 - Go to <http://localhost:3000/admin/lentil_images> and click on "Moderate New." Approve or reject some images. Once you've approved some, go to <http://localhost:3000> to see your approved images.
 - Congratulations! You're now up and running!
 
+## Harvest Videos
+Video harvesting is builtin to the image harvesting feature. Only once a single task has to be run to migrate the existing data to accomodate for schema.
+After updating lentil to the latest release run
+```sh
+bundle exec rails generate lentil:install
+bundle exec rake lentil:image_services:restore_videos
+```
+
+You ought to see a message like: "x record(s) updated"
+
+Videos can be moderated like images.
+In the home page and animate views videos will autoplay, muted and looped
+
 ## Scheduling tasks
 
 There are several rake tasks that you should schedule to run on a recurring basis:
@@ -80,9 +93,10 @@ There are several rake tasks that you should schedule to run on a recurring basi
 - `rake lentil:image_services:test_image_files[number_of_images,image_service]` checks that the image content for approved images is still available. After 3 failures, Lentil will stop displaying the images. After 10 failures, Lentil will stop checking. Defaults to checking 10 Instagram images. Images will not be checked more than once per day.
 - `rake lentil:popularity:update_score` recalculates the popularity score based on "likes" and "battles."
 
-Additionally, there are two optional rake tasks that support image file harvesting for longer-term retention:
+Additionally, there are three optional rake tasks that support image file harvesting for longer-term retention:
 
 - `rake lentil:image_services:save_image_files[number_of_images,image_service,base_directory]` Lentil normally only stores image metadata, but this task will save the image file to a specified directory. This file will still not be used by Lentil, but the file retrieval will be noted in the Image model. Defaults to 50 Instagram images, saving to the path specified by the `base_image_file_dir` option from `config/lentil_config.yml`.
+- `rake lentil:image_services:dump_metadata[image_service,base_directory]` Extracts all image metadata from the database and writes them as json files. Defaults to saving to the path specified by the `base_image_file_dir` option from `config/lentil_config.yml`.
 - `rake lentil:image_services:submit_donor_agreements[number_of_images,image_service]` will submit a donor agreement (using the `donor_agreement_text` option from `config/lentil_config.yml`) as a comment on approved Instagram images that have been in the system for at least a week. Currently defaults to one image.
 
 > In order to submit comments, you will need to generate an access token for the user that will submit the comments. See the [Instagram documentation](http://instagram.com/developer/authentication/) and a [discussion of access token expiration](https://groups.google.com/forum/?fromgroups=#!searchin/instagram-api-developers/access$20token%7Csort:date/instagram-api-developers/OBOTwIh3FSw/9hTccUX1Jq4J).

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

@@ -76,9 +76,10 @@ function addfancybox() {
         closeEffect : 'none',
         nextEffect  : 'none',
         prevEffect  : 'none',
+        live : true,
         loop : false,
         minWidth : '250px',
-        type: 'image',
+        type: 'html',
         helpers     : {
             title   : { type : 'inside' },
             overlay : { locked : false }
@@ -90,6 +91,21 @@ function addfancybox() {
           window.history.pushState(null,null,FancyBoxCloseFunctionState.pathname);
         },
         beforeShow  : function() {
+			var img = $(this.element).children(".instagram-img");
+			if($(img).attr("data-media-type") === "video") {
+				var video_url = $(img).attr("src");
+				//this.content = "<video src='" + video_url + "' height='320' width='320' controls='controls'></video>";
+				$(".fancybox-inner").html('<video controls="controls" height="100%"  width="90%" src="' + video_url + '"></video>');
+				var vid = $(".fancybox-inner").children("video")[0];
+				vid.oncanplay = function() {
+					$.fancybox.reposition();
+				}
+			}
+			else {
+				var image_url = $(img).attr("src");
+				$(".fancybox-inner").html('<img class="fancybox-image" src="' + image_url + '" />');
+			}
+
             this.title = $(this.element).next(".text-overlay").html();
             imageId = $(this.element).parents("div").attr("id");
             $(".fancybox-wrap").attr('id', imageId);

data/app/assets/javascripts/lentil/addinfinitescroll.js.erb

@@ -33,7 +33,6 @@ function addinfinitescroll() {
             }
         },
         function () {
-            addfancybox();
             addimageerrors();
             // on callback, if fancybox is open
             // then close it and reopen at the same spot
@@ -47,4 +46,4 @@ function addinfinitescroll() {
             }
         });
     }
-}
+}

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

@@ -1,8 +1,8 @@
 function addimageerrors() {
-    $("img.instagram-img, img.battle-img, img.fancybox-img").on("error", function () {
+    $(".instagram-img, .battle-img, .fancybox-img").off("error").on("error", function () {
         $(this).parents("div.image-tile, li.image-animate-tile").remove();
-        if ($("body.images_animate") || $("body.images_staff_picks_animate")) {
+        /*if ($("body.images_animate") || $("body.images_staff_picks_animate")) {
             addanimatedimages();
-        }
+        }*/
     });
-}
+}

data/app/models/lentil/image.rb

@@ -35,8 +35,10 @@
 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
-
+                  :do_not_request_donation, :donor_agreement_rejected, :media_type, :video_url
+  
+  attr_protected  :original_metadata
+  
   has_many :won_battles, :class_name => "Battle"
   has_many :losers, :through => :battles
   has_many :lost_battles, :class_name => "Battle", :foreign_key => "loser_id"
@@ -54,8 +56,6 @@ class Lentil::Image < ActiveRecord::Base
   has_many :licensings
   has_many :licenses, :through=>:licensings
 
-  serialize :original_metadata, Hash
-
   belongs_to :moderator, :class_name => Lentil::AdminUser
 
   default_scope where("failed_file_checks < 3")
@@ -199,4 +199,8 @@ class Lentil::Image < ActiveRecord::Base
     end
 
   end
+  
+  def original_metadata=(meta)
+    write_attribute(:original_metadata, meta.to_hash)
+  end
 end

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

@@ -18,7 +18,13 @@
     <% @images.each do |image| %>
       <tr class="moderation">
         <%= semantic_fields_for "image[#{image.id}]", image do |f| %>
-            <td><%= link_to_large_admin_image(image) %></td>
+            <td>
+              <% unless image.media_type == "video" %>
+                  <%= link_to_large_admin_image(image) %>
+              <% else %>
+                  <%= link_to(video_tag(image.video_url, controls: true, size: "250x250"),  admin_lentil_image_path(image)) %>
+              <% end %>
+            </td>
             <td><%= image.description %></td>
             <td><%= image.user.user_name %></td>
             <td><%= image.service_tags.map{|tag| tag.name}.join(' | ') %>

data/app/views/lentil/images/_image_tiles.erb

@@ -1,8 +1,12 @@
     <div class="images">
       <% @images.each do |image| %>
         <div id="image_<%= image.id %>" class="grid__cell image-tile">
-          <%= link_to url_for(image), 'data-fancybox-href' => image.jpeg, 'data-fancybox-group' => "image-tile-gallery",  :class => :fancybox  do %>
-            <%= image_tag(image.jpeg, :class => "instagram-img " + image.id.to_s, :alt => image.description, :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count}) %>
+          <%= link_to url_for(image), 'data-fancybox-href' => image.video_url, 'data-fancybox-group' => "image-tile-gallery", :class => :fancybox  do %>
+           <% unless image.media_type == "video" %>
+            	<%= image_tag(image.jpeg, :class => "instagram-img " + image.id.to_s, :alt => image.description, :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+            <% else %>
+            	<%= video_tag(image.video_url, :autoplay => "true", :muted => "true", :loop => "true", :class => "instagram-img " + image.id.to_s, :height => "100%", :width => "100%", :poster => image.jpeg, :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+            <% end %>
           <% end %>
 
           <%= render "/layouts/lentil/image_popup", :image => image  %>

data/app/views/lentil/images/animate.html.erb

@@ -7,7 +7,15 @@
     <div id="ri-grid" class="ri-grid ri-grid-size-2 grid__cell animated-images staff-picks-animated" style="padding:0; margin:0;">
       <ul>
       <% @images.each do |image| %>
-        <li class="image-animate-tile"><a href="#"><%= image_tag(image.jpeg, :class => "instagram-img") %></a></li>
+        <li class="image-animate-tile">
+          <a href="#">
+            <% unless image.media_type == "video" %>
+              <%= image_tag(image.jpeg, :class => "instagram-img") %>
+            <% else %>
+              <%= video_tag(image.video_url, :autoplay => "true", :muted => "true", :loop => "true", :poster => image.jpeg, :class => "instagram-img " + image.id.to_s, :height => "100%", :width => "100%", :data => {:media_type => image.media_type}) %>
+            <% end %>
+          </a>
+        </li>
       <% end -%>
       </ul>
     </div>

data/app/views/lentil/images/index.html.erb

@@ -5,6 +5,25 @@
 <% end -%>
 <% title @title %>
 <%= render :partial => "/layouts/lentil/top_navigation" %>
+<style>
+  .fancybox-prev {
+    width : 5%;
+  }
+  .fancybox-prev > span {
+    left : 0;
+    visibility: visible;
+  }
+  .fancybox-next {
+    width : 5%;
+  }
+  .fancybox-next > span {
+    right : 0;
+    visibility: visible;
+  }
+  .fancybox-inner {
+    text-align: center;
+  }
+</style>
 <section class="wrapper">
   <div class="grid">
     <div class="grid__cell header">

data/app/views/lentil/images/show.html.erb

@@ -17,7 +17,13 @@
 <div class="wrapper">
     <div class="grid__cell side-filler"></div>
     <div id="image_<%= @image.id %>" class="image-show grid__cell solo-image">
-        <a href="<%= @image.url %>"><%= image_tag(@image.jpeg, :class => "instagram-img") %></a>
+      <a href="<%= @image.url %>">
+        <% unless @image.media_type == "video" %>
+          <%= image_tag(@image.jpeg, :class => "instagram-img") %>
+		<% else %>
+		  <video src="<%= @image.video_url %>" poster="<%= @image.jpeg %>" controls='controls' class="instagram-img <%= @image.id.to_s %>" height="100%" width="100%" data-media-type="<%= @image.media_type %>" ></video>
+		<% end %>
+       </a>
         <%= render "/layouts/lentil/image_popup", :image => @image  %>
     </div>
     <div class="grid__cell side-filler"></div>

data/app/views/lentil/thisorthat/_battle_form.html.erb

@@ -4,7 +4,12 @@
       <div class="battle-image-wrap grid__cell">
         <%= semantic_fields_for "image[#{image.id}]", image do |f| %>
           <div id="image_<%= image.id %>" class="battle-image-tile">
-            <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox"><%= image_tag(image.jpeg, :class => "battle-img", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count}) %>
+            <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox">
+              <% unless image.media_type == "video" %>
+                <%= image_tag(image.jpeg, :class => "battle-img instagram-img", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+              <% else %>
+                <%= video_tag(image.video_url, :class => "instagram-img " + image.id.to_s, :height => "100%", :width => "100%", :poster => image.jpeg, :controls => "controls", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+              <% end %>
               <div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 35) %></div></div>
               <div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 50) %></div></div>
               <div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 70) %></div></div>
@@ -23,7 +28,12 @@
   <% @prev_images.each do |image| %>
       <div class="battle-image-wrap grid__cell" style="background:#e6e6e6">
           <div id="image_<%= image.id %>" class="battle-image-tile">
-            <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox"><%= image_tag(image.jpeg, :class => "battle-img", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count}) %>
+            <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox">
+              <% unless image.media_type == "video" %>
+                <%= image_tag(image.jpeg, :class => "battle-img instagram-img", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+              <% else %>
+                <%= video_tag(image.video_url, :class => "instagram-img " + image.id.to_s, :height => "100%", :width => "100%", :poster => image.jpeg, :controls => "controls", :data => {:battles_count => image.battles_count, :win_pct => image.win_pct, :popularity => image.popular_score, :staff_like => image.staff_like, :like_votes_count => image.like_votes_count, :media_type => image.media_type}) %>
+              <% end %>
               <div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 35) %></div></div>
               <div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 50) %></div></div>
               <div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 70) %></div></div>

data/db/migrate/20141106172834_add_type_to_images.rb

@@ -0,0 +1,6 @@
+class AddTypeToImages < ActiveRecord::Migration
+  def change
+    add_column :lentil_images, :media_type, :string
+    add_column :lentil_images, :video_url, :string
+  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 :media_type, :as => :select
     filter :user_user_name, :as => :string, :label => "Username"
     filter :user_full_name, :as => :string, :label => "Full Name"
     filter :staff_like, :as => :select
@@ -31,7 +32,11 @@ if defined?(ActiveAdmin)
 
     index do
       column "Image" do |image|
-        link_to(image_tag(image.image_url, :class => "moderation_thumbnail"), admin_lentil_image_path(image))
+        unless image.media_type == "video"
+            link_to(image_tag(image.image_url, :class => "moderation_thumbnail"), admin_lentil_image_path(image))
+        else
+            link_to(video_tag(image.video_url, controls: true, size: "250x250"),  admin_lentil_image_path(image))
+        end
       end
       column :id
       column :description
@@ -91,7 +96,11 @@ if defined?(ActiveAdmin)
           image.state_name
         end
         row :image do
-          link_to(image_tag(image.image_url), admin_lentil_image_path(image))
+			unless image.media_type == "video"
+				link_to(image_tag(image.image_url), admin_lentil_image_path(image))
+			else
+				video_tag(image.video_url, controls: true, size: "640x640")
+			end
         end
       end
       active_admin_comments
@@ -211,4 +220,4 @@ if defined?(ActiveAdmin)
       redirect_to :back, notice: "#{image_counter} #{'URL'.pluralize(image_counter)} added (out of #{total_urls})", alert: errors.join('<br>').html_safe
     end
   end
-end
+end

data/lib/lentil/instagram_harvester.rb

@@ -124,7 +124,9 @@ module Lentil
         tags: instagram_metadata.tags,
         user: instagram_metadata.user,
         original_datetime: Time.at(instagram_metadata.created_time.to_i).to_datetime,
-        original_metadata: instagram_metadata
+        original_metadata: instagram_metadata,
+        media_type: instagram_metadata.type,
+        video_url: instagram_metadata.videos && instagram_metadata.videos.standard_resolution.url
       }
     end
 
@@ -152,7 +154,9 @@ module Lentil
         :description => image_data[:name],
         :url => image_data[:url],
         :long_url => image_data[:large_url],
-        :original_datetime => image_data[:original_datetime]
+        :video_url => image_data[:video_url],
+        :original_datetime => image_data[:original_datetime],
+        :media_type => image_data[:media_type]
       })
 
       # This is a temporary fix for a bug in the Hashie to_hash method.
@@ -240,6 +244,30 @@ module Lentil
 
       response.body
     end
+    
+    #
+    # Retrieve the binary video data for a given Image object
+    #
+    # @param [Image] image An Image model object from the Instagram service
+    #
+    # @raise [Exception] If there are request problems
+    #
+    # @return [String] Binary video data
+    def harvest_video_data(image)
+      response = Typhoeus.get(image.video_url, followlocation: true)
+
+      if response.success?
+        raise "Invalid content type: " + response.headers['Content-Type'] unless (response.headers['Content-Type'] == 'video/mp4')
+      elsif response.timed_out?
+        raise "Request timed out"
+      elsif response.code == 0
+        raise "Could not get an HTTP response"
+      else
+        raise "HTTP request failed: " + response.code.to_s
+      end
+
+      response.body
+    end
 
     #
     # Test if an image is still avaiable

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/tasks/image_services.rake

@@ -55,15 +55,24 @@ namespace :lentil do
 
         begin
           # TODO: Currently expects JPEG
+          video_file_path = image_file_path + "/#{image.external_identifier}.mp4"
           image_file_path += "/#{image.external_identifier}.jpg"
           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
 
+          if image.media_type == "video"
+            raise "Video file already exists, will not overwrite: #{video_file_path}" if File.exist?(video_file_path)
+            video_data = harvester.harvest_video_data(image)
+            File.open(video_file_path, "wb") do |f|
+              f.write video_data
+            end
+          end
+          
           image.file_harvested_date = DateTime.now
           image.save
           puts "Harvested image #{image.id}, #{image_file_path}"
@@ -135,5 +144,83 @@ 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')
+
+      harvester = Lentil::InstagramHarvester.new
+
+      lentilService = Lentil::Service.unscoped.where(:name => args[:image_service]).first
+      numUpdated = 0;
+      lentilService.images.unscoped.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"]
+        video_url = image.video_url
+        if(type == "video")
+          video_url = obj["videos"]["standard_resolution"]["url"]
+          image.video_url = video_url
+          image.media_type = 'video'
+          image.save
+          numUpdated += 1
+        else
+          image.media_type = 'image'
+          image.save
+          numUpdated += 1
+        end
+      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')
+      base_dir = args[:base_directory] || Lentil::Engine::APP_CONFIG["base_image_file_dir"] || nil
+      raise "Base directory is required" unless base_dir
+
+      lentilService = Lentil::Service.unscoped.where(:name => args[:image_service]).first
+      numArchived = 0;
+      lentilService.images.unscoped.each do |image|
+        begin
+          raise "Destination directory does not exist or is not a directory: #{base_dir}" unless File.directory?(base_dir)
+
+          image_file_path = "#{base_dir}/#{image.service.name}"
+
+          if !File.exist?(image_file_path)
+            Dir.mkdir(image_file_path)
+          else
+            raise "Service directory is not a directory: #{image_file_path}" unless File.directory?(image_file_path)
+          end
+        rescue => e
+          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")
+        
+        image_file_path += "/#{image.external_identifier}.json"
+        File.open(image_file_path, "w") do |f|
+          f.write @jsonobj.to_json
+          numArchived += 1
+        end
+      end
+      puts "#{numArchived} image(s) metadata extracted"
+    end
   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 => 20131205181204) do
+ActiveRecord::Schema.define(:version => 20141106172834) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -90,6 +90,8 @@ ActiveRecord::Schema.define(:version => 20131205181204) do
     t.datetime "donor_agreement_rejected"
     t.boolean  "do_not_request_donation",           :default => false
     t.datetime "last_donor_agreement_failure_date"
+    t.string   "media_type"
+    t.string   "video_url"
   end
 
   add_index "lentil_images", ["external_identifier"], :name => "index_images_on_external_identifier"

data/test/fixtures/lentil/images.yml

@@ -282,3 +282,76 @@ three:
   donor_agreement_failed: 0
   failed_file_checks: 0
   file_last_checked:
+
+video:
+  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/k5LhuktiSC/
+  user: bd
+  state: 1
+  external_identifier: '853651752801735775_3292244'
+  long_url: http://scontent-b.cdninstagram.com/hphotos-xfa1/t51.2885-15/915706_724481087621112_1586087020_n.jpg
+  original_datetime: 2013-04-16 15:58:34.000000000 Z
+  staff_like: true
+  moderator_id:
+  moderated_at:
+  second_moderation: false
+  wins_count: 5
+  losses_count: 5
+  win_pct: 50
+  popular_score: 0
+  file_harvested_date:
+  file_harvest_failed: 0
+  donor_agreement_submitted_date:
+  donor_agreement_failed: 0
+  failed_file_checks: 0
+  file_last_checked:
+  original_metadata:
+    attribution:
+    tags:
+    - hunttesting
+    location:
+    comments:
+      count: 0
+      data: []
+    filter: Amaro
+    created_time: '1393448079'
+    link: http://instagram.com/p/k5LhuktiSC/
+    likes:
+      count: 0
+      data: []
+    images:
+      low_resolution:
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_6.jpg
+        width: 306
+        height: 306
+      thumbnail:
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_5.jpg
+        width: 150
+        height: 150
+      standard_resolution:
+        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_8.jpg
+        width: 612
+        height: 612
+    caption:
+      created_time: '1393448079'
+      text: ! 'six #hunttesting'
+      from:
+        username: bddnc
+        profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
+        id: '1128023464'
+        full_name: bddnc
+      id: '664613117098338265'
+    type: image
+    id: '853651752801735775_3292244'
+    user:
+      username: bddnc
+      website: ''
+      profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg
+      full_name: bddnc
+      bio: ''
+      id: '1128023464'
+  video_url: 'http://scontent-b.cdninstagram.com/hphotos-xaf1/t50.2886-16/10814479_740198139394848_641606265_n.mp4'
+  media_type: 'video'

data/test/integration/lentil/images_show_test.rb

@@ -2,13 +2,15 @@ require 'test_helper'
 
 class ImagesShowIndexTest < ActionDispatch::IntegrationTest
 
-  setup do
-    visit(lentil.image_path lentil_images(:one))
-  end
-
   # This is important otherwise there is some strange reloading that goes on
   test "should have a class on the body" do
+    visit(lentil.image_path lentil_images(:one))
     assert page.has_selector?('body.lentil-images_show')
   end
+	
+  test "video should have a video tag" do
+    visit(lentil.image_path lentil_images(:video))
+    assert page.has_selector?('video')
+  end
 
-end
+end

data/test/test_helper.rb

@@ -44,7 +44,7 @@ class ActionDispatch::IntegrationTest
     visit admin_root_path
     fill_in 'Email', with: 'admin@example.com'
     fill_in 'Password', with: 'password'
-    click_on 'Sign in'
+    click_on 'Log in'
   end
 
   def browser_start

data/vendor/assets/javascripts/animatedimages/js/jquery.gridrotator.js

@@ -233,33 +233,41 @@
 					$img.parent().css( 'background-image', 'url(' + src + ')' );
 
 					if( loaded === count ) {
+						self._loadingComplete($imgs);
+					}
 
-						$imgs.remove();
-						self.$el.removeClass( 'ri-grid-loading' );
-						// the items
-						self.$items = self.$list.children( 'li' );
-						// make a copy of the items
-						self.$itemsCache = self.$items.clone();
-						// total number of items
-						self.itemsTotal = self.$items.length;
-						// the items that will be out of the grid
-						// actually the item's child (anchor element)
-						self.outItems= [];
-						self._layout( function() {
-							self._initEvents();
-						} );
-						// replace [options.step] items after [options.interval] time
-						// the items that go out are randomly chosen, while the ones that get in
-						// follow a "First In First Out" logic
-						self._start();
+				} ).bind('error', function() {
+					count--;
 
+					if( loaded === count ) {
+						self._loadingComplete($imgs);
 					}
+				}).attr( 'src', src );
 
-				} ).attr( 'src', src )
-				 
 			} );
 
 		},
+		_loadingComplete : function($imgs) {
+			var self = this;
+			$imgs.remove();
+			self.$el.removeClass( 'ri-grid-loading' );
+			// the items
+			self.$items = self.$list.children( 'li' );
+			// make a copy of the items
+			self.$itemsCache = self.$items.clone();
+			// total number of items
+			self.itemsTotal = self.$items.length;
+			// the items that will be out of the grid
+			// actually the item's child (anchor element)
+			self.outItems= [];
+			self._layout( function() {
+				self._initEvents();
+			} );
+			// replace [options.step] items after [options.interval] time
+			// the items that go out are randomly chosen, while the ones that get in
+			// follow a "First In First Out" logic
+			self._start();
+		},
 		_layout : function( callback ) {
 
 			var self = this;
@@ -643,6 +651,11 @@
 					}
 					
 					$el.next().remove();
+					var videos = $el.find("video");
+					if(videos.length !== 0) {
+					//Since it's a clone, have to start the event manually
+						videos[0].play();
+					}
 					$el.parent().data( 'active', false );
 
 				}, t );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.20
+        version: 3.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.20
+        version: 3.2.21
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: meta_search
   requirement: !ruby/object:Gem::Requirement
@@ -646,6 +646,7 @@ files:
 - db/migrate/20130506204728_add_donor_agreement_rejected_to_images.rb
 - 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/seeds.rb
 - lib/generators/lentil/USAGE
 - lib/generators/lentil/install_generator.rb
@@ -856,7 +857,8 @@ homepage: https://github.com/NCSU-Libraries/lentil
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: You may need to run 'bundle exec rake lentil:install:migrations'
+  to incorporate any new database migration files.
 rdoc_options: []
 require_paths:
 - lib
@@ -872,7 +874,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: lentil supports the harvesting of images from Instagram.