sufia 6.2.0 → 6.3.0

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

@@ -28,7 +28,7 @@ class CatalogController < ApplicationController
   end
 
   configure_blacklight do |config|
-    #Show gallery view
+    # Show gallery view
     config.view.gallery.partials = [:index_header, :index]
     config.view.slideshow.partials = [:index]
 
@@ -119,7 +119,7 @@ class CatalogController < ApplicationController
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
-      all_names = config.show_fields.values.map{|val| val.field}.join(" ")
+      all_names = config.show_fields.values.map(&:field).join(" ")
       title_name = solr_name("title", :stored_searchable)
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
@@ -312,5 +312,4 @@ class CatalogController < ApplicationController
     # mean") suggestion is offered.
     config.spell_max = 5
   end
-
 end

data/lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb

@@ -4,6 +4,7 @@ module ActionDispatch
       def closed?
         @tempfile.closed?
       end
+
       def close
         @tempfile.close
       end

data/lib/generators/sufia/upgrade400_generator.rb

@@ -7,7 +7,7 @@ class Sufia::Upgrade400Generator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :model_name, type: :string , default: "user"
+  argument :model_name, type: :string, default: "user"
   desc """
 This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes to your application:
  1. Updates the root route
@@ -40,9 +40,9 @@ This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes
   def inject_sufia_controller_behavior
     controller_name = "CatalogController"
     file_path = "app/controllers/catalog_controller.rb"
-    if File.exists?(file_path)
+    if File.exist?(file_path)
       insert_into_file file_path, after: 'include Hydra::Controller::ControllerBehavior' do
-        "\n  # Adds Sufia behaviors to the catalog controller (#{controller_name})\n" +
+        "\n  # Adds Sufia behaviors to the catalog controller (#{controller_name})\n" \
         "  include Sufia::Catalog\n"
       end
     else
@@ -68,9 +68,9 @@ This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes
 
   def blacklight_marc
     file_path = 'app/models/solr_document.rb'
-    return unless File.exists?(file_path) &&
-      file_contains?('app/models/solr_document.rb', 'Blacklight::Solr::Document::Marc') &&
-      !file_contains?('Gemfile', 'blacklight-marc')
+    return unless File.exist?(file_path) &&
+                  file_contains?('app/models/solr_document.rb', 'Blacklight::Solr::Document::Marc') &&
+                  !file_contains?('Gemfile', 'blacklight-marc')
     insert_into_file 'Gemfile', after: /gem 'sufia'.*$/ do
       "\ngem 'blacklight-marc'"
     end
@@ -85,7 +85,7 @@ This generator for upgrading sufia from 3.7.2 to 4.0 makes the following changes
 
   private
 
-  def file_contains?(path, string)
-    File.readlines(path).grep(/#{string}/).any?
-  end
+    def file_contains?(path, string)
+      File.readlines(path).grep(/#{string}/).any?
+    end
 end

data/lib/generators/sufia/upgrade600_generator.rb

@@ -2,7 +2,6 @@
 require 'rails/generators'
 
 class Sufia::Upgrade600Generator < Rails::Generators::Base
-
   source_root File.expand_path('../templates', __FILE__)
 
   desc """
@@ -13,7 +12,7 @@ This generator for upgrading sufia to 6.0 makes the following changes to your ap
   def insert_builder
     insert_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior/ do
       # First line should be generated by Hydra. projecthydra/hydra-head#255
-      "\n  include Hydra::AccessControlsEnforcement" +
+      "\n  include Hydra::AccessControlsEnforcement" \
       "\n  include Sufia::SearchBuilder\n"
     end
   end
@@ -21,6 +20,4 @@ This generator for upgrading sufia to 6.0 makes the following changes to your ap
   def migrations
     generate "sufia:models:upgrade600"
   end
-
 end
-

data/lib/sufia.rb

@@ -37,8 +37,8 @@ module Sufia
     )
 
     config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
-    config.assets.precompile << %r(vjs\.(?:eot|ttf|woff)$)
-    config.assets.precompile << %r(fontawesome-webfont\.(?:svg|ttf|woff)$)
+    config.assets.precompile << /vjs\.(?:eot|ttf|woff)$/
+    config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
     config.assets.precompile += %w( ZeroClipboard.swf )
   end
 end

data/lib/sufia/arkivo/actor.rb

@@ -82,7 +82,7 @@ module Sufia
         def extract_file_from_item
           encoded = item['file']['base64']
           content = Base64.decode64(encoded)
