sufia 7.0.0.beta2 → 7.0.0.beta3

data/spec/forms/sufia/collection_form_spec.rb

@@ -24,11 +24,15 @@ describe Sufia::Forms::CollectionForm do
   let(:collection) { build(:collection) }
   let(:form) { described_class.new(collection) }
 
-  describe "#rendered_terms" do
-    subject { form.rendered_terms }
+  describe "#primary_terms" do
+    subject { form.primary_terms }
+    it { is_expected.to eq([:title]) }
+  end
+
+  describe "#secondary_terms" do
+    subject { form.secondary_terms }
 
     it { is_expected.to eq [
-      :title,
       :creator,
       :contributor,
       :description,
@@ -44,4 +48,9 @@ describe Sufia::Forms::CollectionForm do
       :resource_type
     ] }
   end
+
+  describe "#id" do
+    subject { form.id }
+    it { is_expected.to be_nil }
+  end
 end

data/spec/models/ability_spec.rb

@@ -22,6 +22,7 @@ describe Sufia::Ability, type: :model do
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
+    it { is_expected.not_to be_able_to(:read, Sufia::Statistics) }
   end
 
   describe "a user in the admin group" do
@@ -33,6 +34,7 @@ describe Sufia::Ability, type: :model do
     it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
+    it { is_expected.to be_able_to(:read, Sufia::Statistics) }
   end
 
   describe "proxies and transfers" do

data/spec/models/featured_work_list_spec.rb

@@ -10,9 +10,9 @@ describe FeaturedWorkList, type: :model do
 
     it 'is a list of the featured work objects, each with the generic_work\'s solr_doc' do
       expect(subject.featured_works.size).to eq 2
-      solr_doc = subject.featured_works.first.generic_work_solr_document
-      expect(solr_doc).to be_kind_of SolrDocument
-      expect(solr_doc.id).to eq work1.id
+      presenter = subject.featured_works.first.presenter
+      expect(presenter).to be_kind_of Sufia::WorkShowPresenter
+      expect(presenter.id).to eq work1.id
     end
   end
 
@@ -25,9 +25,9 @@ describe FeaturedWorkList, type: :model do
 
     it 'is a list of the remaining featured work objects, each with the generic_work\'s solr_doc' do
       expect(subject.featured_works.size).to eq 1
-      solr_doc = subject.featured_works.first.generic_work_solr_document
-      expect(solr_doc).to be_kind_of SolrDocument
-      expect(solr_doc.id).to eq work2.id
+      presenter = subject.featured_works.first.presenter
+      expect(presenter).to be_kind_of Sufia::WorkShowPresenter
+      expect(presenter.id).to eq work2.id
     end
   end
 

data/spec/presenters/work_usage_spec.rb

@@ -127,7 +127,7 @@ describe WorkUsage, type: :model do
     let(:date_uploaded) { "2014-12-31" }
 
     let(:work_migrated) do
-      GenericWork.create(id: '6789', title: ['bilbo work 2']) do |work|
+      GenericWork.create(id: '678901234', title: ['bilbo work 2']) do |work|
         work.apply_depositor_metadata("gordonl")
         work.date_uploaded = date_uploaded
         work.save

data/spec/search_builder/sufia/my_shares_search_builder_spec.rb

@@ -8,11 +8,13 @@ describe Sufia::MySharesSearchBuilder do
                        current_user: me) }
   let(:builder) { described_class.new(scope) }
 
+  before { allow(builder).to receive(:gated_discovery_filters).and_return(["access_filter1", "access_filter2"]) }
+
   subject { builder.to_hash['fq'] }
 
   it "filters things we have access to in which we are not the depositor" do
-    expect(subject).to eq ["edit_access_group_ssim:public OR edit_access_group_ssim:registered OR edit_access_person_ssim:#{me.user_key}",
+    expect(subject).to eq ["access_filter1 OR access_filter2",
                            "{!terms f=has_model_ssim}GenericWork,Collection",
-                           "-_query_:\"{!field f=depositor_ssim}#{me.user_key}\""]
+                           "-_query_:\"{!field f=depositor_ssim}#{me.email}\""]
   end
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -13,7 +13,7 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def browse_everything_install
-    generate "browse_everything:install"
+    generate "browse_everything:install --skip-assets"
   end
 
   def banner

