sufia 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe7739c6421450db9e6d2f9651152c8d4ff0624
-  data.tar.gz: 08b718c691ae8e6813f928d57efaeb3d2265151b
+  metadata.gz: d5983e2ea047b6ee6b08ef678cb233a8f20b68a3
+  data.tar.gz: 73adb6f66582d0b1021d0addba02efb4e15ee8ca
 SHA512:
-  metadata.gz: a5e5252d70908e42cdd09137947531a696f05bc4b7ab23989cf47774e25597415566c649333efdbb1e65d9f981f08206cb9a1ce68ca7c2199754cf7e910ef78f
-  data.tar.gz: ba76310232b867f0e7bc6bba3dcc16ec1282b7d912b940e2f206cac7b068a38a43b4c8d8b1008aa6639e7a3dff86b3e757bf2be1f1fe0e37f385c9f1fb327701
+  metadata.gz: e378ea0a2b5e17b0f86ab170c276d92863a8933468c4b5af31e472b2d226a096f9f9475e51a41ce3f9f9523df83f069c0605f24a08973888f79b425943cf0db7
+  data.tar.gz: b4e5438fbd558768b324b336a5c1d9b0194c44c56360c66069bfee3d38bac696998d1115160194a150e9832cd9ee3297f1ec18bbfc3a43bb0ea9282693724938

data/History.md

@@ -1,5 +1,16 @@
 # History of Sufia releases
 
+## 6.2.0
+
+* Check to make sure Zotero integration is enabled before asking user instances if they have a Zotero user ID. Fixes #1235 [Michael J. Giarlo]
+* Make my controller retrieve only user's own collections. [Olli Lyytinen]
+* Adding date range queries for deposited files. fixes #1189 [Carolyn Cole]
+* Allowing the second input to also auto complete.  fixes #1222 [Carolyn Cole]
+* Removing any calls to the sort! method [Carolyn Cole]
+* Adding recent users query end date so a range can be queried. fixes #1187 [Carolyn Cole]
+* Don't calculate coverage of code found in spec/ directory [Michael J. Giarlo]
+* Refactoring feature test to make it more efficient [Carolyn Cole]
+
 ## 6.1.0
 
  * Making the image thumbnail alt tag empty for better accessibility, since there is more information about title and description in the result. [Michael Tribone]
@@ -68,7 +79,6 @@
  * Noid service extracted out into its own gem [Michael J. Giarlo]
  * Correct version of Sufia in README [Michael J. Giarlo]
 
-
 ## 6.0.0
 
 * Replace pid with id in config [Adam Wead]

data/SUFIA_VERSION

@@ -1 +1 @@
-6.1.0
+6.2.0

data/app/assets/javascripts/sufia/edit_metadata.js

@@ -45,7 +45,7 @@ Blacklight.onLoad(function() {
     },
     minLength: 2
   };
-  $("#generic_file_based_near").autocomplete(get_autocomplete_opts("location"));
+  $("input.generic_file_based_near").autocomplete(get_autocomplete_opts("location"));
 
   var autocomplete_vocab = new Object();
 