-          tmp = Tempfile.new(item['file']['md5'], { encoding: Encoding::UTF_8 })
+          tmp = Tempfile.new(item['file']['md5'], encoding: Encoding::UTF_8)
           tmp.binmode
           tmp.original_filename = item['file']['filename']
           tmp.content_type = item['file']['contentType']

data/lib/sufia/arkivo/create_subscription_job.rb

@@ -27,41 +27,41 @@ module Sufia
 
       private
 
-      def logger
-        ActiveFedora::Base.logger
-      end
+        def logger
+          ActiveFedora::Base.logger
+        end
 
-      def validate_user!
-        log_and_raise('User not found') if user.blank?
-        log_and_raise('User does not have an Arkivo token') if user.arkivo_token.blank?
-        log_and_raise('User has not yet connected with Zotero') if user.zotero_userid.blank?
-        log_and_raise('User already has a subscription') if user.arkivo_subscription.present?
-      end
+        def validate_user!
+          log_and_raise('User not found') if user.blank?
+          log_and_raise('User does not have an Arkivo token') if user.arkivo_token.blank?
+          log_and_raise('User has not yet connected with Zotero') if user.zotero_userid.blank?
+          log_and_raise('User already has a subscription') if user.arkivo_subscription.present?
+        end
 
-      def log_and_raise(message)
-        logger.error "*** Arkivo error: #{message}: #{user}"
-        raise SubscriptionError.new(message)
-      end
+        def log_and_raise(message)
+          logger.error "*** Arkivo error: #{message}: #{user}"
+          raise SubscriptionError, message
+        end
 
-      def post_to_api
-        Faraday.new(url: Sufia::Arkivo.config[:url]).post do |request|
-          request.url Sufia::Arkivo.new_subscription_url
-          request.headers['Content-Type'] = 'application/json'
-          request.body = new_subscription_json
+        def post_to_api
+          Faraday.new(url: Sufia::Arkivo.config[:url]).post do |request|
+            request.url Sufia::Arkivo.new_subscription_url
+            request.headers['Content-Type'] = 'application/json'
+            request.body = new_subscription_json
+          end
         end
-      end
 
-      def new_subscription_json
-        {
-          url: Sufia::Zotero.publications_url(@user.zotero_userid),
-          plugins: [
-            {
-              name: "sufia",
-              options: { token: @user.arkivo_token }
-            }
-          ]
-        }.to_json
-      end
+        def new_subscription_json
+          {
+            url: Sufia::Zotero.publications_url(@user.zotero_userid),
+            plugins: [
+              {
+                name: "sufia",
+                options: { token: @user.arkivo_token }
+              }
+            ]
+          }.to_json
+        end
     end
   end
 end

data/lib/sufia/arkivo/metadata_munger.rb

@@ -1,15 +1,15 @@
 module Sufia
   module Arkivo
     CREATOR_TYPES = ['author', 'interviewer', 'director', 'scriptwriter',
-      'inventor', 'composer', 'cartographer', 'programmer', 'artist',
-      'bookAuthor'
-    ]
+                     'inventor', 'composer', 'cartographer', 'programmer', 'artist',
+                     'bookAuthor'
+                    ]
 
     CONTRIBUTOR_TYPES = ['contributor', 'editor', 'translator', 'seriesEditor',
-      'interviewee', 'producer', 'castMember', 'sponsor', 'counsel',
-      'attorneyAgent', 'recipient', 'performer', 'wordsBy', 'commenter',
-      'presenter', 'guest', 'podcaster', 'reviewedAuthor', 'cosponsor'
-    ]
+                         'interviewee', 'producer', 'castMember', 'sponsor', 'counsel',
+                         'attorneyAgent', 'recipient', 'performer', 'wordsBy', 'commenter',
+                         'presenter', 'guest', 'podcaster', 'reviewedAuthor', 'cosponsor'
+                        ]
 
     class MetadataMunger
       def initialize(metadata)

data/lib/sufia/arkivo/schema_validator.rb

@@ -48,7 +48,7 @@ module Sufia
       def call
         JSON::Validator.validate!(Sufia::Arkivo::ITEM_SCHEMA, item, version: :draft3)
       rescue JSON::Schema::ValidationError => exception
-        raise Sufia::Arkivo::InvalidItem.new(exception.message)
+        raise Sufia::Arkivo::InvalidItem, exception.message
       end
     end
   end

data/lib/sufia/single_use_error.rb