data/spec/views/_toolbar.html.erb_spec.rb

@@ -19,6 +19,17 @@ describe '/_toolbar.html.erb', type: :view do
     end
   end
 
+  context 'with an admin user' do
+    before do
+      allow(view).to receive(:can?).with(:manage, :all).and_return(true)
+    end
+
+    it 'shows the admin menu' do
+      render
+      expect(rendered).to have_link 'Admin', sufia.admin_stats_path
+    end
+  end
+
   it 'has dashboard links' do
     render
     expect(rendered).to have_link 'My Dashboard', sufia.dashboard_index_path

data/spec/views/collections/_form.html.erb_spec.rb

@@ -1,4 +1,3 @@
-
 describe 'collections/_form.html.erb' do
   let(:collection) { build(:collection) }
   let(:collection_form) { Sufia::Forms::CollectionForm.new(collection) }
@@ -12,6 +11,7 @@ describe 'collections/_form.html.erb' do
   it "draws the metadata fields for collection" do
     render
     expect(rendered).to have_selector("input#collection_title")
+    expect(rendered).to have_selector("span", text: "required")
     expect(rendered).to_not have_selector("div#additional_title.multi_value")
     expect(rendered).to have_selector("input#collection_creator.multi_value")
     expect(rendered).to have_selector("textarea#collection_description")

data/spec/views/collections/_show_document_list_menu.html.erb_spec.rb

@@ -2,13 +2,13 @@
 describe 'collections/_show_document_list_menu.html.erb', type: :view do
   context 'when user logged in displaying the collections of current user' do
     let(:user) { create :user }
-    let(:work) { build(:public_work, user: user, id: "1234") }
-    let(:collection) { build(:work, user: user) }
-
-    before { collection.members << work }
+    let(:document) { SolrDocument.new(id: '1234') }
+    before do
+      allow(document).to receive(:to_model).and_return(stub_model(GenericWork))
+    end
 
     it "displays the action list in individual work drop down" do
-      render(partial: 'collections/show_document_list_menu.html.erb', locals: { id: work.id, current_user: user })
+      render('collections/show_document_list_menu.html.erb', document: document, current_user: user)
       expect(rendered).to have_content 'Select an action'
       expect(rendered).not_to have_content 'Single-Use Link to File'
       expect(rendered).to have_content 'Edit'

data/spec/views/collections/edit.html.erb_spec.rb

@@ -0,0 +1,24 @@
+describe 'collections/edit.html.erb' do
+  let(:collection) { stub_model(Collection, id: 'xyz123z4', title: ["Make Collections Great Again"]) }
+  let(:form) { Sufia::Forms::CollectionForm.new(collection) }
+  let(:solr_response) { double(response: { 'numFound' => 0 }) }
+
+  before do
+    allow(view).to receive(:has_collection_search_parameters?).and_return(false)
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    assign(:collection, collection)
+    assign(:form, form)
+    assign(:response, solr_response)
+    stub_template 'collections/_search_form.html.erb' => 'search form'
+    stub_template 'my/_did_you_mean.html.erb' => 'did you mean'
+    stub_template 'collections/_sort_and_per_page.html.erb' => 'sort and per page'
+    stub_template 'collections/_document_list.html.erb' => 'document list'
+    stub_template 'collections/_paginate.html.erb' => 'paginate'
+    render
+  end
+
+  it 'displays the page' do
+    expect(rendered).to have_content 'Actions'
+    expect(rendered).to have_link 'Add works'
+  end
+end

data/spec/views/collections/show.html.erb_spec.rb