@@ -57,7 +57,7 @@ Blacklight.onLoad(function() {
   for (var i=0; i < autocomplete_vocab.url_var.length; i++) {
     autocomplete_vocab.field_name.push('generic_file_' + autocomplete_vocab.url_var[i]);
     // autocompletes
-    $("#" + autocomplete_vocab.field_name[i])
+    $("input." + autocomplete_vocab.field_name[i])
         // don't navigate away from the field on tab when selecting an item
         .bind( "keydown", function( event ) {
             if ( event.keyCode === $.ui.keyCode.TAB &&

data/app/controllers/admin/stats_controller.rb

@@ -29,10 +29,23 @@ class Admin::StatsController < ApplicationController
     end
 
     def document_by_permission
+      return document_by_date_by_permission if @users_stats[:file_start_date]
+
       files_count = {}
       files_count[:total] = GenericFile.count
-      files_count[:public] = GenericFile.where(Solrizer.solr_name('read_access_group', :symbol) => 'public').count
-      files_count[:registered] = GenericFile.where(Solrizer.solr_name('read_access_group', :symbol) =>'registered').count
+      files_count[:public] = GenericFile.where_public.count
+      files_count[:registered] = GenericFile.where_registered.count
+      files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
+      files_count
+    end
+
+    def document_by_date_by_permission
+      start_date = DateTime.parse(@users_stats[:file_start_date])
+      end_date = DateTime.parse(@users_stats[:file_end_date]).end_of_day unless @users_stats[:file_end_date].blank?
+      files_count = {}
+      files_count[:total] = GenericFile.find_by_date_created(start_date, end_date).count
+      files_count[:public] = GenericFile.find_by_date_created(start_date, end_date).merge(GenericFile.where_public).count
+      files_count[:registered] = GenericFile.find_by_date_created(start_date, end_date).merge(GenericFile.where_registered).count
       files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
       files_count
     end
@@ -57,12 +70,11 @@ class Admin::StatsController < ApplicationController
     end
 
     def recent_users
-      # users since date
-      if @users_stats[:start_date]
-        return User.where('created_at >= ?',  @users_stats[:start_date])
-      end
+      # no dates return the top 5
+      return  User.order('created_at DESC').limit(5) if @users_stats[:start_date].blank?
 
-      # 5 most recent
-      User.order('created_at DESC').limit(5)
+      start_date = DateTime.parse @users_stats[:start_date]
+      end_date = DateTime.parse(@users_stats[:end_date]).end_of_day unless  @users_stats[:end_date].blank?
+      User.recent_users start_date, end_date
     end
 end

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

@@ -6,17 +6,17 @@ module Sufia
     include Hydra::Catalog
     include Hydra::BatchEditBehavior
     include Hydra::Collections::SelectsCollections
-  
+
     included do
       include Blacklight::Configurable
 
       self.copy_blacklight_config_from(CatalogController)
       self.blacklight_config.search_builder_class = Sufia::MySearchBuilder
-      
+
       before_filter :authenticate_user!
       before_filter :enforce_show_permissions, only: :show
       before_filter :enforce_viewing_context_for_show_requests, only: :show
-      before_filter :find_collections, only: :index
+      before_filter :find_collections_with_edit_access, only: :index
 
       self.search_params_logic += [:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]
 

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

@@ -0,0 +1,16 @@
+<h2>File Statistics</h2>
+<%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
+<%= f.label "#{ t("sufia.admin.stats.deposited_form.heading") } #{ t("sufia.admin.stats.deposited_form.start_label") }" %>
+<input type="date" name="users_stats[file_start_date]" value="<%= @users_stats[:file_start_date] %>"></input>
+<%= f.label t("sufia.admin.stats.deposited_form.end_label") %>
+<input type="date" name="users_stats[file_end_date]" value="<%= @users_stats[:file_end_date] %>"></input>
+<%= f.submit "Load Stats" %>
+<h3>Total Files: <%= @files_count[:total] %> </h3>
+<br/>
+<%- end %>
+<h3>Totals by Visibility</h3>
+<ul>
+  <li>Open Access <span class="count">(<%= @files_count[:public] %>)</span></li>
+  <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @files_count[:registered] %>)</span></li>
+  <li>Private <span class="count">(<%= @files_count[:private] %>)</span></li>
+</ul>

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

@@ -0,0 +1,30 @@
+<h3>Newest Users</h3>
+<%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
+  <%= f.label "Display users registered: Start" %>
+  <input type="date" name="users_stats[start_date]" value="<%= @users_stats[:start_date] %>"></input>
+  <%= f.label "end [defaults to now]" %>
+  <input type="date" name="users_stats[end_date]" value="<%= @users_stats[:end_date] %>"></input>
+  <%= f.submit "Load Stats" %>
+<%- end %>
+
+<%- if @users_stats[:start_date] %>
+  <div>Total: <%= @recent_users.count %></div>
+<%- else %>
+  Five most recent users:
+<%- end %>
+
+<ul>
+  <% @recent_users.each do |usr| %>
+    <li>
+      <a href="<%= sufia.profile_path(usr.user_key) %>" title="View user's profile"><%= usr.name %></a>
+      <%- if usr.department %>
+        of <%= usr.department %>
+      <%- end %>
+      registered
+      <span class="date">
+        <%= usr.created_at.to_time.strftime("%m/%d/%Y") %>
+      </span>
+    </li>
+  <% end %>
+</ul>
+

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

@@ -3,14 +3,7 @@
     <%= Sufia::VERSION %></h1>
   <br/>
 
-  <h2>Total Files: <%= @files_count[:total] %> </h2>
-  <br/>
-  <h3>Totals by Visibility</h3>
-  <ul>
-    <li>Open Access <span class="count">(<%= @files_count[:public] %>)</span></li>
-    <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @files_count[:registered] %>)</span></li>
-    <li>Private <span class="count">(<%= @files_count[:private] %>)</span></li>
-  </ul>
+  <%= render "admin/stats/files" %>
 
   <h3>Top File Formats</h3>
   <ul>
@@ -24,34 +17,7 @@
   <h2>Total <%= application_name %> Users:&nbsp; <%= @users_count %> </h2>
   <br/>
 
-  <h3>Newest Users</h3>
-  <%= form_for "users_stats", url: sufia.admin_stats_path, method: "GET" do |f| %>
-  <%= f.label "Display users registered since" %>
-  <input type="date" name="users_stats[start_date]" value="<%= @users_stats[:start_date] %>"></input>
-  <%= f.submit "Load Stats" %>
-  <%- end %>
-
-  <%- if @users_stats[:start_date] %>
-    <div>Total: <%= @recent_users.count %></div>
-  <%- else %>
-    Five most recent users:
-  <%- end %>
-
-  <ul>
-    <% @recent_users.each do |usr| %>
-      <li>
-        <a href="<%= sufia.profile_path(usr.user_key) %>" title="View user's profile"><%= usr.name %></a>
-        <%- if usr.department %>
-          of <%= usr.department %>
-        <%- end %>
-        registered
-      <span class="date">
-        <%= usr.created_at.to_time.strftime("%m/%d/%Y") %>
-      </span>
-      </li>
-    <% end %>
-  </ul>
-
+  <%= render "admin/stats/new_users" %>
 
   <br/>
   <h3>Most Active Users (top <%= @active_users.count %>)</h3>

data/app/views/batch/_metadata.html.erb

@@ -4,7 +4,7 @@
     <div class="col-sm-8">
       <h3>Applies to individual files uploaded</h3>
       <%= content_tag :p, t('sufia.batch.help.title'), class: "help-block" %>
-      <% @batch.generic_files.sort! { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
+      <% @batch.generic_files.sort { |a,b| a.label.downcase <=> b.label.downcase }.each_with_index  do |gen_f, index| %>
         <div class="form-group">
           <%= f.input_label :title, as: :multi_value_with_help, label: "Title #{index + 1}" %>
           <div id="additional_title_clone">

data/app/views/collections/_form_for_select_collection.html.erb

@@ -13,8 +13,7 @@
               <fieldset>
                 <legend><%= t("sufia.collection.select_form.select_heading") %></legend>
               <ul>
-                <% user_collections.sort! { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }  %>
-                <% user_collections.each do |collection| %>
+                <% user_collections.sort { |c1,c2| c1['date_modified_dtsi'] <=> c2['date_modified_dtsi'] }.each do |collection|  %>
                   <li> <label for="id_<%= collection.id %>" class="sr-only">Add to <%=collection.title%></label>
                     <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %>
                     <%= label_tag(:collection, collection.title, "aria-hidden" =>true) %>

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

@@ -5,7 +5,7 @@
   <dd class="col-xs-7"><%= link_to user.orcid, user.orcid, { target: '_blank' } %></dd>
 <% end %>
 
-<% if user.zotero_userid.present? %>
+<% if Sufia.config.arkivo_api && user.zotero_userid.present? %>
   <dt class="col-xs-5"><%= zotero_label(html_class: 'profile') %></dt>
   <dd class="col-xs-7"><%= link_to zotero_profile_url(user.zotero_userid), zotero_profile_url(user.zotero_userid), { target: '_blank' } %></dd>
 <% end %>

data/config/locales/sufia.en.yml

@@ -172,6 +172,10 @@ en:
     admin:
       stats:
         registered: "Registered"
+        deposited_form:
+          heading: "Display Files Deposited:"
+          start_label: "Start"
+          end_label: "end [defaults to now]"
 
   simple_form:
     labels:

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.1.0"
+  VERSION = "6.2.0"
 end

data/spec/controllers/admin_stats_controller_spec.rb

@@ -23,14 +23,24 @@ describe Admin::StatsController, type: :controller do
     end
 
     describe "querying user_stats" do
+      let(:one_day_ago_date) { 1.days.ago.to_datetime }
+      let(:two_days_ago_date) { 2.days.ago.to_datetime.end_of_day }
+      let(:one_day_ago) { one_day_ago_date.strftime("%Y-%m-%d") }
+      let(:two_days_ago) { two_days_ago_date.strftime("%Y-%m-%d") }
+
       it "defaults to latest 5 users" do
         get :index
         expect(assigns[:recent_users]).to eq(User.order('created_at DESC').limit(5))
       end
-      it "allows queries against user_stats" do
+      it "allows queries against user_stats without an end date " do
         expect(User).to receive(:where).with('id' => user1.id).once.and_return([user1])
-        expect(User).to receive(:where).with('created_at >= ?',  1.days.ago.strftime("%Y-%m-%d")).and_return([user2])
-        get :index, users_stats: {start_date:1.days.ago.strftime("%Y-%m-%d")}
+        expect(User).to receive(:recent_users).with(one_day_ago_date, nil).and_return([user2])
+        get :index, users_stats: { start_date: one_day_ago }
+        expect(assigns[:recent_users]).to eq([user2])
+      end
+      it "allows queries against user_stats with an end date" do
+        expect(User).to receive(:recent_users).with(two_days_ago_date, one_day_ago_date).and_return([user2])
+        get :index, users_stats: { start_date: two_days_ago, end_date: one_day_ago }
         expect(assigns[:recent_users]).to eq([user2])
       end
     end
@@ -51,21 +61,40 @@ describe Admin::StatsController, type: :controller do
     end
 
     describe "counts" do
-      before do
-        FactoryGirl.create(:generic_file, depositor: user1)
-        FactoryGirl.create(:public_file, depositor: user1)
-        FactoryGirl.create(:registered_file, depositor: user1)
-        Collection.create(title: "test").tap do |c|
-          c.apply_depositor_metadata(user1.user_key)
+      context "when date range not set" do
+        before do
+          FactoryGirl.create(:generic_file, depositor: user1)
+          FactoryGirl.create(:public_file, depositor: user1)
+          FactoryGirl.create(:registered_file, depositor: user1)
+          Collection.create(title: "test") do |c|
+            c.apply_depositor_metadata(user1.user_key)
+          end
+        end
+        it "includes files but not collections" do
+          get :index
+          expect(assigns[:files_count][:total]).to eq(3)
+          expect(assigns[:files_count][:public]).to eq(1)
+          expect(assigns[:files_count][:registered]).to eq(1)
+          expect(assigns[:files_count][:private]).to eq(1)
         end
       end
 
-      it "includes files but not collections" do
-        get :index
-        expect(assigns[:files_count][:total]).to eq(3)
-        expect(assigns[:files_count][:public]).to eq(1)
-        expect(assigns[:files_count][:registered]).to eq(1)
-        expect(assigns[:files_count][:private]).to eq(1)
+      context "when start date set" do
+        it "queries by start date" do
+          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.days.ago.to_datetime, nil).and_call_original
+          expect(GenericFile).to receive(:where_public).and_call_original
+          expect(GenericFile).to receive(:where_registered).and_call_original
+          get :index, users_stats: { file_start_date: 1.days.ago.strftime("%Y-%m-%d") }
+        end
+      end
+
+      context "when date range set" do
+        it "queries by start and date" do
+          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.days.ago.to_datetime, 0.days.ago.to_datetime.end_of_day).and_call_original
+          expect(GenericFile).to receive(:where_public).and_call_original
+          expect(GenericFile).to receive(:where_registered).and_call_original
+          get :index, users_stats: { file_start_date: 1.days.ago.strftime("%Y-%m-%d"), file_end_date: 0.days.ago.strftime("%Y-%m-%d") }
+        end
       end
     end
 

data/spec/controllers/my/files_controller_spec.rb

@@ -3,9 +3,14 @@ require 'spec_helper'
 describe My::FilesController, :type => :controller do
 
   let(:my_collection) do
-    Collection.new(title: 'test collection').tap do |c|
+    Collection.create(title: 'test collection') do |c|
       c.apply_depositor_metadata(user.user_key)
-      c.save!
+    end
+  end
+
+  let(:other_collection) do
+    Collection.create(title: 'other test collection') do |c|
+      c.apply_depositor_metadata(another_user.user_key)
     end
   end
 
@@ -19,10 +24,13 @@ describe My::FilesController, :type => :controller do
 
   let(:user) { FactoryGirl.find_or_create(:archivist) }
 
+  let(:another_user) { FactoryGirl.find_or_create(:jill) }
+
   before do
     sign_in user
     @my_file = FactoryGirl.create(:generic_file, depositor: user)
     @my_collection = my_collection
+    @other_collection = other_collection
     @shared_file = shared_file
     @unrelated_file = FactoryGirl.create(:generic_file, depositor: FactoryGirl.create(:user))
     @wrong_type = Batch.create
@@ -56,6 +64,12 @@ describe My::FilesController, :type => :controller do
     expect(assigns[:document_list].map(&:id)).to_not include(@wrong_type.id)
   end
 
+  it "has the correct collections" do
+    get :index
+    expect(assigns[:user_collections].map(&:id)).to include(@my_collection.id)
+    expect(assigns[:user_collections].map(&:id)).to_not include(@other_collection.id)
+  end
+
   describe "batch processing" do
     include Sufia::Messages
     let(:batch_id) {"batch_id"}

data/spec/features/browse_dashboard_files_spec.rb

@@ -2,17 +2,21 @@ require 'spec_helper'
 
 describe "Browse Dashboard", type: :feature do
   let(:user) { FactoryGirl.create(:user) }
-  let!(:fixtures) { create_file_fixtures(user.user_key) }
+  let!(:fixtures) { create_file_fixtures(user.user_key, handles) }
 
   before do
     sign_in user
   end
 
-  it "should search your files by default" do
-    visit "/dashboard"
-    fill_in "q", with: "PDF"
-    click_button "search-submit-header"
-    expect(page).to have_content("Fake PDF Title")
+  context "within dashboard" do
+    let(:handles) { [:public_pdf] }
+
+    it "should search your files by default" do
+      visit "/dashboard"
+      fill_in "q", with: "PDF"
+      click_button "search-submit-header"
+      expect(page).to have_content("Fake PDF Title")
+    end
   end
 
   context "within my files page" do
@@ -21,78 +25,93 @@ describe "Browse Dashboard", type: :feature do
       visit "/dashboard/files"
     end
 
-    it "should display all the necessary information" do
-      # TODO this would make a good view test.
-      within("#document_#{fixtures.first.id}") do
-        click_button("Select an action")
-      end
-      expect(page).to have_content("Edit File")
-      expect(page).to have_content("Download File")
-      expect(page).to_not have_content("Is part of:")
-      first(".label-success") do
-        expect(page).to have_content("Open Access")
-      end
-      expect(page).to have_link("Create Collection")
-      expect(page).to have_link("Upload")
-    end
+    context "no files" do
+      let(:handles) { [ ] }
 
-    it "should allow you to search your own files and remove constraints" do
-      fill_in "q", with: "PDF"
-      click_button "search-submit-header"
-      expect(page).to have_content("Fake PDF Title")
-      within(".constraints-container") do
-        expect(page).to have_content("You searched for:")
-        expect(page).to have_css("span.glyphicon-remove")
-        find(".dropdown-toggle").click
+      it "should link to my other tabs" do
+        # TODO this would make a good view test.
+        ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
+          within("#my_nav") do
+            click_link(tab)
+          end
+          expect(page).to have_content(tab)
+        end
       end
-      expect(page).to have_content("Fake Wav File")
     end
 
-    it "should allow you to browse facets" do
-      click_link "Subject"
-      click_link "more Subjects"
-      click_link "consectetur"
-      within("#document_#{fixtures[1].id}") do
-        click_link "Display all details of Test Document MP3.mp3"
-      end
-      expect(page).to have_content("File Details")
-    end
+    context "with one file" do
+      let(:handles) { [ :public_pdf ] }
 
-    it "should allow me to edit files (from the fixtures)" do
-      # TODO this would make a good view test.
-      fill_in "q", with: "Wav"
-      click_button "search-submit-header"
-      click_button "Select an action"
-      click_link "Edit File"
-      expect(page).to have_content("Edit Fake Wav File.wav")
-    end
-
-    it "should refresh the page of files" do
-      # TODO this would make a good view test.
-      click_button "Refresh"
-      within("#document_#{fixtures.first.id}") do
-        click_button("Select an action")
+      it "should display all the necessary information" do
+        # TODO this would make a good view test.
+        within("#document_#{fixtures.first.id}") do
+          click_button("Select an action")
+        end
         expect(page).to have_content("Edit File")
         expect(page).to have_content("Download File")
+        expect(page).to_not have_content("Is part of:")
+        first(".label-success") do
+          expect(page).to have_content("Open Access")
+        end
+        expect(page).to have_link("Create Collection")
+        expect(page).to have_link("Upload")
       end
     end
 
-    it "should allow me to edit files in batches" do
-      first('input#check_all').click
-      click_button('Edit Selected')
-      expect(page).to have_content('3 files')
-    end
+    context "with three files" do
+      let(:handles) { [:public_pdf, :public_mp3, :public_wav] }
 
-    it "should link to my other tabs" do
-      # TODO this would make a good view test.
-      ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
-        within("#my_nav") do
-          click_link(tab)
+      it "allows you to interact your own files" do
+
+      #refreshes the page of files
+        # TODO this would make a good view test.
+        click_button "Refresh"
+        within("#document_#{fixtures.first.id}") do
+          click_button("Select an action")
+          expect(page).to have_content("Edit File")
+          expect(page).to have_content("Download File")
+        end
+
+      # allows you to search your own files and remove constraints
+        fill_in "q", with: "PDF"
+        click_button "search-submit-header"
+        expect(page).to have_content("Fake PDF Title")
+        within(".constraints-container") do
+          expect(page).to have_content("You searched for:")
+          expect(page).to have_css("span.glyphicon-remove")
+          find(".dropdown-toggle").click
         end
-        expect(page).to have_content(tab)
+        expect(page).to have_content("Fake Wav File")
+
+      # allows you to browse facets
+        visit "/dashboard/files"
+        click_link "Subject"
+        click_link "more Subjects"
+        click_link "consectetur"
+        within("#document_#{fixtures[1].id}") do
+          click_link "Display all details of Test Document MP3.mp3"
+        end
+        expect(page).to have_content("File Details")
+
+      # allows me to edit files (from the fixtures)
+        # TODO this would make a good view test.
+        visit "/dashboard/files"
+
+        fill_in "q", with: "Wav"
+        click_button "search-submit-header"
+        click_button "Select an action"
+        click_link "Edit File"
+        expect(page).to have_content("Edit Fake Wav File.wav")
+
+      # allows me to edit files in batches"
+        visit "/dashboard/files"
+
+        first('input#check_all').click
+        click_button('Edit Selected')
+        expect(page).to have_content('3 files')
+
       end
     end
-
   end
 
 end

data/spec/javascripts/autocomplete_spec.js.coffee

@@ -0,0 +1,137 @@
+describe "auto complete", ->
+  beforeEach ->
+    # set up the spy to see in the autocomplete is called
+    resp = [{"uri":"http://lexvo.org/id/iso639-3/fra","label":"French"},{"uri":"http://lexvo.org/id/iso639-3/fsl","label":"French Sign Language"}]
+    @spy_on_json = spyOn($, 'getJSON').and.returnValue resp
+
+    #set up a key down event to trigger the auto complete
+    @typeEvent = $.Event( 'keydown' )
+    @typeEvent.keyCode = 70 # lower case f
+
+    #define the jasmine clock so we can control time
+    jasmine.clock().install()
+
+  afterEach ->
+    #undefine the jasmine clock so time goes back to normal
+    jasmine.clock().uninstall()
+
+  describe "language", ->
+    beforeEach ->
+      # setup two inputs for us to attach  auto complete to
+      setFixtures  '<input class="generic_file_language"  value="" id="generic_file_language" type="text" >
+                    <input class="generic_file_language"  value="" type="text">'
+
+      # run all Blacklight.onload functions
+      Blacklight.activate()
+
+    describe "first input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_language")[0])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+
+    describe "second input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_language")[1])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+  describe "subject", ->
+    beforeEach ->
+      # setup two inputs for us to attach  auto complete to
+      setFixtures  '<input class="generic_file_subject"  value="" id="generic_file_subject" type="text" >
+                    <input class="generic_file_subject"  value="" type="text">'
+
+      # run all Blacklight.onload functions
+      Blacklight.activate()
+
+    describe "first input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_subject")[0])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+
+    describe "second input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_subject")[1])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+
+  describe "location", ->
+    beforeEach ->
+      # setup two inputs for us to attach  auto complete to
+      setFixtures  '<input class="generic_file_based_near"  value="" id="generic_file_based_near" type="text" >
+                    <input class="generic_file_based_near"  value="" type="text">'
+
+      # run all Blacklight.onload functions
+      Blacklight.activate()
+
+    describe "first input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_based_near")[0])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()
+
+
+    describe "second input", ->
+
+      # field triggers auto complete
+      it "auto completes on typing", ->
+        # send a key stroke to the target input to activate the auto complete
+        target = $($("input.generic_file_based_near")[1])
+        target.val('fre')
+        target.trigger(@typeEvent)
+
+        # move time along so that events have a chance to happen
+        jasmine.clock().tick(800);
+
+        # verify that the ajax call was made
+        expect(@spy_on_json).toHaveBeenCalled()

