sufia 7.0.0.beta4 → 7.0.0.rc1

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

@@ -47,6 +47,7 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name("human_readable_type", :facetable), label: "Type", limit: 5
     config.add_facet_field solr_name("resource_type", :facetable), label: "Resource Type", limit: 5
     config.add_facet_field solr_name("creator", :facetable), label: "Creator", limit: 5
+    config.add_facet_field solr_name("contributor", :facetable), label: "Contributor", limit: 5
     config.add_facet_field solr_name("keyword", :facetable), label: "Keyword", limit: 5
     config.add_facet_field solr_name("subject", :facetable), label: "Subject", limit: 5
     config.add_facet_field solr_name("language", :facetable), label: "Language", limit: 5
@@ -66,14 +67,14 @@ class CatalogController < ApplicationController
     config.add_index_field solr_name("keyword", :stored_searchable), label: "Keyword", itemprop: 'keywords', link_to_search: solr_name("keyword", :facetable)
     config.add_index_field solr_name("subject", :stored_searchable), label: "Subject", itemprop: 'about', link_to_search: solr_name("subject", :facetable)
     config.add_index_field solr_name("creator", :stored_searchable), label: "Creator", itemprop: 'creator', link_to_search: solr_name("creator", :facetable)
-    config.add_index_field solr_name("contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor', helper_method: :index_field_link, field_name: 'contributor'
+    config.add_index_field solr_name("contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor', link_to_search: solr_name("contributor", :facetable)
     config.add_index_field solr_name("proxy_depositor", :symbol), label: "Depositor", helper_method: :link_to_profile
     config.add_index_field solr_name("depositor"), label: "Owner", helper_method: :link_to_profile
     config.add_index_field solr_name("publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher', link_to_search: solr_name("publisher", :facetable)
     config.add_index_field solr_name("based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation', link_to_search: solr_name("based_near", :facetable)
     config.add_index_field solr_name("language", :stored_searchable), label: "Language", itemprop: 'inLanguage', link_to_search: solr_name("language", :facetable)
-    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished', helper_method: :human_readable_date
-    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), label: "Date Modified", itemprop: 'dateModified', helper_method: :human_readable_date
+    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished'
+    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), label: "Date Modified", itemprop: 'dateModified'
     config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
     config.add_index_field solr_name("rights", :stored_searchable), label: "Rights", helper_method: :rights_statement_links
     config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type", link_to_search: solr_name("resource_type", :facetable)

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

@@ -1,6 +1,4 @@
 Sufia.config do |config|
-  config.register_curation_concern :generic_work
-
   # Email recipient of messages sent via the contact form
   # config.contact_email = "repo-admin@example.org"
 
@@ -103,3 +101,7 @@ Sufia.config do |config|
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
+
+Qa::Authorities::Local.register_subauthority('subjects', 'Qa::Authorities::Local::TableBasedAuthority')
+Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority')
+Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')

data/lib/generators/sufia/upgrade700_generator.rb

@@ -19,15 +19,13 @@ This generator for upgrading sufia from 6.0.0 to 7.0 makes the following changes
     gsub_file 'app/controllers/catalog_controller.rb', '[:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]', '[:add_advanced_parse_q_to_solr] + search_params_logic + [:add_access_controls_to_solr_params]'
   end
 
-  def inject_sufia_work_controller_behavior
-    file_path = "app/controllers/curation_concerns/generic_works_controller.rb"
-    if File.exist?(file_path)
-      inject_into_file file_path, after: /include CurationConcerns::CurationConcernController/ do
-        "\n  # Adds Sufia behaviors to the controller.\n" \
-          "  include Sufia::WorksControllerBehavior\n"
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a CurationConcerns::GenericWorksController object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."
+  def qa_routes
+    insert_into_file "config/routes.rb", after: ".draw do" do
+      "\n  mount Qa::Engine => '/authorities'\n"
     end
   end
+
+  def qa_tables
+    generate 'qa:local:tables'
+  end
 end

data/lib/generators/sufia/work_generator.rb

@@ -0,0 +1,56 @@
+require 'generators/curation_concerns/work/work_generator'
+
+module Sufia
+  class WorkGenerator < CurationConcerns::WorkGenerator
+    source_root CurationConcerns::WorkGenerator.source_root
+    desc """
+  This generator makes the following changes to your application:
+   1. Generates work model
+   2. Injects sufia behavior into model
+   3. Injects sufia behavior into form
+         """
+
+    def create_model
+      say_status("info", "GENERATING WORK MODEL", :blue)
+      super
+    end
+
+    def register_work
+      inject_into_file 'config/initializers/sufia.rb', after: "Sufia.config do |config|\n" do
+        "  # Injected via `rails g sufia:work #{class_name}`\n" \
+        "  config.register_curation_concern :#{file_name}\n"
+      end
+    end
+
+    def inject_sufia_work_behavior
+      insert_into_file "app/models/#{name.underscore}.rb", after: 'include ::CurationConcerns::BasicMetadata' do
+        "\n  include Sufia::WorkBehavior" \
+        "\n  self.human_readable_type = 'Work'"
+      end
+    end
+
+    def inject_sufia_form
+      file_path = "app/forms/curation_concerns/#{file_name}_form.rb"
+      if File.exist?(file_path)
+        gsub_file file_path, /CurationConcerns::Forms::WorkForm/, "Sufia::Forms::WorkForm"
+        inject_into_file file_path, after: /model_class = ::.*$/ do
+          "\n    self.terms += [:resource_type]\n"
+        end
+      else
+        puts "     \e[31mFailure\e[0m  Sufia requires a #{class_name}Form object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."
+      end
+    end
+
+    def inject_sufia_work_controller_behavior
+      file_path = "app/controllers/curation_concerns/#{plural_file_name}_controller.rb"
+      if File.exist?(file_path)
+        inject_into_file file_path, after: /include CurationConcerns::CurationConcernController/ do
+          "\n  # Adds Sufia behaviors to the controller.\n" \
+            "  include Sufia::WorksControllerBehavior\n"
+        end
+      else
+        puts "     \e[31mFailure\e[0m  Sufia requires a #{controller_class_name} object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."
+      end
+    end
+  end
+end

data/lib/sufia.rb

@@ -4,7 +4,6 @@ require 'redis-namespace'
 require 'mailboxer'
 require 'acts_as_follower'
 require 'carrierwave'
-require "active_resource" # used by FileSet to catch errors & by GeoNamesResource
 require 'rails_autolink'
 require 'font-awesome-rails'
 require 'tinymce-rails'
@@ -41,4 +40,8 @@ module Sufia
 
     @config
   end
+
+  def self.primary_work_type
+    CurationConcerns::WorkRelation::DummyModel.primary_concern
+  end
 end

data/lib/sufia/arkivo/actor.rb

@@ -17,7 +17,7 @@ module Sufia
       end
 
       def create_work_from_item
-        work = ::GenericWork.new
+        work = Sufia.primary_work_type.new
         work_actor = CurationConcerns::CurationConcern.actor(work, user)
         create_attrs = attributes.merge(arkivo_checksum: item['file']['md5'])
         raise "Unable to create work. #{work.errors.messages}" unless work_actor.create(create_attrs)

data/lib/sufia/configuration.rb

@@ -32,6 +32,7 @@ module Sufia
     def analytics
       @analytics ||= false
     end
+
     attr_writer :citations
     def citations
       @citations ||= false
@@ -52,9 +53,8 @@ module Sufia
       @arkivo_api ||= false
     end
 
-    attr_writer :geonames_username
-    def geonames_username
-      @geonames_username ||= ""
+    def geonames_username=(username)
+      Qa::Authorities::Geonames.username = username
     end
 
     attr_writer :active_deposit_agreement_acceptance
@@ -86,6 +86,11 @@ module Sufia
       @always_display_share_button
     end
 
+    attr_writer :google_analytics_id
+    def google_analytics_id
+      @google_analytics_id ||= nil
+    end
+
     # Defaulting analytic start date to whenever the file was uploaded by leaving it blank
     attr_writer :analytic_start_date
     attr_reader :analytic_start_date
@@ -128,5 +133,12 @@ module Sufia
     def subject_prefix
       @subject_prefix ||= "Contact form:"
     end
+
+    attr_writer :model_to_create
+    # Returns a lambda that takes a hash of attributes and returns a string of the model
+    # name. This is called by the batch upload process
+    def model_to_create
+      @model_to_create ||= ->(_attributes) { Sufia.primary_work_type.model_name.name }
+    end
   end
 end

data/lib/sufia/engine.rb

@@ -6,6 +6,7 @@ module Sufia
     require 'breadcrumbs_on_rails'
     require 'jquery-ui-rails'
     require 'flot-rails'
+    require 'almond-rails'
     require 'zeroclipboard-rails'
 
     config.autoload_paths += %W(
@@ -65,15 +66,5 @@ module Sufia
       # in this way:
       # https://github.com/rails/sprockets/issues/73#issuecomment-139113466
     end
-
-    config.after_initialize do
-      begin
-        LocalAuthority.register_vocabulary('generic_works', "subject", "lc_subjects")
-        LocalAuthority.register_vocabulary('generic_works', "language", "lexvo_languages")
-        LocalAuthority.register_vocabulary('generic_works', "tag", "lc_genres")
-      rescue ActiveRecord::StatementInvalid => e
-        Rails.logger.error "tables for vocabularies missing #{e.class}"
-      end
-    end
   end
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "7.0.0.beta4".freeze
+  VERSION = "7.0.0.rc1".freeze
 end

data/spec/controllers/api/items_controller_spec.rb

@@ -68,8 +68,10 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with a resource not found in the repository' do
+      let(:relation) { double }
       before do
-        allow(GenericWork).to receive(:find).with(default_work.id).and_raise(ActiveFedora::ObjectNotFoundError)
+        allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+        allow(relation).to receive(:find).with(default_work.id).and_raise(ActiveFedora::ObjectNotFoundError)
         get :show, format: :json, id: default_work.id, token: token
       end
 
@@ -169,10 +171,12 @@ describe API::ItemsController, type: :controller do
     let(:put_item) { FactoryGirl.json(:put_item, token: token) }
     let(:token) { user.arkivo_token }
     let(:gw) { build :generic_work, id: '123' }
+    let(:relation) { double }
 
     before do
       # Mock ActiveFedora
-      allow(GenericWork).to receive(:find).with(gw.id).and_return(gw)
+      allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+      allow(relation).to receive(:find).with(gw.id).and_return(gw)
       # Mock Arkivo Actor
       allow(arkivo_actor).to receive(:update_work_from_item)
     end
@@ -198,12 +202,15 @@ describe API::ItemsController, type: :controller do
 
     context 'with a valid item, matching token, authorized resource, but not Arkivo-deposited' do
       let(:non_arkivo_gw) { create :generic_work, id: 'abc123xyz', arkivo_checksum: nil }
+      let(:relation) { double }
       before do
         # Mock user authorization
         allow(controller).to receive(:user).and_return(user)
         allow(user).to receive(:can?).and_return(true)
         # Mock ActiveFedora for non_arkivo_work
-        allow(GenericWork).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
+        allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+        allow(relation).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
+
         # Post an update to a work with a nil arkivo_checksum
         put :update, put_item, id: non_arkivo_gw.id, format: :json
       end
@@ -216,8 +223,10 @@ describe API::ItemsController, type: :controller do
     end
 
     context 'with a valid item, matching token, missing resource' do
+      let(:relation) { double }
       before do
-        allow(GenericWork).to receive(:find).with(gw.id) do
+        allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+        allow(relation).to receive(:find).with(gw.id) do
           raise(ActiveFedora::ObjectNotFoundError)
         end
         put :update, put_item, id: gw.id, format: :json
@@ -275,10 +284,12 @@ describe API::ItemsController, type: :controller do
     let(:item) { FactoryGirl.json(:post_item, token: token) }
     let(:item_hash) { JSON.parse(item) }
     let(:gw) { build :generic_work, id: '123' }
+    let(:relation) { double }
 
     before do
       # Mock ActiveFedora
-      allow(GenericWork).to receive(:find).with(gw.id).and_return(gw)
+      allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+      allow(relation).to receive(:find).with(gw.id).and_return(gw)
       # Mock ArkivoActor destroy work
       allow(arkivo_actor).to receive(:destroy_work)
     end
@@ -329,7 +340,8 @@ describe API::ItemsController, type: :controller do
         allow(controller).to receive(:user).and_return(user)
         allow(user).to receive(:can?).and_return(true)
         # Mock ActiveFedora for non_arkivo_work
-        allow(GenericWork).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
+        allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+        allow(relation).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
         # Make call to destroy
         delete :destroy, format: :json, id: non_arkivo_gw.id, token: token
       end
@@ -344,7 +356,8 @@ describe API::ItemsController, type: :controller do
       let(:not_found_id) { '409' }
       before do
         # Mock ActiveFedora
-        allow(GenericWork).to receive(:find).with(not_found_id).and_raise(ActiveFedora::ObjectNotFoundError)
+        allow(CurationConcerns::WorkRelation).to receive(:new).and_return(relation)
+        allow(relation).to receive(:find).with(not_found_id).and_raise(ActiveFedora::ObjectNotFoundError)
         delete :destroy, format: :json, id: not_found_id, token: token
       end
 

data/spec/controllers/sufia/batch_uploads_controller_spec.rb

@@ -11,6 +11,7 @@ describe Sufia::BatchUploadsController do
       expect(assigns[:form]).to be_kind_of Sufia::Forms::BatchUploadForm
     end
   end
+
   describe "#create" do
     context "enquing a update job" do
       it "is successful" do
@@ -24,7 +25,7 @@ describe Sufia::BatchUploadsController do
         post :create, title: { '1' => 'foo' },
                       resource_type: { '1' => 'Article' },
                       uploaded_files: ['1'],
-                      generic_work: { keyword: [""], visibility: 'open' }
+                      batch_upload_item: { keyword: [""], visibility: 'open' }
         expect(response).to redirect_to Sufia::Engine.routes.url_helpers.dashboard_works_path
         expect(flash[:notice]).to include("Your files are being processed")
       end
@@ -34,7 +35,7 @@ describe Sufia::BatchUploadsController do
       it "redirects to my shares page" do
         allow(BatchCreateJob).to receive(:perform_later)
         post :create,
-             generic_work: {
+             batch_upload_item: {
                permissions_attributes: [
                  { type: "group", name: "public", access: "read" }
                ],
@@ -51,7 +52,7 @@ describe Sufia::BatchUploadsController do
     before do
       controller.params = { title: { '1' => 'foo' },
                             uploaded_files: ['1'],
-                            generic_work: { keyword: [""], visibility: 'open' } }
+                            batch_upload_item: { keyword: [""], visibility: 'open' } }
     end
     it "excludes uploaded_files and title" do
       expect(subject).to eq('keyword' => [],

data/spec/controllers/transfers_controller_spec.rb

@@ -55,17 +55,13 @@ describe TransfersController, type: :controller do
     end
 
     describe "#new" do
-      let(:work) do
-        GenericWork.create!(title: ['a work']) do |w|
-          w.apply_depositor_metadata(user.user_key)
-        end
-      end
+      let(:work) { create(:work, user: user) }
       context 'when user is the depositor' do
         it "is successful" do
           sign_in user
           get :new, id: work.id
           expect(response).to be_success
-          expect(assigns[:generic_work]).to eq(work)
+          expect(assigns[:work]).to eq(work)
           expect(assigns[:proxy_deposit_request]).to be_kind_of ProxyDepositRequest
           expect(assigns[:proxy_deposit_request].work_id).to eq(work.id)
         end
@@ -73,11 +69,7 @@ describe TransfersController, type: :controller do
     end
 
     describe "#create" do
-      let(:work) do
-        GenericWork.create!(title: ['a work']) do |w|
-          w.apply_depositor_metadata(user.user_key)
-        end
-      end
+      let(:work) { create(:work, user: user) }
       it "is successful" do
         allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
         expect {

data/spec/controllers/users_controller_spec.rb

@@ -117,7 +117,8 @@ describe UsersController, type: :controller do
       it "show the user profile if user exists" do
         get :edit, id: user.user_key
         expect(response).to be_success
-        expect(assigns[:trophies]).to match_array([work1, work2, work3])
+        expect(assigns[:trophies]).to all(be_kind_of Sufia::TrophyPresenter)
+        expect(assigns[:trophies].map(&:id)).to match_array [work1.id, work2.id, work3.id]
       end
     end
   end

data/spec/features/batch_edit_spec.rb

@@ -14,7 +14,13 @@ describe 'Batch management of works', type: :feature do
     before do
       check 'check_all'
       click_on 'batch-edit'
-      fields.each { |f| fill_in_field_fill(f) }
+      fields.each do |f|
+        if f == "resource_type"
+          select_field(f, 'Book')
+        else
+          fill_in_field_fill(f)
+        end
+      end
       fields.each { |f| fill_in_field_save(f) }
       fields.each { |f| fill_in_field_wait(f) }
       work1.reload
@@ -32,6 +38,7 @@ describe 'Batch management of works', type: :feature do
       expect(work1.identifier).to eq ['NEW identifier']
       expect(work1.based_near).to eq ['NEW based_near']
       expect(work1.related_url).to eq ['NEW related_url']
+      expect(work1.resource_type).to eq ['Book']
       expect(work2.creator).to eq ['NEW creator']
       expect(work2.contributor).to eq ['NEW contributor']
       expect(work2.description).to eq ['NEW description']
@@ -43,6 +50,7 @@ describe 'Batch management of works', type: :feature do
       expect(work2.identifier).to eq ['NEW identifier']
       expect(work2.based_near).to eq ['NEW based_near']
       expect(work2.related_url).to eq ['NEW related_url']
+      expect(work2.resource_type).to eq ['Book']
 
       # Reload the form and verify
       visit '/dashboard/works'
@@ -71,6 +79,8 @@ describe 'Batch management of works', type: :feature do
       expect(page).to have_css "input#generic_work_based_near[value*='NEW based_near']"
       expand("related_url")
       expect(page).to have_css "input#generic_work_related_url[value*='NEW related_url']"
+      expand("resource_type")
+      expect(page).to have_select "generic_work_resource_type", selected: 'Book'
     end
   end
 
@@ -90,7 +100,7 @@ describe 'Batch management of works', type: :feature do
   def fields
     [
       "creator", "contributor", "description", "keyword", "publisher", "date_created",
-      "subject", "language", "identifier", "based_near", "related_url"
+      "subject", "language", "identifier", "based_near", "related_url", "resource_type"
     ]
   end
 
@@ -122,4 +132,9 @@ describe 'Batch management of works', type: :feature do
       link.click if link["class"].include?("collapsed")
     end
   end
+
+  def select_field(id, option)
+    expand(id)
+    select(option, from: "generic_work_#{id}")
+  end
 end

data/spec/forms/sufia/forms/batch_edit_form_spec.rb

@@ -13,6 +13,7 @@ describe Sufia::Forms::BatchEditForm do
                             :contributor,
                             :description,
                             :keyword,
+                            :resource_type,
                             :rights,
                             :publisher,
                             :date_created,
@@ -29,6 +30,7 @@ describe Sufia::Forms::BatchEditForm do
       expect(form.model.contributor).to eq ["contributor1", "contributor2"]
       expect(form.model.description).to eq ["description1", "description2"]
       expect(form.model.keyword).to eq ["abc", "123"]
+      expect(form.model.resource_type).to eq ["bar"]
       expect(form.model.rights).to eq ["rights1", "rights2"]
       expect(form.model.publisher).to eq ["Rand McNally"]
       expect(form.model.subject).to eq ["subject1", "subject2"]