sufia 3.6.0 → 3.7.0

data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb

@@ -7,8 +7,6 @@ module Sufia
     include Blacklight::Catalog
 
     included do
-      include Hydra::BatchEditBehavior
-      include Blacklight::Catalog
       include Blacklight::Configurable # comply with BL 3.7
       include ActionView::Helpers::DateHelper
       # This is needed as of BL 3.7
@@ -30,22 +28,12 @@ module Sufia
     end
 
     def index
-      if params[:controller] == "dashboard"
-        extra_head_content << view_context.auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results")
-        extra_head_content << view_context.auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results")
-      else
-        # This is for controllers that use this behavior that are defined outside Sufia
-        extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => "RSS for results")
-        extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => "Atom for results")
-      end
       (@response, @document_list) = get_search_results
       @user = current_user
       @events = @user.events(100)
       @last_event_timestamp = @user.events.first[:timestamp].to_i || 0 rescue 0
       @filters = params[:f] || []
   
-      # adding a key to the session so that the history will be saved so that batch_edits select all will work
-      search_session[:dashboard] = true 
       respond_to do |format|
         format.html { }
         format.rss  { render :layout => false }

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -33,7 +33,7 @@ module Sufia::UsersControllerBehavior
     else 
       @events = []
     end
-    @trophies = @user.trophy_ids
+    @trophies = @user.trophy_files
     @followers = @user.followers
     @following = @user.all_following
   end
@@ -41,17 +41,13 @@ module Sufia::UsersControllerBehavior
   # Display form for users to edit their profile information
   def edit
     @user = current_user
-    @trophies = @user.trophy_ids
+    @trophies = @user.trophy_files
   end
 
   # Process changes from profile form
   def update
     if params[:user]
-      if Rails::VERSION::MAJOR == 3
-        @user.update_attributes(params[:user])
-      else
-        @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
-      end
+      @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
     end
     @user.populate_attributes if params[:update_directory]
     @user.avatar = nil if params[:delete_avatar]
@@ -59,31 +55,29 @@ module Sufia::UsersControllerBehavior
       redirect_to sufia.edit_profile_path(URI.escape(@user.to_s,'@.')), alert: @user.errors.full_messages
       return
     end
-    delete_trophy = params.keys.reject{|k,v|k.slice(0,'remove_trophy'.length)!='remove_trophy'}
-    delete_trophy = delete_trophy.map{|v| v.slice('remove_trophy_'.length..-1)}
-    delete_trophy.each do | smash_trophy |
-      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy).each.map(&:delete)
+    params.keys.select {|k, v| k.starts_with? 'remove_trophy_' }.each do |smash_trophy|
+      smash_trophy = smash_trophy.sub /^remove_trophy_/, ''
+      current_user.trophies.where(generic_file_id: smash_trophy).destroy_all
     end
     Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
     redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
   end
 
   def toggle_trophy    
-     id = params[:file_id]
-     id = "#{Sufia.config.id_namespace}:#{id}" unless id.include?(":")
+     id = Sufia::Noid.namespaceize params[:file_id]
      unless current_user.can? :edit, id
        redirect_to root_path, alert: "You do not have permissions to the file"
        return false
      end
      # TODO  make sure current user has access to file
-     t = Trophy.where(:generic_file_id => params[:file_id], :user_id => current_user.id).first
-     if t.blank? 
-       t = Trophy.create(:generic_file_id => params[:file_id], :user_id => current_user.id)
-       return false unless t.persisted?
-     else
+     t = current_user.trophies.where(generic_file_id: params[:file_id]).first
+     if t 
        t.destroy  
        #TODO do this better says Mike
        return false if t.persisted?  
+     else
+       t = current_user.trophies.create(generic_file_id: params[:file_id])
+       return false unless t.persisted?
      end
      render :json => t
   end 

data/app/controllers/dashboard_controller.rb

@@ -1,4 +1,3 @@
-require 'blacklight/catalog'
 class DashboardController < ApplicationController