@@ -1,4 +1,3 @@
 module Sufia
   class SingleUseError < StandardError; end
 end
-

data/lib/sufia/version.rb

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

data/lib/sufia/zotero/config.rb

@@ -1,15 +1,15 @@
- module Sufia
-   module Zotero
-     def self.config
-       @config ||= reload_config!
-     end
+module Sufia
+  module Zotero
+    def self.config
+      @config ||= reload_config!
+    end
 
-     def self.reload_config!
-       @config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'zotero.yml'))).result)['zotero']
-     end
+    def self.reload_config!
+      @config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'zotero.yml'))).result)['zotero']
+    end
 
-     def self.publications_url(zotero_userid)
-       "/users/#{zotero_userid}/publications/items"
-     end
-   end
- end
+    def self.publications_url(zotero_userid)
+      "/users/#{zotero_userid}/publications/items"
+    end
+  end
+end

data/spec/actors/generic_file/actor_spec.rb

@@ -5,14 +5,14 @@ describe Sufia::GenericFile::Actor do
 
   let(:user) { FactoryGirl.create(:user) }
   let(:generic_file) { FactoryGirl.create(:generic_file) }
-  let(:actor) { Sufia::GenericFile::Actor.new(generic_file, user) }
-  let(:uploaded_file) { fixture_file_upload('/world.png','image/png') }
+  let(:actor) { described_class.new(generic_file, user) }
+  let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
 
   describe "#create_content" do
     let(:deposit_message) { double('deposit message') }
     let(:characterize_message) { double('characterize message') }
 
-    it "should enqueue deposit and characterize messages" do
+    it "enqueues deposit and characterize messages" do
       allow(ContentDepositEventJob).to receive(:new).with(generic_file.id, user.user_key).and_return(deposit_message)
       allow(CharacterizeJob).to receive(:new).with(generic_file.id).and_return(characterize_message)
       expect(Sufia.queue).to receive(:push).with(deposit_message)
@@ -24,25 +24,24 @@ describe Sufia::GenericFile::Actor do
       let(:file)       { "world.png" }
       let(:long_name)  { "an absurdly long title that goes on way to long and messes up the display of the page which should not need to be this big in order to show this impossibly long, long, long, oh so long string" }
       let(:short_name) { "Nice Short Name" }
-      let(:actor)      { Sufia::GenericFile::Actor.new(generic_file, user) }
+      let(:actor)      { described_class.new(generic_file, user) }
       before do
         allow(generic_file).to receive(:label).and_return(short_name)
         allow(Sufia.queue).to receive(:push)
         actor.create_content(fixture_file_upload(file), long_name, 'content', 'image/png')
-      end 
+      end
       subject { generic_file.title }
       it { is_expected.to eql [short_name] }
     end
 
     context "with two existing versions from different users" do
-
       let(:file1)       { "world.png" }
       let(:file2)       { "image.jpg" }
-      let(:actor1)      { Sufia::GenericFile::Actor.new(generic_file, user) }
-      let(:actor2)      { Sufia::GenericFile::Actor.new(generic_file, second_user) }
+      let(:actor1)      { described_class.new(generic_file, user) }
+      let(:actor2)      { described_class.new(generic_file, second_user) }
 
       let(:second_user) { FactoryGirl.find_or_create(:archivist) }
-      let(:versions)     { generic_file.content.versions }
+      let(:versions) { generic_file.content.versions }
 
       before do
         allow(Sufia.queue).to receive(:push)
@@ -50,22 +49,22 @@ describe Sufia::GenericFile::Actor do
         actor2.create_content(fixture_file_upload(file2), file2, 'content', 'image/jpeg')
       end
 
-      it "should have two versions" do
+      it "has two versions" do
         expect(versions.all.count).to eq 2
       end
 
-      it "should have the current version" do
+      it "has the current version" do
         expect(generic_file.content.latest_version.label).to eq 'version2'
         expect(generic_file.content.mime_type).to eq "image/jpeg"
         expect(generic_file.content.original_name).to eq file2
       end
 
-      it "should use the first version for the object's title and label" do
+      it "uses the first version for the object's title and label" do
         expect(generic_file.label).to eql(file1)
         expect(generic_file.title.first).to eql(file1)
       end
 
-      it "should note the user for each version" do
+      it "notes the user for each version" do
         expect(VersionCommitter.where(version_id: versions.first.uri).pluck(:committer_login)).to eq [user.user_key]
         expect(VersionCommitter.where(version_id: versions.last.uri).pluck(:committer_login)).to eq [second_user.user_key]
       end
