sufia 4.2.0 → 4.3.1

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

@@ -1,5 +1,5 @@
 <h1>Edit Profile</h1>
-<div class="col-xs-12 col-sm-5">
+<div class="col-xs-12 col-sm-5 profile">
   <div class="well">
   <%= form_for @user, url: sufia.profile_path(@user.to_param), html: {multipart: true, class: 'form-horizontal' } do |f| %>
     <div class="form-group">
@@ -29,6 +29,15 @@
       </div>
     </div>
 
+    <div class="form-group">
+      <%= f.label :orcid, class: 'col-xs-4 control-label' do %>
+        <%= orcid_label %>
+      <% end %>
+      <div class="col-xs-8">
+         <%= f.text_field :orcid, class: "form-control" %>
+      </div>
+    </div><!-- .form-group -->
+
     <div class="form-group">
       <%= f.label :twitter_handle, '<i class="fa fa-twitter"></i> Twitter Handle'.html_safe, class: 'col-xs-4 control-label' %>
       <div class="col-xs-8">
@@ -60,7 +69,7 @@
   </div>
 </div><!-- .col-xs-5 /well-->
 
-<div class="col-xs-12 col-sm-offset-1 col-sm-6 well">
+<div class="col-xs-12 col-sm-offset-1 col-sm-6 well profile">
   <h2><i class="glyphicon glyphicon-user"></i> Directory Info (LDAP) <%= link_to 'Edit Instructions', 'http://www.psu.edu/directory/#update', class: 'btn btn-mini btn-primary' %></h3>
   <%= render partial: 'user_info', locals: {user: @user} %>
 

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

@@ -1,7 +1,7 @@
 <%= javascript_tag do %>
 <% end %>
 
-<div class="col-xs-12">
+<div class="col-xs-12 profile">
   <div class="pull-right">
     <%= render 'profile_actions' %>
   </div>

data/config/locales/sufia.en.yml

@@ -80,6 +80,8 @@ en:
       stats:
         heading:            "Your Statistics"
         files:              "Files you've deposited"
+        file_views:         "View"
+        file_downloads:     "Download"
         collections:        "Collections you've created"
         following:          "People you follow"
         followers:          "People who are following you"
@@ -147,6 +149,9 @@ en:
     user_profile:
       no_followers: "No one is following you."
       no_following: "You are not following anyone."
+      orcid:
+        alt: "ORCID icon"
+        label: "ORCID Profile"
     batch:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."

data/lib/generators/sufia/install_generator.rb

@@ -23,6 +23,10 @@ module Sufia
       generate "sufia:models:install"
     end
 
+    def banner
+      say_status("warning", "GENERATING SUFIA", :yellow)
+    end
+
     def insert_abilities
       insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
         "\n  include Sufia::Ability\n"

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -30,6 +30,10 @@ class CatalogController < ApplicationController
   end
 
   configure_blacklight do |config|
+    #Show gallery view
+    config.view.gallery.partials = [:index_header, :index]
+    config.view.slideshow.partials = [:index]
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       qt: "search",

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.2.0"
+  VERSION = "4.3.1"
 end

data/spec/controllers/users_controller_spec.rb

@@ -23,10 +23,10 @@ describe UsersController, :type => :controller do
     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(: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) }
@@ -105,10 +105,10 @@ describe UsersController, :type => :controller do
       expect(flash[:alert]).to 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(: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) }
@@ -182,7 +182,8 @@ describe UsersController, :type => :controller do
       expect(@user.facebook_handle).to be_blank
       expect(@user.googleplus_handle).to be_blank
       expect(@user.linkedin_handle).to be_blank
-      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
+      expect(@user.orcid).to be_blank
+      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle: "link", orcid: '0000-0000-1111-2222' }
       expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
       u = User.find_by_user_key(@user.user_key)
@@ -190,11 +191,18 @@ describe UsersController, :type => :controller do
       expect(u.facebook_handle).to eq 'face'
       expect(u.googleplus_handle).to eq 'goo'
       expect(u.linkedin_handle).to eq 'link'