-  include  Sufia::DashboardControllerBehavior
+  include Sufia::DashboardControllerBehavior
 end

data/app/helpers/sufia_helper.rb

@@ -76,13 +76,14 @@ module SufiaHelper
   end
 
   # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
+  # We should be able to do away with this method in Blacklight 5
   # @example
   #   link_back_to_catalog(:label=>'Back to Search')
-  def link_back_to_catalog(opts={:label=>t('blacklight.back_to_search')})
-    query_params = session[:search] ? session[:search].dup : {}
-    query_params.delete :counter
-    query_params.delete :total
-    link_url = sufia.url_for(query_params)
+  def link_back_to_catalog(opts={:label=>nil})
+    scope = opts.delete(:route_set) || self
+    query_params = current_search_session.try(:query_params) || {}
+    link_url = scope.url_for(query_params)
+    opts[:label] ||= t('blacklight.back_to_search')
     link_to opts[:label], link_url
   end
 end

data/app/helpers/trophy_helper.rb

@@ -7,6 +7,6 @@ module TrophyHelper
      trophyclass = "trophy-on"
    end
 
-   return link_to raw("<i class='#{trophyclass} icon-trophy'></i> #{trophytitle}"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
+   link_to raw("<i class='#{trophyclass} icon-trophy'></i> #{trophytitle}"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
  end
 end

data/app/views/catalog/_index_partials/_default_group.html.erb

@@ -1,6 +1,5 @@
-<% page_info = paginate_params(@response) %>
 <div id="search-results">
-  <ol class="catalog" start="<%=1+((page_info.current_page-1)*page_info.limit_value)%>">
+  <ol class="catalog" start="<%=1+((@response.current_page-1)*@response.limit_value)%>">
     <% docs.each_with_index do |document,counter| %>
     <%= render :partial => 'catalog/_index_partials/list_files', :locals => {:document => document, :counter => counter} %>
   <% end %>

data/app/views/catalog/_results_pagination.html.erb

@@ -1,6 +1,6 @@
-<% if paginate_params(@response).num_pages > 1 %>
-    <div class="pager"> 
-      <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight', :route_set=> sufia %>
+<% if @response.total_pages > 1 %>
+    <div class="pager">
+      <%= paginate @response, :outer_window => 2, :theme => 'blacklight', :route_set=> sufia %>
       <div class="clearfix"></div>
     </div><!-- /pager -->
 <% end %>

data/app/views/catalog/index.html.erb

@@ -14,8 +14,6 @@
 
 	<% @page_title = application_name + " Search Results" %>
 
-  <% extra_head_content << render_opensearch_response_metadata.html_safe %>
-
   <h3>Search Results</h3>
   <div class="alert alert-info"><i class="icon-search icon-large"></i> You searched for: <strong><%= render_constraints(params) %></strong></div>	
   <%= render :partial => 'did_you_mean' %>
@@ -23,7 +21,6 @@
 	<%# render 'constraints', :localized_params=>params %>
   
   <div class="row"> 
-    <%= render_pagination_info @response, :entry_name=>'item' %>
     <%= render 'sort_and_per_page' %>
     <div class="row offset80">
       <%= link_to "New Search", catalog_index_path, :id=>"startOverLink", :class=>"btn btn-info btn-medium" %>

data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb

@@ -2,8 +2,8 @@
 <% if document.image? || document.pdf? || document.video? %>
   <% path = sufia.download_path(document.noid, {datastream_id: 'thumbnail'}) %>
 <% elsif document.audio? %>
-  <% path = "/assets/audio.png" %>
+  <% path = "audio.png" %>
 <% else %>
-  <% path = "/assets/default.png" %>
+  <% path = "default.png" %>
 <% end %>
 <%= link_to image_tag(path, {width: width}), sufia.generic_file_path(document) %>

data/app/views/dashboard/_results_pagination.html.erb

@@ -1,22 +1,6 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-<% if paginate_params(@response).num_pages > 1 %>
-    <div class="pager"> 
-      <%= paginate_rsolr_response @response, :outer_window => 2, :theme => 'blacklight', :route_set=> sufia %>
-      <div class="clearfix"></div>
-    </div><!-- /pager -->
+<% if @response.total_pages > 1 %>
+  <div class="pager"> 
+    <%= paginate @response, :outer_window => 2, :theme => 'blacklight', :route_set=> sufia %>
+    <div class="clearfix"></div>
+  </div><!-- /pager -->
 <% end %>

data/app/views/dashboard/facet.html.erb

@@ -2,7 +2,7 @@
  It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
 -->
 <% content_for :sidebar do %>
-  <p><%= link_back_to_catalog %></p>
+  <p><%= link_back_to_catalog (route_set: sufia) %></p>
 <% end %>
 
 <div class="facet_pagination top">

data/app/views/dashboard/index.html.erb

@@ -13,43 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 %>
+<% content_for :head do %>
+    <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results") %>
+    <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results") %>
+<% end %>
 
 <% content_for :local_js do %>
 
   initialize_audio();
 
-  function getSingleUse(id) {
-    <% rurl = root_url %>
-    <% rurl = rurl.slice(0, rurl.length-1) if rurl[rurl.length-1] == "/" %>
-    var resp = $.ajax({
-      headers: { Accept: "application/javascript" },
-      type: 'get',
-      url: "<%= rurl %>/single_use_link/generate_show/" + id.slice(10),
-      async: false,
-    });
-    return "<%= rurl %>/" + resp.responseText;
-  }
-
-  // Load clipboard swf
-  $(document).ready(function() {
-    ZeroClipboard.setDefaults({ moviePath: "/assets/ZeroClipboard.swf" });
-    $.each($(".copypaste"), function() {
-      var clip = new ZeroClipboard();
-      clip.on("dataRequested", function(client, args) {
-        clip.setText(getSingleUse(this.id));
-      })
-      clip.on("complete", function(client, args) {
-        alert("A single use link to " + args.text + " was copied to your clipboard.")
-      })
-      clip.on("noflash", function(client, args) {
-        alert("Your single-use link: " + getSingleUse(this.id))
-      })
-      clip.on("wrongflash", function(client, args) {
-        alert("Your single-use link: " + getSingleUse(this.id))
-      })
-      clip.glue($("#" + this.id))
-    })
-  });
 
   // hide or show the batch update buttons on page startup
   window.batch_part_on_other_page = <%= @batch_part_on_other_page%>;
@@ -73,7 +45,7 @@ limitations under the License.
     <%= render :partial => 'heading' %>
   </div>
 
-  <% extra_head_content << render_opensearch_response_metadata.html_safe %>
+
   <% if params.has_key?("q") %>
     <div class="alert alert-info"><i class="icon-search icon-large"></i> You searched for: <strong><%= params[:q] %></strong></div>
   <% end %>
@@ -82,8 +54,6 @@ limitations under the License.
   <%= render :partial => 'facet_selected' %>
 
 	<%= render 'constraints', :localized_params=>params %>
-  
-  <% render_pagination_info @response, :entry_name=>'item' %>
 
   <%= render 'sort_and_per_page' %>
 

data/app/views/generic_files/_media_display.html.erb

@@ -1,5 +1,5 @@
 <% if @generic_file.image? %>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new" title="Download the full-sized image"><img src="<%= sufia.download_path(@generic_file, {:datastream_id => 'thumbnail'}) %>" width="338" alt="Download the full-sized image of <%= @generic_file.title.first %>"/>Download the full-sized image</a>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized image of #{@generic_file.title.first}"})+"Download the full-sized image", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized image"}%>
 <% elsif @generic_file.video? %>
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'webm') %>" type="video/webm" />
@@ -7,13 +7,13 @@
     Your browser does not support the video tag.
   </video>
 <% elsif @generic_file.audio? %>