data/spec/models/generic_file_spec.rb

@@ -634,4 +634,104 @@ describe GenericFile, :type => :model do
       it { is_expected.not_to be_public }
     end
   end
+
+  describe "find_by_date_created" do
+    subject { GenericFile.find_by_date_created(start_date, end_date) }
+
+    context "with no start date" do
+      let(:start_date) { nil }
+      let(:end_date) { nil }
+      it { is_expected.to eq [] }
+    end
+
+    context "with no end date" do
+      let(:start_date) {1.days.ago}
+      let(:end_date) {nil}
+      before do
+        @file.save
+      end
+      it { is_expected.to eq [@file] }
+    end
+
+    context "with an end date" do
+      let(:start_date) { 1.days.ago }
+      let(:end_date) { DateTime.now }
+      before do
+        @file.save
+      end
+      it { is_expected.to eq [@file] }
+    end
+  end
+
+  describe "where_access_is" do
+    subject { GenericFile.where_access_is access_level }
+    before do
+      @file.read_groups = read_groups
+      @file.save
+    end
+
+    context "when file is private" do
+      let(:read_groups) { ["private"] }
+      context "when access level is private" do
+        let(:access_level) { 'private' }
+        it { is_expected.to eq [@file]}
+      end
+      context "when access level is public" do
+        let(:access_level) { 'public' }
+        it { is_expected.to eq []}
+      end
+      context "when access level is registered" do
+        let(:access_level) { 'registered' }
+        it { is_expected.to eq []}
+      end
+    end
+    context "when file is public" do
+      let(:read_groups) { ["public"] }
+      context "when access level is private" do
+        let(:access_level) { 'private' }
+        it { is_expected.to eq []}
+      end
+      context "when access level is public" do
+        let(:access_level) { 'public' }
+        it { is_expected.to eq [@file]}
+      end
+      context "when access level is registered" do
+        let(:access_level) { 'registered' }
+        it { is_expected.to eq []}
+      end
+    end
+    context "when file is registered" do
+      let(:read_groups) { ["registered"] }
+      context "when access level is private" do
+        let(:access_level) { 'private' }
+        it { is_expected.to eq []}
+      end
+      context "when access level is public" do
+        let(:access_level) {'public'}
+        it { is_expected.to eq []}
+      end
+      context "when access level is registered" do
+        let(:access_level) { 'registered' }
+        it { is_expected.to eq [@file]}
+      end
+    end
+  end
+  describe "where_private" do
+    it "calls where_access_is with private" do
+      expect(GenericFile).to receive(:where_access_is).with('private')
+      GenericFile.where_private
+    end
+  end
+  describe "where_registered" do
+    it "calls where_access_is with registered" do
+      expect(GenericFile).to receive(:where_access_is).with('registered')
+      GenericFile.where_registered
+    end
+  end
+  describe "where_public" do
+    it "calls where_access_is with public" do
+      expect(GenericFile).to receive(:where_access_is).with('public')
+      GenericFile.where_public
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -172,4 +172,31 @@ describe User, :type => :model do
       expect(another_user.can_receive_deposits_from.to_a).to eq [@subject]
     end
   end