+      expect(u.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
+    end
+    it 'displays a flash when invalid ORCID is entered' do
+      expect(@user.orcid).to be_blank
+      post :update, id: @user.user_key, user: { orcid: 'foobar' }
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
+      expect(flash[:alert]).to include('Orcid must be a string of 19 characters, e.g., "0000-0000-0000-0000"')
     end
 
     context "when removing a trophy" do
       let(:user) { @user }
-      let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+      let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
       before do
         user.trophies.create!(generic_file_id: file.noid)
       end

data/spec/features/browse_files_spec.rb

@@ -7,9 +7,14 @@ describe "Browse files", :type => :feature do
     @fixtures = find_or_create_file_fixtures
     @fixtures[0].tag = ["key"]
     (1..25).each do |i|
-      @fixtures[0].tag << i
+      @fixtures[0].tag << "key_#{i}"
     end
+    @fixtures[1].tag = ["key"]
     @fixtures[0].save
+    (1..20).each do |i|
+      @fixtures[1].tag << "key_#{i}"
+    end
+    @fixtures[1].save
   end
 
   after :all do
@@ -23,21 +28,30 @@ describe "Browse files", :type => :feature do
     click_button "search-submit-header"
     click_link "Keyword"
     click_link "more Keywords»"
+    expect(page).to have_css "h3", text: "Keyword"
   end
 
   describe "when not logged in" do
     it "should let us browse some of the fixtures" do
       click_link "18"
       expect(page).to have_content "Search Results"
+      expect(page).to have_css "a", text: @fixtures[0].title[0]
       click_link @fixtures[0].title[0]
       expect(page).to have_content "Download"
       expect(page).not_to have_content "Edit"
     end
     it "should allow you to click next" do
+      expect(page).to have_content "Numerical Sort"
+      expect(page).to have_css "a.sort_change", text:"A-Z Sort"
+      within(".modal-body") do
+        expect(page).to have_content "key_1 "
+        expect(page).not_to have_content "key_25 "
+      end
       click_link 'Next »'
+      expect(page).to have_css "a.btn-link", text:"« Previous", wait: Capybara.default_wait_time*4
       within(".modal-body") do
-        expect(page).to have_content "5"
-        expect(page).not_to have_content "11"
+        expect(page).to have_content "key_25 "
+        expect(page).not_to have_content "key_1 "
       end
     end
   end

data/spec/features/users_spec.rb

@@ -30,7 +30,7 @@ describe "User Profile", :type => :feature do
       click_button 'Save Profile'
       expect(page).to have_content 'Your profile has been updated'
       click_link 'Profile'
-      expect(page).to have_content 'http://twitter.com/curatorOfData'
+      expect(page).to have_link('curatorOfData', href: 'http://twitter.com/curatorOfData')
     end
   end
 

data/spec/helpers/batch_edits_helper_spec.rb

@@ -16,6 +16,12 @@ describe BatchEditsHelper, :type => :helper do
         allow(helper).to receive(:controller_name).and_return("batch_edits")
         expect(helper.render_check_all).to have_css("span.glyphicon-cog")
       end
+
+      it "should show my action menu for my controller" do
+        allow(helper).to receive(:params).and_return({ controller: "my" })
+        allow(helper).to receive(:controller_name).and_return("my")
+        expect(helper.render_check_all).not_to have_content("ABC")
+      end
     end
 
     context "with my collections" do
@@ -29,7 +35,7 @@ describe BatchEditsHelper, :type => :helper do
       it "should not show the check all dropdown" do
         allow(helper).to receive(:params).and_return({ controller: "foo" })
         assign(:disable_select_all, true)
-        expect(helper.render_check_all).to be_nil
+        expect(helper.render_check_all).to have_css("input[disabled=disabled]")
       end
     end
 

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -0,0 +1,206 @@
+require 'spec_helper'
+require_relative '../../../sufia-models/lib/sufia/models/stats/user_stat_importer'
+
+describe Sufia::UserStatImporter do
+
+  before do
+    GenericFile.delete_all
+    User.delete_all
+
+    UserStat.delete_all
+    FileViewStat.delete_all
+    FileDownloadStat.delete_all
+
+    allow(Sufia.config).to receive(:analytic_start_date) { dates[0] }
+    stub_out_call_to_google_analytics
+  end
+
+  let(:bilbo) { FactoryGirl.create(:user, email: 'bilbo@example.com') }
+  let(:frodo) { FactoryGirl.create(:user, email: 'frodo@example.com') }
+
+  let!(:bilbo_file_1) do
+    GenericFile.new(pid: 'bilbo:1').tap do |f|
+      f.apply_depositor_metadata(bilbo.email)
+      f.save
+    end
+  end
+
+  let!(:bilbo_file_2) do
+    GenericFile.new(pid: 'bilbo:2').tap do |f|
+      f.apply_depositor_metadata(bilbo.email)
+      f.save
+    end
+  end
+
+  let!(:frodo_file_1) do
+    GenericFile.new(pid: 'frodo:1').tap do |f|
+      f.apply_depositor_metadata(frodo.email)
+      f.save
+    end
+  end
+
+  let(:dates) {
+    ldates = []
+    4.downto(0) {|idx| ldates << (Date.today-idx.day) }
+    ldates
+  }
+
+  let(:date_strs) {
+    ldate_strs = []
+    dates.each {|date| ldate_strs << date.strftime("%Y%m%d") }
+    ldate_strs
+  }
+
+  # This is what the data looks like that's returned from Google Analytics via the Legato gem.
+  let(:bilbo_file_1_pageview_stats) {
+    [
+      OpenStruct.new(date: date_strs[0], pageviews: 1),
+      OpenStruct.new(date: date_strs[1], pageviews: 2),
+      OpenStruct.new(date: date_strs[2], pageviews: 3),
+      OpenStruct.new(date: date_strs[3], pageviews: 4),
+      OpenStruct.new(date: date_strs[4], pageviews: 5)
+    ]
+  }
+
+  let(:bilbo_file_2_pageview_stats) {
+    [
+      OpenStruct.new(date: date_strs[0], pageviews: 11),
+      OpenStruct.new(date: date_strs[1], pageviews: 12),
+      OpenStruct.new(date: date_strs[2], pageviews: 13),
+      OpenStruct.new(date: date_strs[3], pageviews: 14),
+      OpenStruct.new(date: date_strs[4], pageviews: 15)
+    ]
+  }
+
+  let(:frodo_file_1_pageview_stats) {
+    [
+      OpenStruct.new(date: date_strs[0], pageviews: 2),
+      OpenStruct.new(date: date_strs[1], pageviews: 4),
+      OpenStruct.new(date: date_strs[2], pageviews: 1),
+      OpenStruct.new(date: date_strs[3], pageviews: 1),
+      OpenStruct.new(date: date_strs[4], pageviews: 9)
+    ]
+  }
+
+  let(:bilbo_file_1_download_stats) {
+    [
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[0], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[1], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[2], totalEvents: "5"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[3], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[4], totalEvents: "7"),
+    ]
+  }
+
+  let(:bilbo_file_2_download_stats) {
+    [
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[0], totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[1], totalEvents: "4"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[2], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[3], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[4], totalEvents: "3"),
+    ]
+  }
+
+  let(:frodo_file_1_download_stats) {
+    [
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[0], totalEvents: "5"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[1], totalEvents: "4"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[2], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[3], totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[4], totalEvents: "6"),
+    ]
+  }
+
+
+  describe 'with empty cache' do
+    it 'for each user it adds one entry per day to the cache' do
+      Sufia::UserStatImporter.new.import
+
+      bilbos_stats = UserStat.where(user_id: bilbo.id).order(date: :asc)
+      expect(bilbos_stats.count).to eq 4
+
+      bilbos_stats.each_with_index do |actual_values, i|
+        expected_file_views = bilbo_file_1_pageview_stats[i].pageviews + bilbo_file_2_pageview_stats[i].pageviews
+        expected_file_downloads = bilbo_file_1_download_stats[i].totalEvents.to_i + bilbo_file_2_download_stats[i].totalEvents.to_i
+        expected_values = { date: dates[i], views: expected_file_views, downloads: expected_file_downloads }
+        assert_stats_match(expected_values, actual_values)
+      end
+
+      frodos_stats = UserStat.where(user_id: frodo.id).order(date: :asc)
+      expect(frodos_stats.count).to eq 4
+
+      frodos_stats.each_with_index do |actual_values, i|
+        expected_file_views = frodo_file_1_pageview_stats[i].pageviews
+        expected_file_downloads = frodo_file_1_download_stats[i].totalEvents.to_i
+        expected_values = { date: dates[i], views: expected_file_views, downloads: expected_file_downloads }
+        assert_stats_match(expected_values, actual_values)
+      end
+
+      expect(UserStat.count).to eq bilbos_stats.count + frodos_stats.count
+    end
+  end
+
+  describe 'with existing data in cache' do
+    before do
+      [dates[0], dates[1]].each_with_index do |date, i|
+        UserStat.create!(user_id: bilbo.id, date: date, file_views: 100 + i, file_downloads: 200 + i)
+      end
+      UserStat.create!(user_id: frodo.id, date: dates[0], file_views: 300, file_downloads: 400)
+    end
+
+    it "doesn't duplicate entries for existing dates" do
+      expect(User.count).to eq 2
+      expect(UserStat.count).to eq 3
+
+      Sufia::UserStatImporter.new.import
+
+      bilbos_stats = UserStat.where(user_id: bilbo.id).order(date: :asc)
+      expect(bilbos_stats.count).to eq 4
+
+      expect(bilbos_stats[0].file_views).to eq(bilbo_file_1_pageview_stats[0].pageviews + bilbo_file_2_pageview_stats[0].pageviews)
+      expect(bilbos_stats[0].file_downloads).to eq(bilbo_file_1_download_stats[0].totalEvents.to_i + bilbo_file_2_download_stats[0].totalEvents.to_i)
+
+      expect(bilbos_stats[1].file_views).to eq(bilbo_file_1_pageview_stats[1].pageviews + bilbo_file_2_pageview_stats[1].pageviews)
+      expect(bilbos_stats[1].file_downloads).to eq(bilbo_file_1_download_stats[1].totalEvents.to_i + bilbo_file_2_download_stats[1].totalEvents.to_i)
+
+      frodos_stats = UserStat.where(user_id: frodo.id).order(date: :asc)
+      expect(frodos_stats.count).to eq 4
+
+      expect(frodos_stats[0].file_views).to eq(frodo_file_1_pageview_stats[0].pageviews)
+
+      expect(frodos_stats[0].file_downloads).to eq(frodo_file_1_download_stats[0].totalEvents.to_i)
+    end
+  end
+end
+
+
+def stub_out_call_to_google_analytics
+  allow(FileViewStat).to receive(:ga_statistics) do |date, file_id|
+    case file_id
+    when bilbo_file_1.id
+      bilbo_file_1_pageview_stats
+    when bilbo_file_2.id
+      bilbo_file_2_pageview_stats
+    else
+      frodo_file_1_pageview_stats
+    end
+  end
+
+  allow(FileDownloadStat).to receive(:ga_statistics) do |date, file_id|
+    case file_id
+    when bilbo_file_1.id
+      bilbo_file_1_download_stats
+    when bilbo_file_2.id
+      bilbo_file_2_download_stats
+    else
+      frodo_file_1_download_stats
+    end
+  end
+end
+
+def assert_stats_match(expected_value, actual_value)
+  expect(actual_value.date).to eq expected_value[:date]
+  expect(actual_value.file_views).to eq expected_value[:views]
+  expect(actual_value.file_downloads).to eq expected_value[:downloads]
+end

data/spec/models/featured_work_list_spec.rb

@@ -19,4 +19,16 @@ describe FeaturedWorkList, :type => :model do
       expect(solr_doc.noid).to eq file1.noid 
     end 
   end
+
+  describe 'file deleted' do
+    before do
+      file1.destroy
+    end
+    it 'should be a list of the remaining featured work objects, each with the generic_file\'s solr_doc' do
+      expect(subject.featured_works.size).to eq 1
+      solr_doc = subject.featured_works.first.generic_file_solr_document
+      expect(solr_doc).to be_kind_of SolrDocument
+      expect(solr_doc.noid).to eq file2.noid
+    end
+  end
 end