-  <audio controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
+    <audio controls="controls" class="audiojs" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'ogg') %>" type="audio/ogg" />
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp3') %>" type="audio/mpeg" />
     Your browser does not support the audio tag.
   </audio>
 <% elsif @generic_file.pdf?%>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new" title="Download the full-sized PDF"><img src="<%= sufia.download_path(@generic_file, datastream_id: 'thumbnail') %>" width="338" alt="Download the full-sized PDF of <%= @generic_file.title.first %>"/>Download the full-sized PDF</a>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized PDF of #{@generic_file.title.first}"})+"Download the full-sized PDF", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized PDF"}%>
 <% else %>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new"><img src="/assets/default.png" alt="No preview available" width="338" height="493" /></a>
+  <%= link_to image_tag("default.png", {alt:"No preview available", width:"338", height:"493"}),  sufia.download_path(@generic_file), { target:"_new", title:"Download the document"} %>
 <% end %>

data/app/views/layouts/sufia-two-column.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <!DOCTYPE html>
 <html>
   <head>

data/app/views/users/_contributions.html.erb

@@ -1,29 +1,21 @@
-        <div class="tab-pane active" id="contributions">
-		      <i class="icon-trophy trophy-on" ></i> <strong>Highlighted Files</strong>
-		      <% if @trophies.count > 0 %>
-		        <table>
-		        <% @trophies.each do |t| %>
-              <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">   
-		          <% if t.image? || t.pdf? %>
-		            <% temp_thumbnail_path = sufia.download_path(t) + "?datastream_id=thumbnail" %>
-		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"" + temp_thumbnail_path + "\" width=\"90\" alt=\"Download the full-sized image\"/></a>" %>
-		          <% else %>
-		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"/assets/default.png\"  width=\"90\" alt=\"Download file\"/></a>" %>
-		          <% end %>                                 
-		          <td>  
-                <%= temp_href.html_safe() %> 
-		          </td>
-		          <td>
-		            <%= link_to display_title(t), sufia.generic_file_path(t) %>
-                <% if current_user == @user %>
-                  <%= link_to raw("<i class='trophy-on icon-remove'></i>"),"", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid),  remote: true, data: {removerow: "true" }  %>
-                <% end %>
-		          </td>
-		          </tr>
-		        <% end %>
-		        </table>
-		      <% else %>
-		        <%= @user.name %> has no highlighted files.
-		      <% end %>
-        </div>
+<div class="tab-pane active" id="contributions">
+  <i class="icon-trophy trophy-on"></i> <strong>Highlighted Files</strong>
+  <% if @trophies.count > 0 %>
+    <table>
+      <% @trophies.each do |t| %>
+        <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">
+          <td>
+            <%= render partial: "dashboard/_index_partials/thumbnail_display", locals: {document: t, width: 90} %>
+          </td>
+          <td>
+            <%= link_to display_title(t), sufia.generic_file_path(t) %>
+            <%= link_to raw("<i class='trophy-on icon-remove'></i>"), "", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid), remote: true, data: {removerow: "true"} if current_user == @user%>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% else %>
+    <%= @user.name %> has no highlighted files.
+  <% end %>
+</div>
 