@@ -73,19 +72,19 @@ describe Sufia::GenericFile::Actor do
   end
 
   describe "#virus_check" do
-    it "should return the results of running ClamAV scanfile method" do
+    it "returns the results of running ClamAV scanfile method" do
       expect(ClamAV.instance).to receive(:scanfile).and_return(1)
-      expect { Sufia::GenericFile::Actor.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
+      expect { described_class.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
     end
   end
 
   describe "#featured_work" do
     let(:gf) { FactoryGirl.create(:generic_file, visibility: 'open') }
-    let(:actor) { Sufia::GenericFile::Actor.new(gf, user)}
+    let(:actor) { described_class.new(gf, user) }
 
     before { FeaturedWork.create(generic_file_id: gf.id) }
 
-    it "should be removed if document is not public" do
+    it "is removed if document is not public" do
       # Switch document from public to restricted
       expect { actor.update_metadata({}, 'restricted') }.to change { FeaturedWork.count }.by(-1)
     end
@@ -100,7 +99,7 @@ describe Sufia::GenericFile::Actor do
         f.label = label
       end
     end
-    let(:actor) { Sufia::GenericFile::Actor.new(generic_file_with_label, user)}
+    let(:actor) { described_class.new(generic_file_with_label, user) }
 
     before do
       allow(actor).to receive(:save_characterize_and_record_committer).and_return("true")

data/spec/controllers/admin_stats_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Admin::StatsController, type: :controller do
   let(:user1) { FactoryGirl.find_or_create(:user) }
   let(:user2) { FactoryGirl.find_or_create(:archivist) }
-  
+
   before do
     allow(user1).to receive(:groups).and_return(['admin'])
     allow(user2).to receive(:groups).and_return(['not-admin'])
@@ -54,7 +54,7 @@ describe Admin::StatsController, type: :controller do
         ActiveFedora::SolrService.instance.conn.delete_by_id(poltergeist.id)
         original_files_count
       end
-      it "should provide accurate files_count, ensuring that solr deletes have been expunged first" do
+      it "provides accurate files_count, ensuring that solr deletes have been expunged first" do
         get :index
         expect(assigns[:files_count][:total]).to eq(original_files_count - 1)
       end
@@ -63,9 +63,9 @@ describe Admin::StatsController, type: :controller do
     describe "counts" do
       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)
+          FactoryGirl.build(:generic_file, depositor: user1, id: "abc1223").update_index
+          FactoryGirl.build(:public_file, depositor: user1, id: "bbb1223").update_index
+          FactoryGirl.build(:registered_file, depositor: user1, id: "ccc1223").update_index
           Collection.create(title: "test") do |c|
             c.apply_depositor_metadata(user1.user_key)
           end
@@ -98,5 +98,56 @@ describe Admin::StatsController, type: :controller do
       end
     end
 
+    describe "depositor counts" do
+      before do
+        GenericFile.new(id: "abc123") do |gf|
+          gf.apply_depositor_metadata(user1)
+          gf.update_index
+        end
+        GenericFile.new(id: "def123") do |gf|
+          gf.apply_depositor_metadata(user2)
+          gf.update_index
+        end
+        GenericFile.new(id: "zzz123") do |gf|
+          gf.create_date = [2.days.ago]
+          gf.apply_depositor_metadata(user1)
+          gf.update_index
+        end
+        Collection.new(id: "ccc123") do |c|
+          c.apply_depositor_metadata(user1)
+          c.update_index
+        end
+      end
+
+      it "gathers user deposits" do
+        get :index
+        expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+      end
+
+      it "gathers user deposits during a date range" do
+        get :index, deposit_stats: { start_date: 1.days.ago.strftime("%Y-%m-%d"), end_date: 0.days.ago.strftime("%Y-%m-%d") }
+        expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 1, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+      end
+
+      context "more than 10 users" do
+        let(:users) { [] }
+        before do
+          (1..12).each do |number|
+            luser = User.create(email: "user#{number}@blah.com", password: "blahbalh")
+            users << luser
+            GenericFile.new(id: "more#{number}") do |gf|
+              gf.apply_depositor_metadata(luser)
+              gf.update_index
+            end
+          end
+        end
+
+        it "gathers user deposits" do
+          get :index
+          expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+          users.each { |user| expect(assigns[:depositors]).to include(key: user.user_key, deposits: 1, user: user) }
+        end
+      end
+    end
   end
 end