@@ -0,0 +1,32 @@
+describe 'collections/show.html.erb' do
+  let(:document) { SolrDocument.new(id: 'xyz123z4',
+                                    'title_tesim' => ['Make Collections Great Again']) }
+  let(:ability) { double }
+  let(:presenter) { Sufia::CollectionPresenter.new(document, ability) }
+  let(:blacklight_config) { CatalogController.blacklight_config }
+  let(:blacklight_configuration_context) do
+    Blacklight::Configuration::Context.new(controller)
+  end
+
+  before do
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_configuration_context).and_return(blacklight_configuration_context)
+    allow(document).to receive(:hydra_model).and_return(::Collection)
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    allow(view).to receive(:can?).with(:edit, document).and_return(true)
+    allow(view).to receive(:can?).with(:destroy, document).and_return(true)
+    assign(:presenter, presenter)
+    stub_template '_search_form.html.erb' => 'search form'
+    stub_template 'collections/_sort_and_per_page.html.erb' => 'sort and per page'
+    stub_template 'collections/_document_list.html.erb' => 'document list'
+    stub_template 'collections/_paginate.html.erb' => 'paginate'
+    render
+  end
+
+  it 'draws the page' do
+    expect(rendered).to have_selector 'h2', text: 'Actions'
+    expect(rendered).to have_link 'Edit'
+    expect(rendered).to have_link 'Delete'
+    expect(rendered).to have_link 'Add works'
+  end
+end

data/spec/views/curation_concerns/base/_form.html.erb_spec.rb

@@ -16,6 +16,8 @@ describe 'curation_concerns/base/_form.html.erb' do
     allow(view).to receive(:curation_concern).and_return(work)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     assign(:form, form)
+    controller.stub(:controller_name).and_return('batch_uploads')
+    controller.stub(:action_name).and_return('new')
   end
 
   let(:page) do

data/spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb

@@ -1,15 +1,8 @@
 require 'spec_helper'
 
 describe 'curation_concerns/permissions/confirm.html.erb', :no_clean do
-  class MockCurationConcern
-    attr_reader :human_readable_type, :visibility
-    def initialize
-      @human_readable_type = "GenericWork"
-      @visibility = "public"
-    end
-  end
+  let(:curation_concern) { stub_model(GenericWork) }
 
-  let!(:curation_concern) { MockCurationConcern.new }
   before do
     allow(view).to receive(:curation_concern).and_return(curation_concern)
   end

data/spec/views/my/_list_collections.html.erb_spec.rb

@@ -0,0 +1,37 @@
+describe 'my/_index_partials/_list_collections.html.erb' do
+  let(:id) { "3197z511f" }
+  let(:attributes) do
+    {
+      id: id,
+      "has_model_ssim" => ["Collection"],
+      "title_tesim" => ["Collection Title"],
+      "description_tesim" => ["Collection Description"]
+    }
+  end
+
+  let(:doc) { SolrDocument.new(attributes) }
+  let(:collection) { mock_model(Collection) }
+  let(:config) { My::WorksController.blacklight_config }
+  let(:blacklight_configuration_context) do
+    Blacklight::Configuration::Context.new(controller)
+  end
+
+  before do
+    allow(view).to receive(:current_user).and_return(stub_model(User))
+    allow(view).to receive(:blacklight_config) { config }
+    allow(view).to receive(:blacklight_configuration_context).and_return(blacklight_configuration_context)
+    allow(doc).to receive(:to_model).and_return(stub_model(Collection, id: id))
+    view.lookup_context.prefixes.push 'my'
+
+    render 'my/_index_partials/list_collections', document: doc
+  end
+
+  it 'the line item displays the work and its actions' do
+    expect(rendered).to have_selector("tr#document_#{id}")
+    expect(rendered).to have_link 'Collection Title', href: collection_path(id)
+    expect(rendered).to have_link 'Edit Collection', href: edit_collection_path(id)
+    expect(rendered).to have_link 'Delete Collection', href: collection_path(id)
+    expect(rendered).to have_css 'a.visibility-link', text: 'Private'
+    expect(rendered).to have_selector '.expanded-details dd', text: 'Collection Description'
+  end
+end

data/spec/views/my/_list_works.html.erb_spec.rb

@@ -1,4 +1,3 @@
-
 describe 'my/_index_partials/_list_works.html.erb' do
   let(:id) { "3197z511f" }
   let(:work_data) do
@@ -18,6 +17,7 @@ describe 'my/_index_partials/_list_works.html.erb' do
   end
 
   before do
