lentil 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc8b593e81dc92d835ecb8376fb7d5483c1e8bbe
-  data.tar.gz: 3695ab310995d17e570cb4ca4335e1f3242f734b
+  metadata.gz: d0071e0e9cac7e3e22897146471625cdc522ca8b
+  data.tar.gz: d25b8819f50541f248855b0ac6584bad2ce256d7
 SHA512:
-  metadata.gz: 50d9a3f4ad056eefbd00e63dc9635a733f0af428345d5282eb06de0177f43d93a35a9134be387e0171ec779fc8272055a12fbc6b86ff3a19b3f11ba9397f4db8
-  data.tar.gz: ff2ae62d71a0dc740e012166339b3a7be550e290bd881680601f38eace29d8c85c7c1e3e91e753d7cf00ec9b212d0fa6e23f4b1725a3a93fe949db62117fef8d
+  metadata.gz: b6fd1f6e993cfa866b1448ba22e0a07a7f5750cc3a527d1a9a2b247c39fcdb324ae97fb177ad4cb4f7a91f0f61cdac0f81a2e12e5ee230920f1adabed2977358
+  data.tar.gz: 878f9f2cbadd5fb71b9804c07d2235a90390c13c126086b6cecca2dd6cdbd09992c426e680280bd554485c7b8c62a403b006c757583056a9fb2fdbd1faaa0b89

data/README.md

@@ -17,14 +17,18 @@ Although we are using this gem in production, **this gem should be considered an
 
 lentil has been tested under Ruby 1.9.3 through 2.2.0.
 