data/app/views/users/_profile_actions.html.erb

@@ -1,11 +1,10 @@
     <!-- profile and view buttons -->
-      <% if not signed_in? %>
-        <!-- sign in to access social functions -->
-      <% elsif current_user == @user %>
-        <a class="btn" href="<%= sufia.edit_profile_path(@user) %>"><i class="icon-edit"></i> Edit Your Profile </a>
-      <% elsif current_user.following?(@user) %>
-        <a class="btn btn-primary" href="<%= sufia.unfollow_user_path(@user) %>"><i class="icon-eye-close"></i> Unfollow </a>
-      <% else %>
-        <a class="btn btn-primary" href="<%= sufia.follow_user_path(@user) %>"><i class="icon-eye-open"></i> Follow</a>
+      <% if signed_in? %>
+        <% if current_user == @user %>
+          <%= link_to raw('<i class="icon-edit"></i> Edit Your Profile'), sufia.edit_profile_path(@user), class: "btn" %>
+        <% elsif current_user.following?(@user) %>
+          <%= link_to raw('<i class="icon-eye-close"></i> Unfollow'), sufia.unfollow_profile_path(@user), method: :post, class: "btn btn-primary" %>
+        <% else %>
+          <%= link_to raw('<i class="icon-eye-open"></i> Follow'), sufia.follow_profile_path(@user), method: :post, class: "btn btn-primary" %>
+        <% end %>
       <% end %>