+    allow(doc).to receive(:to_model).and_return(stub_model(GenericWork, id: id))
     allow(view).to receive(:current_user).and_return(stub_model(User))
     allow(view).to receive(:render_collection_links).with(doc).and_return("<a href=\"collection/1\">Collection Title</a>".html_safe)
     allow(view).to receive(:render_visibility_link).with(doc).and_return("<a class=\"visibility-link\">Private</a>".html_safe)

data/spec/views/sufia/batch_uploads/_form.html.erb_spec.rb

@@ -13,6 +13,8 @@ describe 'sufia/batch_uploads/_form.html.erb' do
     allow(view).to receive(:curation_concern).and_return(work)
     allow(controller).to receive(:current_user).and_return(user)
     assign(:form, form)
+    controller.stub(:controller_name).and_return('batch_uploads')
+    controller.stub(:action_name).and_return('new')
   end
 
   let(:page) do

data/sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '>= 1.0.0.beta8', '< 2'
+  spec.add_dependency 'curation_concerns', '>= 1.0.0.beta9', '< 2'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'
   spec.add_dependency 'browse-everything', '~> 0.10'
   spec.add_dependency 'blacklight-gallery', '~> 0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta2
+  version: 7.0.0.beta3
 platform: ruby
 authors:
 - Justin Coyne
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta8
+        version: 1.0.0.beta9
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta8
+        version: 1.0.0.beta9
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -908,6 +908,7 @@ files:
 - app/views/_masthead.html.erb
 - app/views/_toolbar.html.erb
 - app/views/_user_util_links.html.erb
+- app/views/admin/_menu.html.erb
 - app/views/admin/stats/_date_form.html.erb
 - app/views/admin/stats/_deposits.html.erb
 - app/views/admin/stats/_new_users.html.erb
@@ -1138,7 +1139,6 @@ files:
 - config/locales/sufia.en.yml
 - config/routes.rb
 - lib/generators/sufia/abstract_migration_generator.rb
-- lib/generators/sufia/admin_stat_generator.rb
 - lib/generators/sufia/arkivo_api_generator.rb
 - lib/generators/sufia/assets_generator.rb
 - lib/generators/sufia/cached_stats_generator.rb
@@ -1187,7 +1187,6 @@ files:
 - lib/generators/sufia/templates/migrations/create_user_stats.rb
 - lib/generators/sufia/templates/migrations/create_work_view_stats.rb
 - lib/generators/sufia/templates/sufia.scss
-- lib/generators/sufia/templates/sufia/stats_admin.rb
 - lib/generators/sufia/templates/sufia_helper.rb
 - lib/generators/sufia/upgrade700_generator.rb
 - lib/generators/sufia/usagestats_generator.rb
@@ -1440,6 +1439,8 @@ files:
 - spec/views/collections/_show_document_list.html.erb_spec.rb
 - spec/views/collections/_show_document_list_menu.html.erb_spec.rb
 - spec/views/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/collections/edit.html.erb_spec.rb
+- spec/views/collections/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
@@ -1457,6 +1458,7 @@ files:
 - spec/views/homepage/_announcement.html.erb_spec.rb
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
+- spec/views/my/_list_collections.html.erb_spec.rb
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb
@@ -1733,6 +1735,8 @@ test_files:
 - spec/views/collections/_show_document_list.html.erb_spec.rb
 - spec/views/collections/_show_document_list_menu.html.erb_spec.rb
 - spec/views/collections/_show_document_list_row.html.erb_spec.rb
+- spec/views/collections/edit.html.erb_spec.rb
+- spec/views/collections/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
@@ -1750,6 +1754,7 @@ test_files:
 - spec/views/homepage/_announcement.html.erb_spec.rb
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
+- spec/views/my/_list_collections.html.erb_spec.rb
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb

data/lib/generators/sufia/admin_stat_generator.rb

@@ -1,14 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-
-class Sufia::AdminStatGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-
-  desc """
-This is a generator for adding Admin Stats into sufia
-       """
-
-  def insert_stats_admin
-    copy_file 'sufia/stats_admin.rb', 'config/initializers/stats_admin.rb'
-  end
-end

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

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-module Sufia
-  class StatsAdmin
-    def self.matches?(request)
-      current_user = request.env['warden'].user
-      return false if current_user.blank?
-      current_user.groups.include? 'admin'
-    end
-  end
-end