+> We are currently warning against using MySQL due to issues when encoding emoji. PostgreSQL is preferred, but if this is not an option, you may want to follow [this guide](http://tech.taskrabbit.com/blog/2014/04/24/active-record-mysql-and-emoji/).
+
 ### Create a new Rails app with Rails 3.2.x
 
 ```sh
-rails new your_app_name
+gem install rails -v '~> 3.2'
+rails _3.2.22_ new your_app_name
 cd your_app_name
 ```
+> In the example above, `3.2.22` should be the version of Rails 3.x that is installed by the `gem` command.
 
-### Add lentil and therubyracer (or another ExecJS runtime) to your Gemfile and `bundle`
+### Add lentil and therubyracer (or another ExecJS runtime) to your Gemfile and run `bundle update`
 
 ```ruby
 gem 'lentil'

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

@@ -18,7 +18,7 @@ function listenforpopstate() {
             // and this doesn't look like an image url
             // switch to page that matches the url
             if (!/images\/[0-9]/.test(window.location.pathname)) {
-              window.location.href = window.location.pathname;
+                window.location.href = window.location.pathname;
             }
         } else {
 
@@ -26,7 +26,7 @@ function listenforpopstate() {
             // but the url looks like an image url
             // switch to the image page that matches the url
             if (/images\/[0-9]/.test(window.location.pathname)) {
-              window.location.href = window.location.pathname;
+                window.location.href = window.location.pathname;
             }
         }
     };
@@ -45,28 +45,28 @@ function pushimageurl() {
         replacementUrl = replacementUrl.replace("//","/");
     }
 
-    // push the url for the displayed image to the browser
-    window.history.pushState(null, null, replacementUrl);
-
-    Lentil.ga_track(['_trackPageview', replacementUrl]);
-
-    // listen for popstate (back/forward button)
-    window.onpopstate = function(){
-        if (/images\/[0-9]/.test(window.location.pathname)) {
-            // if this url looks like an image show url then switch
-            // the browser to the displayed url
-            window.location.href = window.location.pathname;
-        } else {
-            // otherwise switch the popcalled state to true
-            // and close the fancybox
-            FancyBoxCloseFunctionState.popcalled = true;
-            $.fancybox.close();
-            // switch the popcalled flag to false
-            // and the fancybox visible flag to false
-            FancyBoxCloseFunctionState.popcalled = false;
-            FancyBoxCloseFunctionState.fancyboxvisible = false;
-        }
-    };
+// push the url for the displayed image to the browser
+window.history.pushState(null, null, replacementUrl);
+
+Lentil.ga_track(['_trackPageview', replacementUrl]);
+
+// listen for popstate (back/forward button)
+window.onpopstate = function(){
+    if (/images\/[0-9]/.test(window.location.pathname)) {
+        // if this url looks like an image show url then switch
+        // the browser to the displayed url
+        window.location.href = window.location.pathname;
+    } else {
+        // otherwise switch the popcalled state to true
+        // and close the fancybox
+        FancyBoxCloseFunctionState.popcalled = true;
+        $.fancybox.close();
+        // switch the popcalled flag to false
+        // and the fancybox visible flag to false
+        FancyBoxCloseFunctionState.popcalled = false;
+        FancyBoxCloseFunctionState.fancyboxvisible = false;
+    }
+};
 }
 
 function addfancybox() {
@@ -78,42 +78,38 @@ function addfancybox() {
         prevEffect  : 'none',
         live : true,
         loop : false,
-        minWidth : '250px',
+        autoSize : true,
+        fitToView: true,
+        minWidth : 250,
+        scrolling : 'no',
         type: 'html',
         helpers     : {
             title   : { type : 'inside' },
             overlay : { locked : false }
         },
         aspectRatio : true,
-        afterLoad: function(current, previous) {
+        beforeLoad: function() {
+            var img = $(this.element).children(".instagram-img");
 
-          // pushing base url so that back/close returns to image gallery
-          // instead of image show
-          window.history.pushState(null,null,FancyBoxCloseFunctionState.pathname);
+            if($(img).attr("data-media-type") === "video") {
+                this.content = '<video class="fancybox-video" controls="controls" height="100%"  width="100%" src="' + this.href + '" oncanplay="$.fancybox.update()"></video>';
+            } else {
+                this.content = '<img class="fancybox-img" src="' + this.href + '" onload="$.fancybox.update()"/>';
+            }
+            return true;
+        },
+        afterLoad: function(current, previous) {
+            // pushing base url so that back/close returns to image gallery
+            // instead of image show
+            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);
             pushimageurl(imageId);
         },
         afterShow : function() {
-
             // checks whether browser understands touch events
             // if so the next/prev buttons are disabled
             // and swipe down/right is added to advance slides
@@ -130,9 +126,6 @@ function addfancybox() {
                 });
             }
 
-            // adds button handling script to displayed fancybox buttons
-            buttonhandler();
-
             // this is to check that the fancybox is really visible
             // afterClose is fired off on fancybox open -- a bug
             FancyBoxCloseFunctionState.fancyboxvisible = true;
@@ -155,14 +148,14 @@ function addfancybox() {
         afterClose : function() {
             if (FancyBoxCloseFunctionState.popcalled === false && FancyBoxCloseFunctionState.fancyboxvisible === true) {
 
-              // if after closing the fancybox there is no pop event
-              // and the fancybox is visible
-              // (this afterClose event also fires when fancybox opens
-              // -- a bug we're getting around with this hack)
-              // switch the flags and point the url at the previous page
-              // should be an image tile view (recent, popular, staff picks, etc.)
-              FancyBoxCloseFunctionState.fancyboxvisible = false;
-              window.history.back();
+                // if after closing the fancybox there is no pop event
+                // and the fancybox is visible
+                // (this afterClose event also fires when fancybox opens
+                // -- a bug we're getting around with this hack)
+                // switch the flags and point the url at the previous page
+                // should be an image tile view (recent, popular, staff picks, etc.)
+                FancyBoxCloseFunctionState.fancyboxvisible = false;
+                window.history.back();
             }
         }
     });

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

@@ -1,6 +1,6 @@
 function buttonhandler() {
 
-    $(".like-btn, .flag-confirm").click(function(e) {
+    $("body").on("click", ".like-btn, .flag-confirm", function(e) {
         button = $(this);
         imageId = $(".fancybox-wrap, .image-show").attr("id");
         if (!$(button).is(".already-clicked")) {
@@ -20,4 +20,4 @@ function buttonhandler() {
         }
         e.preventDefault();
     });
-}
+}

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

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

data/app/assets/stylesheets/lentil/breakpoint/sass/_components.scss

@@ -140,6 +140,14 @@ div.images {
     border-radius: 3px;
 }
 
+.fancybox-inner {
+    min-width: 250px;
+}
+
+.fancybox-nav {
+    height:90%;
+}
+
 .pagination .disabled, .pagination .current {
     color: #000;
 }
@@ -312,4 +320,4 @@ body.lt-ie8 {
 
 body.lt-ie8 div.image-tile {
     width: 300px;
-}
+}

data/app/assets/stylesheets/lentil/breakpoint/sass/_structure.scss

@@ -29,7 +29,7 @@
     .side-filler { width: fluid(0); }
 
     ul {
-        margin-top: 30px;
+        margin-top: 25px;
     }
 
     .navbar .library-brand {
@@ -219,4 +219,4 @@
 
 @include breakpoint(124, $label: 'microtile'){
     .image-tile { width: fluid(8); }
-}
+}

data/app/models/lentil/image.rb

@@ -38,7 +38,7 @@ class Lentil::Image < ActiveRecord::Base
                   :do_not_request_donation, :donor_agreement_rejected, :media_type, :video_url, :suppressed
 
   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"
@@ -97,8 +97,8 @@ class Lentil::Image < ActiveRecord::Base
 
   def service_tags
     begin
-      tag_ids = self.taggings.where(:staff_tag => false).pluck(:tag_id)
-      tags = Lentil::Tag.find(tag_ids).sort_by(&:name)
+      tag_ids = self.taggings.select { |tagging| tagging.staff_tag == false }.map(&:tag_id)
+      tags = self.tags.select { |tag| tag_ids.include? tag.id}.sort_by(&:name)
     rescue
       Rails.logger.error "Error retrieving service_tags"
       tags = []
@@ -107,31 +107,19 @@ class Lentil::Image < ActiveRecord::Base
 
   def staff_tags
     begin
-      tag_ids = self.taggings.where(:staff_tag => true).pluck(:tag_id)
-      tags = Lentil::Tag.find(tag_ids).sort_by(&:name)
+      tag_ids = self.taggings.select { |tagging| tagging.staff_tag == true }.map(&:tag_id)
+      tags = self.tags.select { |tag| tag_ids.include? tag.id}.sort_by(&:name)
     rescue
       Rails.logger.error "Error retrieving staff_tags"
       tags = []
     end
   end
 
-  def available_staff_tags
-    begin
-      system_tag_ids = self.taggings.where(:staff_tag => false).pluck(:tag_id)
-    rescue
-      Rails.logger.error "Error retrieving staff_tags"
-      tags = []
-    else
-      tags = []
-      Lentil::Tag.all.each do |tag|
-        unless system_tag_ids.include? tag.id
-          tags.push(tag)
-        end
-      end
-
-      if tags.length > 0
-        tags = tags.sort_by(&:name)
-      end
+  def available_staff_tags(all_tags)
+    tags = all_tags - (self.tags - self.staff_tags)
+
+    if tags.length > 0
+      tags = tags.sort_by(&:name)
     end
   end
 
@@ -189,7 +177,6 @@ class Lentil::Image < ActiveRecord::Base
   }
 
   state_machine :state, :initial => :pending do
-
     States.each do |name, value|
       state name, :value => value
     end
@@ -201,9 +188,8 @@ class Lentil::Image < ActiveRecord::Base
     event :reject do
       transition all => :rejected
     end
-
   end
-  
+
   def original_metadata=(meta)
     write_attribute(:original_metadata, meta.to_hash)
   end

data/app/models/lentil/tag.rb

@@ -20,7 +20,9 @@ class Lentil::Tag < ActiveRecord::Base
   validates_presence_of :name
 
   scope :harvestable, where(:lentil_tagsets => {:harvest => true}).includes(:tagsets)
-  
+  scope :not_harvestable, where(:lentil_tagsets => {:harvest => false}).includes(:tagsets)
+  scope :no_tagsets, where(:lentil_tagset_assignments => {:tag_id => nil}).includes(:tagset_assignments)
+
   #Stripping tags on write
   def name=(new_name)
     write_attribute(:name, new_name.sub(/^#/, ''))

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

@@ -6,6 +6,7 @@
         <th>Description</th>
         <th>Username</th>
         <th>Service Tags</th>
+        <th>Harvesting Tags</th>
         <th>Staff Tags</th>
         <th>Staff Like</th>
         <th>DNR</th>
@@ -31,8 +32,16 @@
             <td><%= image.service_tags.map{|tag| tag.name}.join(' | ') %>
               <%= f.input "service_tags", :as => :hidden, :collection => image.service_tags, :wrapper_html => {:style => "list-style: none"} %>
             </td>
+            <td><%= image.service_tags.select{|tag| @harvestable_tag_ids.include? tag.id}.map{|tag| tag.name}.join(' | ') %></td>
             <td class="moderation_tag">
-              <%= f.input :tags, :label => false, :as => :select, :collection => image.available_staff_tags, :input_html => {:multiple => true, :class => "chzn-select", :'data-placeholder' => 'Select Tag', :style => "width:190px" }%>
+              <% if defined? @tags %>
+                <%= f.input :tags, :label => false, :as => :select, :collection => image.available_staff_tags(@tags), :input_html => {:multiple => true, :class => "chzn-select", :'data-placeholder' => 'Select Tag', :style => "width:190px" }%>
+              <% else %>
+                <% if image.staff_tags.length > 0 %>
+                  <p><%= image.staff_tags.map{|tag| tag.name}.join(' | ') %></p>
+                <% end %>
+                <%= link_to('Edit Staff Tags', update_image_admin_lentil_image_path(image)) %>
+              <% end %>
             </td>
             <td><%= f.input :staff_like, :label => "Staff Like", :wrapper_html => { :class => "moderation_checkbox" } %></td>
             <td><%= f.input :do_not_request_donation, :label => "Don't request donation", :wrapper_html => { :class => "moderation_checkbox" } %></td>

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

@@ -7,6 +7,7 @@
         <th>Description</th>
         <th>Username</th>
         <th>All Tags</th>
+        <th>Harvesting Tags</th>
         <th>Moderator</th>
         <th>Status</th>
       </tr>
@@ -19,6 +20,7 @@
             <td><%= image.description %></td>
             <td><%= image.user.user_name %></td>
             <td><%= image.tags.map{|tag| tag.name}.join(' | ') %></td>
+            <td><%= image.service_tags.select{|tag| @harvestable_tag_ids.include? tag.id}.map{|tag| tag.name}.join(' | ') %></td>
             <td><%= image.moderator.email if image.moderator %></td>
             <td><%= image.state_name %></td>
         <% end -%>
@@ -30,4 +32,4 @@
   <div class="blank_slate_container">
     <span class="blank_slate">No Flagging History Found</span>
   </div>
-<% end -%>
+<% end -%>

data/app/views/admin/stats/_stats.html.erb

@@ -0,0 +1,14 @@
+<table class="index_table">
+  <thead>
+    <tr>
+      <th>Stat Name</th>
+      <th>Value</th>
+    </tr>
+  </thead>
+  <% @stats.each do |stat| %>
+    <tr class=>
+      <td><%= stat[:name] %></td>
+      <td><%= stat[:value] %></td>
+    </tr>
+  <% end -%>
+</table>

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

@@ -1,18 +1,20 @@
-    <div class="images">
-      <% @images.each do |image| %>
+<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.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}) %>
+            <% unless image.media_type == "video" %>
+                <%= 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, :media_type => image.media_type}) %>
+                <% end %>
             <% 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}) %>
+                <%= link_to url_for(image), 'data-fancybox-href' => image.video_url, 'data-fancybox-group' => "image-tile-gallery", :class => :fancybox  do %>
+                    <%= video_tag(image.video_url, :autoplay => "true", :muted => "true", :loop => "true", :class => "instagram-img-" + image.id.to_s, :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 %>
-          <% end %>
 
-          <%= render "/layouts/lentil/image_popup", :image => image  %>
-          <% if params[:controller] == "lentil/thisorthat" %>
-            <div class="battle-leader-overlay"><%= number_to_percentage(image.win_pct, :precision => 0) %></div>
-          <% end -%>
+            <%= render "/layouts/lentil/image_popup", :image => image  %>
+            <% if params[:controller] == "lentil/thisorthat" %>
+                <div class="battle-leader-overlay"><%= number_to_percentage(image.win_pct, :precision => 0) %></div>
+            <% end -%>
         </div>
-      <% end -%>
-    </div>
+    <% end -%>
+</div>

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

@@ -4,10 +4,11 @@
       <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">
               <% unless image.media_type == "video" %>
+                <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox">
                 <%= 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 %>
+                <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.video_url %>" class="fancybox">
                 <%= 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>
@@ -28,10 +29,11 @@
   <% @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">
               <% unless image.media_type == "video" %>
+                <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.jpeg %>" class="fancybox">
                 <%= 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 %>
+                <a href="<%= url_for(image) %>" data-fancybox-href= "<%= image.video_url %>" class="fancybox">
                 <%= 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>

data/lib/lentil/admin/flags.rb

@@ -14,4 +14,4 @@ if defined?(ActiveAdmin)
       column :updated_at
     end
   end
-end
+end

data/lib/lentil/admin/images.rb

@@ -2,10 +2,41 @@ if defined?(ActiveAdmin)
   ActiveAdmin.register Lentil::Image do
     actions :index, :show
 
-    config.batch_actions = false
+    config.batch_actions = true
     config.per_page = 10
 
-    filter :state, :as => :select, :collection => proc { Lentil::Image::States }
+    batch_action :destroy, false
+
+    batch_action :approve_all do |ids|
+      images = Lentil::Image.where(id: ids)
+      total_images = images.size
+      image_counter = 0
+      errors = []
+
+      images.each do |image|
+        second_moderation = true
+        unless image.moderator_id.nil?
+          second_moderation = false
+        end
+
+        begin
+          image.update_attributes!(:state => 1, :moderator => current_admin_user, :moderated_at => DateTime.now,
+            :second_moderation => second_moderation)
+        rescue Exception => e
+          errors << "image_id #{image.id}: #{e.message}"
+          next
+        end
+
+        image_counter += 1
+      end
+
+      if errors.length > 0
+        redirect_to collection_path, notice: "#{image_counter} #{'Image'.pluralize(image_counter)} approved (out of #{total_images})", alert: errors.join('<br>').html_safe
+      else
+        redirect_to collection_path, notice: "#{image_counter} #{'Image'.pluralize(image_counter)} approved (out of #{total_images})"
+      end
+    end
+
     filter :suppressed
     filter :media_type, :as => :select
     filter :user_user_name, :as => :string, :label => "Username"
@@ -22,16 +53,40 @@ if defined?(ActiveAdmin)
     filter :url, :label => "Service URL"
     filter :id
 
+    scope :all
+    scope :new, :default => true do |images|
+      images.where(:state => Lentil::Image::States[:pending])
+    end
+    scope :approved do |images|
+      images.where(:state => Lentil::Image::States[:approved])
+    end
+    scope :rejected do |images|
+      images.where(:state => Lentil::Image::States[:rejected])
+    end
+    scope :skipped do |images|
+      images.where(:state => Lentil::Image::States[:pending]).where("moderator_id IS NOT NULL")
+    end
+    # scope :flagged do |images|
+    #   # images.where(:state => Lentil::Image::States[:pending]).where("moderator_id IS NOT NULL")
+    #   images.includes(:user, :tags, :taggings, :flags).joins(:flags).where(:second_moderation => false).uniq.all
+    # end
+
     action_item :only => :show do
       link_to('Update Image', update_image_admin_lentil_image_path(lentil_image))
     end
     action_item { link_to "Moderate New", moderate_admin_lentil_images_path }
     action_item { link_to "Moderate Skipped", moderate_skipped_admin_lentil_images_path }
     action_item { link_to "Moderate Flagged", moderate_flagged_admin_lentil_images_path }
+    action_item { link_to "Moderate Approved", moderate_approved_admin_lentil_images_path }
+    action_item { link_to "Moderate Rejected", moderate_rejected_admin_lentil_images_path }
     action_item { link_to "Flagging History", flagging_history_admin_lentil_images_path }
     action_item { link_to "Add Instagram Image", manual_input_admin_lentil_images_path }
 
     index do
+      harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
+      if current_scope.name == 'New'
+        selectable_column
+      end
       column "Image" do |image|
         unless image.media_type == "video"
             link_to(image_tag(image.image_url, :class => "moderation_thumbnail"), admin_lentil_image_path(image))
@@ -50,6 +105,9 @@ if defined?(ActiveAdmin)
       column "All Tags" do |image|
         image.tags.map{|tag| tag.name}.join(' | ')
       end
+      column "Harvesting Tags" do |image|
+        image.service_tags.select{|tag| harvestable_tag_ids.include? tag.id}.map{|tag| tag.name}.join(' | ')
+      end
       column "Likes", :like_votes_count
       column :staff_like
       column "Battles", :battles_count, :sortable => false
@@ -68,6 +126,7 @@ if defined?(ActiveAdmin)
     end
 
     show :title => :id do |image|
+      harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
       attributes_table do
         row :id
         row :description
@@ -90,6 +149,13 @@ if defined?(ActiveAdmin)
             "Image has not been tagged."
           end
         end
+        row "Harvesting Tags" do |image|
+          unless image.service_tags.select{|tag| harvestable_tag_ids.include? tag.id}.empty?
+            image.service_tags.select{|tag| harvestable_tag_ids.include? tag.id}.map{|tag| tag.name}.join(' | ')
+          else
+            "Image has no harvesting tags."
+          end
+        end
         row :staff_like
         row :do_not_request_donation
         row :donor_agreement_submitted_date
@@ -99,51 +165,88 @@ if defined?(ActiveAdmin)
           image.state_name
         end
         row :image do
-			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
+      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
     end
 
     controller do
+      def scoped_collection
+        super.includes :user, :taggings, :tags
+      end
+
+      # TODO: This method may need optimization
       def update_images(images, images_params, second_moderation)
+        total_images = images.size
+        image_counter = 0
+        errors = []
+
         images.each do |image|
           image_params = images_params[image.id.to_s]
 
-          incoming_tag_ids = image_params['tag_ids'].reject(&:empty?)
-          existing_tag_ids = []
-          service_tag_ids = []
+          if image_params.key?(:tag_ids)
+            incoming_tag_ids = image_params['tag_ids'].reject(&:empty?)
+            existing_tag_ids = []
+            service_tag_ids = []
 
-          image.taggings.each do |tagging|
-            existing_tag_ids << tagging[:tag_id]
-            if tagging[:staff_tag] == false
-              service_tag_ids << tagging[:tag_id]
+            image.taggings.each do |tagging|
+              existing_tag_ids << tagging[:tag_id]
+              if tagging[:staff_tag] == false
+                service_tag_ids << tagging[:tag_id]
+              end
             end
-          end
 
-          new_tag_ids = incoming_tag_ids - existing_tag_ids
-          tag_ids_to_keep = incoming_tag_ids - new_tag_ids + service_tag_ids
+            new_tag_ids = incoming_tag_ids - existing_tag_ids
+            tag_ids_to_keep = incoming_tag_ids - new_tag_ids + service_tag_ids
 
-          new_taggings = []
-          new_tag_ids.each do |id|
-            new_taggings << image.taggings.build(:tag_id => id, :staff_tag => true)
+            new_taggings = []
+            new_tag_ids.each do |id|
+              new_taggings << image.taggings.build(:tag_id => id, :staff_tag => true)
+            end
+
+            taggings_to_keep = image.taggings.select{ |tagging| tag_ids_to_keep.include? tagging.tag_id}
+            taggings = new_taggings + taggings_to_keep
+
+            # Save Updated Image with new tags
+            begin
+              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'], :suppressed => image_params['suppressed'])
+            rescue Exception => e
+              errors << "image_id #{image.id}: #{e.message}"
+              next
+            end
+          else
+            # Save Updated Image with same tags
+            begin
+              image.update_attributes!(:state => image_params['state'], :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'], :suppressed => image_params['suppressed'])
+            rescue Exception => e
+              errors << "image_id #{image.id}: #{e.message}"
+              next
+            end
           end
 
-          taggings_to_keep = image.taggings.where(:tag_id => tag_ids_to_keep)
-          taggings = new_taggings + taggings_to_keep
+          image_counter += 1
+        end
 
-          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'], :suppressed => image_params['suppressed'])
+        if errors.length > 0
+          redirect_to :back, notice: "#{image_counter} #{'Image'.pluralize(image_counter)} moderated (out of #{total_images})", alert: errors.join('<br>').html_safe
+        else
+          redirect_to :back, notice: "#{image_counter} #{'Image'.pluralize(image_counter)} moderated (out of #{total_images})"
         end
       end
     end
 
     member_action :update_image do
+      @tags = Lentil::Tag.all
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
       id = params['id']
       @second_moderation = false
       @images = Lentil::Image.where(id: id)
@@ -151,42 +254,51 @@ if defined?(ActiveAdmin)
     end
 
     collection_action :moderate do
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
       @second_moderation = false
-      @images = Lentil::Image.where(state: Lentil::Image::States[:pending], moderator_id: nil).paginate(:page => params[:page], :per_page => 10)
+      @images = Lentil::Image.includes(:user, :taggings, :tags).where(state: Lentil::Image::States[:pending], moderator_id: nil).paginate(:page => params[:page], :per_page => 10)
+    end
+
+    collection_action :moderate_approved do
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
+      @second_moderation = false
+      @images = Lentil::Image.includes(:user, :taggings, :tags).where(state: Lentil::Image::States[:approved]).paginate(:page => params[:page], :per_page => 10)
+      render "/admin/lentil_images/moderate"
+    end
+
+    collection_action :moderate_rejected do
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
+      @second_moderation = false
+      @images = Lentil::Image.includes(:user, :taggings, :tags).where(state: Lentil::Image::States[:rejected]).paginate(:page => params[:page], :per_page => 10)
+      render "/admin/lentil_images/moderate"
     end
 
     collection_action :moderate_skipped do
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
       @second_moderation = false
-      @images = Lentil::Image.where(state: Lentil::Image::States[:pending]).where("moderator_id IS NOT NULL").paginate(:page => params[:page], :per_page => 10)
+      @images = Lentil::Image.includes(:user, :taggings, :tags).where(state: Lentil::Image::States[:pending]).where("moderator_id IS NOT NULL").paginate(:page => params[:page], :per_page => 10)
       render "/admin/lentil_images/moderate"
     end
 
     collection_action :moderate_flagged do
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
       @second_moderation = true
-      @images = Lentil::Image.joins(:flags).group("lentil_images.id").having("count(lentil_flags.id) > 0").where(:second_moderation => false).paginate(:page => params[:page], :per_page => 10)
+      temp_images = Lentil::Image.includes(:user, :tags, :taggings, :flags).joins(:flags).where(:second_moderation => false).uniq.all
+      @images = Kaminari.paginate_array(temp_images).page(params[:page]).per(10)
       render "/admin/lentil_images/moderate"
     end
 
     collection_action :do_moderation, :method => :post do
-      images = Lentil::Image.find(params[:image].keys)
+      images = Lentil::Image.find(params[:image].keys, :include => [:user, :taggings, :tags])
       images_params = params[:image]
       second_moderation = params[:moderation]['second_moderation']
-
-      begin
-        update_images(images, images_params, second_moderation)
-      rescue => e
-        message = "Error moderating images: " + e.to_s
-        redirect_to :back, :flash => {:error => message}
-      else
-        number_of_images = params['image'].size
-        plural = 'image'.pluralize(number_of_images)
-        message = number_of_images.to_s + " " + plural + " moderated."
-        redirect_to :back, notice: message
-      end
+      update_images(images, images_params, second_moderation)
     end
 
     collection_action :flagging_history do
-      @images = Lentil::Image.joins(:flags).group("lentil_images.id").having("count(lentil_flags.id) > 0").paginate(:page => params[:page], :per_page => 10)
+      @harvestable_tag_ids = Lentil::Tag.harvestable.map(&:id)
+      temp_images = Lentil::Image.includes(:user, :tags, :flags, :moderator).joins(:flags).uniq.all
+      @images = Kaminari.paginate_array(temp_images).page(params[:page]).per(10)
     end
 
     collection_action :manual_input do

data/lib/lentil/admin/stats.rb

@@ -0,0 +1,34 @@
+ActiveAdmin.register_page "Stats" do
+  content do
+    render partial: 'stats'
+  end
+
+  controller do
+    def index
+      stats = []
+
+      images = Lentil::Image.all
+      battles = Lentil::Battle.count
+      like_votes = Lentil::LikeVote.count
+      users = Lentil::User.count
+      tags = Lentil::Tag.count
+      taggings = Lentil::Tagging.count
+
+      submitted_agreements = images.map(&:donor_agreement_submitted_date).compact.count
+      rejected_agreements = images.map(&:donor_agreement_rejected).compact.count
+      accepted_aggrements = submitted_agreements - rejected_agreements
+
+      stats << {name: 'Number of Images', value: images.count}
+      stats << {name: 'Number of Battles', value: battles}
+      stats << {name: 'Number of Like Votes', value: like_votes}
+      stats << {name: 'Number of Users', value: users}
+      stats << {name: 'Number of Submitted Donor Agreements', value: submitted_agreements}
+      stats << {name: 'Number of Accepted Donor Agreements (implicit)', value: accepted_aggrements}
+      stats << {name: 'Number of Rejected Donor Agreements (explicit)', value: rejected_agreements}
+      stats << {name: 'Number of Unique Tags', value: tags}
+      stats << {name: 'Number of Taggings', value: taggings}
+
+      @stats = stats
+    end
+  end
+end

data/lib/lentil/admin/tags.rb

@@ -6,13 +6,34 @@ if defined?(ActiveAdmin)
     config.sort_order = "name_asc"
 
     filter :name
+    filter :tagsets_title, :as => :string, :label => "Tagsets"
+
+    scope :all, :default => true
+    scope "Harvesting", :harvestable
+    scope "Not Harvesting", :not_harvestable
+    scope "Not in a Tagset", :no_tagsets
 
     index :download_links => false do
+      harvestable_ids = Lentil::Tag.harvestable.map(&:id)
+
       column :id
       column :name
+      column "Harvestable" do |tag|
+        if harvestable_ids.include?(tag.id)
+          "True"
+        else
+          "False"
+        end
+      end
       column "Tagsets" do |tag|
         tag.tagsets.sort_by(&:title).map{ |t| t.title}.join(' | ')
       end
     end
+
+    controller do
+      def scoped_collection
+        super.includes :taggings, :tagsets
+      end
+    end
   end
-end
+end

data/lib/lentil/admin/tagsets.rb

@@ -6,6 +6,7 @@ if defined?(ActiveAdmin)
 
     filter :title
     filter :description
+    filter :tags_name, :collection => proc {Lentil::Tag.all.sort_by(&:name)}, :as => :string, :label => "Tags"
 
     scope :all
     scope :harvesting, :default => true do |tagsets|
@@ -43,9 +44,11 @@ if defined?(ActiveAdmin)
         f.input :title
         f.input :description
         f.input :tags, :input_html => {:class => [:"chzn-select"]}, :collection => Lentil::Tag.all.sort_by(&:name)
-        f.input :harvest
+        f.input :harvest do |harvest|
+          harvest.capitalize
+        end
       end
       f.actions
     end
   end
-end
+end

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/test/dummy/config/database.yml

@@ -4,7 +4,6 @@ sqlite: &sqlite
 
 mysql: &mysql
   adapter: mysql2
-  encoding: utf8
   username: travis
   password:
   database: lentil_<%= Rails.env %>
@@ -20,6 +19,7 @@ defaults: &defaults
   pool: 5
   timeout: 5000
   host: 127.0.0.1
+  encoding: utf8
   <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
@@ -29,4 +29,4 @@ test:
   <<: *defaults
 
 production:
-  <<: *defaults
+  <<: *defaults

data/test/dummy/config/environments/test.rb

@@ -11,6 +11,12 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  #config.assets.compile = false
+
+  # Generate digests for assets URLs
+  #config.assets.digest = true
+
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 

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

@@ -12,10 +12,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?('six #hunttesting')
-    assert page.has_no_selector?('.fancybox-image')
+    assert page.has_no_selector?('.fancybox-img')
     # all('.fancybox').first.click
     find('.fancybox', match: :first).click
     assert page.has_content?('six #hunttesting')
-    assert page.has_selector?('.fancybox-image')
+    assert page.has_selector?('.fancybox-img')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -271,14 +271,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: google-analytics-rails
   requirement: !ruby/object:Gem::Requirement
@@ -609,6 +609,7 @@ files:
 - app/views/admin/lentil_images/flagging_history.html.erb
 - app/views/admin/lentil_images/manual_input.html.erb
 - app/views/admin/lentil_images/moderate.html.erb
+- app/views/admin/stats/_stats.html.erb
 - app/views/layouts/lentil/_apple_touch_icons.html.erb
 - app/views/layouts/lentil/_error.html.erb
 - app/views/layouts/lentil/_flag_button.html.erb
@@ -703,6 +704,7 @@ files:
 - lib/lentil/admin/dashboard.rb
 - lib/lentil/admin/flags.rb
 - lib/lentil/admin/images.rb
+- lib/lentil/admin/stats.rb
 - lib/lentil/admin/tags.rb
 - lib/lentil/admin/tagsets.rb
 - lib/lentil/admin/user.rb