-

data/app/views/users/edit.html.erb

@@ -9,10 +9,9 @@ $("a[rel=popover]").popover({ html: true });
     <div class="control-group">
       <%= f.label :avatar, '<i class="icon-camera-retro"></i> Change picture'.html_safe, :class => "control-label" %>
       <div class="controls">
-        <% if @user.avatar? %>
-          <%= image_tag @user.avatar.url(:thumb) %>
-        <% end %>
+        <%= image_tag @user.avatar.url(:thumb) if @user.avatar? %>
         <%= f.file_field :avatar %>
+        <%= f.hidden_field :avatar_cache %>
         <span class="label label-important">JPG, GIF, or PNG (less than 2MB)</span>
       </div>
     </div>
@@ -21,7 +20,7 @@ $("a[rel=popover]").popover({ html: true });
       <%= f.label :delete_avatar, '<i class="icon-remove"></i> Delete picture'.html_safe, :class => 'control-label' %>
       <div class="controls">
         <label class="checkbox">
-          <%= check_box_tag 'delete_avatar' %> Yes
+          <%= f.check_box :remove_avatar %> Yes
           <a href="#" id="delete_picture_help" rel="popover" data-content="If you would like to remove your picture entirely, check the box and save your profile." data-original-title="Delete Picture"><i class="icon-question-sign icon-large"></i></a>
         </label>
       </div>
@@ -60,7 +59,6 @@ $("a[rel=popover]").popover({ html: true });
 
     <%= render :partial => 'trophy_edit', :locals => {:trophies => @trophies} %>
 
-
     <div class="form-actions">
       <%= f.button '<i class="icon-save"></i> Save Profile'.html_safe, :type => 'submit', :class => "btn-primary btn-large" %>
     </div>
@@ -78,4 +76,3 @@ $("a[rel=popover]").popover({ html: true });
     <i class="icon-caret-right"></i> <%= g %><br />
   <% end %>
 </div>
-

data/config/routes.rb

@@ -34,14 +34,13 @@ Sufia::Engine.routes.draw do
   end
 
   # User profile & follows
-  resources :users, only: [:index, :show, :edit, :update], as: :profiles
-  # get 'users' => 'users#index', :as => :profiles
-  # get 'users/:uid' => 'users#show', :as => :profile
-  # get 'users/:uid/edit' => 'users#edit', :as => :edit_profile
-  # put 'users/:uid/update' => 'users#update', :as => :update_profile
-  post "users/:id/trophy" => "users#toggle_trophy", :as => :update_trophy_user
-  match 'users/:id/follow' => 'users#follow', :as => :follow_user, via: [:get, :post]
-  match 'users/:id/unfollow' => 'users#unfollow', :as => :unfollow_user, via: [:get, :post]
+  resources :users, only: [:index, :show, :edit, :update], as: :profiles do
+    member do
+      post 'trophy' => 'users#toggle_trophy' #used by trophy.js
+      post 'follow' => 'users#follow'
+      post 'unfollow' => 'users#unfollow'
+    end
+  end
 
   # Dashboard routes (based partly on catalog routes)
   resources 'dashboard', :only=>:index do

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.6.0"
+  VERSION = "3.7.0"
 end

data/spec/controllers/users_controller_spec.rb

@@ -26,6 +26,23 @@ describe UsersController do
       response.should redirect_to(root_path)
       flash[:alert].should include ("User 'johndoe666' does not exist")
     end
+
+    describe "when the user has trophies" do
+      let(:user) { @user } 
+      let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
+      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
+      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+
+      it "show the user profile if user exists" do
+        get :show, id: user.user_key
+        response.should be_success
+        assigns[:trophies].should match_array([file1, file2, file3])
+      end
+
+    end
   end
   describe "#index" do
     before do
@@ -61,6 +78,22 @@ describe UsersController do
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
+    describe "when the user has trophies" do
+      let(:user) { @user } 
+      let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
+      let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
+      let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+
+      it "show the user profile if user exists" do
+        get :edit, id: @user.user_key
+        response.should be_success
+        assigns[:trophies].should match_array([file1, file2, file3])
+      end
+
+    end
   end
   describe "#update" do
     it "should not allow other users to update" do
@@ -69,7 +102,7 @@ describe UsersController do
       flash[:alert].should include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
-      @user.avatar.file?.should be_false
+      @user.avatar?.should be_false
       s1 = double('one')
       UserEditProfileEventJob.should_receive(:new).with(@user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
@@ -77,23 +110,21 @@ describe UsersController do
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
-      User.find_by_user_key(@user.user_key).avatar.file?.should be_true
+      User.find_by_user_key(@user.user_key).avatar?.should be_true
     end
     it "should validate the content type of an avatar" do
-      #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:alert].should include("Avatar content type is invalid")
+      flash[:alert].should include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
     end
     it "should validate the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
-      #Resque.should_receive(:enqueue).with(UserEditProfileEventJob, @user.user_key).never
       Sufia.queue.should_receive(:push).never
       post :update, id: @user.user_key, user: { avatar: f }
       response.should redirect_to(@routes.url_helpers.edit_profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:alert].should include("Avatar file size must be less than 2097152 Bytes")
+      flash[:alert].should include("Avatar file size must be less than 2MB")
     end
     it "should delete an avatar" do
       s1 = double('one')
@@ -102,7 +133,7 @@ describe UsersController do
       post :update, id: @user.user_key, delete_avatar: true
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
-      @user.avatar.file?.should be_false
+      @user.avatar?.should be_false
     end
     it "should refresh directory attributes" do
       s1 = double('one')
@@ -117,28 +148,33 @@ describe UsersController do
       @user.twitter_handle.blank?.should be_true
       @user.facebook_handle.blank?.should be_true
       @user.googleplus_handle.blank?.should be_true
-      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo' }
+      @user.linkedin_handle.blank?.should be_true
+      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
       flash[:notice].should include("Your profile has been updated")
       u = User.find_by_user_key(@user.user_key)
       u.twitter_handle.should == 'twit'
       u.facebook_handle.should == 'face'
       u.googleplus_handle.should == 'goo'
+      u.linkedin_handle.should == 'link'
     end
-    it "should remove a trophy" do
-      f = GenericFile.create(title:"myFile")
-      f.apply_depositor_metadata(@user)
-      f.save
-      file_id = f.pid.split(":").last
-      Trophy.create(:generic_file_id => file_id, :user_id => @user.id)
-      @user.trophy_ids.length.should == 1
-      post :update, id: @user.user_key,  'remove_trophy_'+file_id=> 'yes' 
-      response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@user.user_key,'@.')))
-      flash[:notice].should include("Your profile has been updated")
-      @user.trophy_ids.length.should == 0
-      f.destroy 
+
+    context "when removing a trophy" do
+      let(:user) { @user }
+      let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      before do
+        user.trophies.create!(generic_file_id: file.noid)
+      end
+      it "should remove a trophy" do
+        expect {
+          post :update, id: user.user_key,  'remove_trophy_'+file.noid => 'yes'
+        }.to change { user.trophies.count }.by(-1)
+        response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(user.user_key,'@.')))
+        flash[:notice].should include("Your profile has been updated")
+      end
     end
   end
+
   describe "#follow" do
     after(:all) do
       @user.unfollow(@another_user) rescue nil