+  describe "class methods" do
+    describe "recent_users" do
+      let(:new_users) { User.all.order(created_at: :desc) }
+
+      before do
+        (1..3).each {|i| User.create(email: "abc#{i}@blah.frg", password: "blarg1234", created_at:DateTime.now - i.days) }
+      end
+
+      context "when has a start date" do
+        subject { User.recent_users(Date.today - 2.days) }
+        it "returns valid data" do
+          expect(subject.count).to eq 2
+          is_expected.to include(new_users[0],new_users[1])
+          is_expected.not_to include(new_users[2])
+        end
+      end
+
+      context "when has start and end date" do
+        subject { User.recent_users(Date.today - 2.days, Date.today - 1.days) }
+        it "returns valid data" do
+          expect(subject.count).to eq 1
+          is_expected.to include(new_users[1])
+          is_expected.not_to include(new_users[2], new_users[0])
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -25,10 +25,14 @@ require 'support/rake'
 require 'support/input_support'
 require 'byebug' unless ENV['TRAVIS']
 
-if ENV['COVERAGE']
+if ENV['COVERAGE'] || ENV['TRAVIS']
   require 'simplecov'
-  SimpleCov.start 'rails'
-  SimpleCov.command_name "spec"
+  SimpleCov.root(File.expand_path('../..', __FILE__))
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start('rails') do
+    add_filter '/spec'
+  end
+  SimpleCov.command_name 'spec'
 end
 
 Capybara.default_driver = :rack_test      # This is a faster driver

data/spec/support/fixture_helpers.rb

@@ -1,7 +1,6 @@
 # spec/support/fixture_helpers.rb
 module FixtureHelpers
-  def create_file_fixtures(depositor = 'archivist1@example.com')
-    handles = [:public_pdf, :public_mp3, :public_wav]
+  def create_file_fixtures(depositor = 'archivist1@example.com', handles = [:public_pdf, :public_mp3, :public_wav])
     handles.map { |handle| FactoryGirl.create(handle, depositor: depositor) }
   end
 end

data/spec/views/users/_user_info.html.erb_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'users/_user_info.html.erb', type: :view do
+  let(:user) { stub_model(User, user_key: 'jdoe42') }
+
+  context 'with Zotero disabled' do
+    before do
+      allow(Sufia.config).to receive(:arkivo_api) { false }
+      allow(user).to receive(:zotero_userid).and_raise(NoMethodError)
+      render "users/user_info", user: user
+    end
+
+    it 'does not display a Zotero profile link' do
+      expect(rendered).not_to match(/Zotero Profile/)
+    end
+  end
+
+  context 'with Zotero enabled' do
+    before do
+      allow(Sufia.config).to receive(:arkivo_api) { true }
+      allow(user).to receive(:zotero_userid) { 'jdoe42zotero' }
+      render "users/user_info", user: user
+    end
+
+    it 'displays a Zotero profile link' do
+      expect(rendered).to match(/Zotero Profile/)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -683,6 +683,8 @@ files:
 - app/views/_logo.html.erb
 - app/views/_masthead.html.erb
 - app/views/_user_util_links.html.erb
+- app/views/admin/stats/_files.html.erb
+- app/views/admin/stats/_new_users.html.erb
 - app/views/admin/stats/index.html.erb
 - app/views/advanced/_advanced_search_facets.html.erb
 - app/views/advanced/_advanced_search_fields.html.erb
@@ -1031,6 +1033,7 @@ files:
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/select_with_help_input_spec.rb
 - spec/inputs/select_with_modal_help_input_spec.rb
+- spec/javascripts/autocomplete_spec.js.coffee
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/jasmine_spec.rb
@@ -1134,6 +1137,7 @@ files:
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/_user_info.html.erb_spec.rb
 - spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/edit.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb
@@ -1201,7 +1205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1304,6 +1308,7 @@ test_files:
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/select_with_help_input_spec.rb
 - spec/inputs/select_with_modal_help_input_spec.rb
+- spec/javascripts/autocomplete_spec.js.coffee
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/jasmine_spec.rb
@@ -1407,6 +1412,7 @@ test_files:
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/_user_info.html.erb_spec.rb
 - spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/edit.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb