sufia 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8a1fa7fdbec5a9eaa73924bdb9c7adf05d4719
-  data.tar.gz: d557d8cd73484d6fd5ea8f15e167073bb02bb668
+  metadata.gz: 3e188dc963a308bd78feb2a92a99548eb2b641d6
+  data.tar.gz: a5e2f06bbe6f5d816541b523f8346448958b00c2
 SHA512:
-  metadata.gz: 001e60eba3c4768f171c4ae0d1771c1bba5d2fa9deac895d107ca6a0fa85b7cbb1e084e6fee1e21fd976da8b7f853b3ba2f8bee29ab49482298c94f77cc09766
-  data.tar.gz: e0f21e08e467500f4c9fa2579e14004abd2964ebc3b403651cf27c9141cd18080e1d6f2c7fa407aa18daaaeccbd8323937ecee27e97664e9edadfbd9c9acf8d7
+  metadata.gz: ee2f8d43dd936f3fe4586da46a0de8215f4abcac9f93728c5f7ea88fcde725d0aa12810bbe20b008dcc2212a7d038af3b0ac61be8d9c28997fabb30f17dac517
+  data.tar.gz: 6ed19074ad147367a53b8d5a15d39ecab27aea1b2d2146dd71db9dceeaa1895cfccbc1e4e1281e35f04807fc591f31abf513ad32d8f2d7229e97450048f6a389

data/.gitignore

@@ -62,6 +62,7 @@ db/*.sqlite3
 db/*.sqlite3-journal
 log/*.log
 tmp
+.byebug_history
 
 *.sqlite3
 *.log

data/History.md

@@ -1,5 +1,12 @@
 # History of Sufia releases
 
+## 6.5.0
+* Remove unnecessary require [Justin Coyne]
+* Option to show collection facet in Dashboard and search results [E. Lynette Rayle]
+* Remove space after icon if no text is present, fix projecthydra/sufia#1354 [Anna Headley]
+* Ignore byebug history file [Adam Wead]
+* Ignore visibility of files[] input, it's hidden from Capybara [Adam Wead]
+
 ## 6.4.0
 
 * Remove deprecation warnings [Adam Wead]

data/README.md

@@ -90,7 +90,7 @@ If you have questions or need help, please email [the Hydra community tech list]
 # Creating a Sufia-based app
 
 This document contains instructions specific to setting up an app with __Sufia
-v6.4.0__. If you are looking for instructions on installing a different
+v6.5.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -142,7 +142,7 @@ rails new my_app
 Add the following lines to your application's Gemfile.
 
 ```
-gem 'sufia', '6.4.0'
+gem 'sufia', '6.5.0'
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 

data/SUFIA_VERSION

@@ -1 +1 @@
-6.4.0
+6.5.0

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

@@ -30,6 +30,16 @@ module Sufia
       presenter
     end
 
+    def create
+      super
+      update_members_indices
+    end
+
+    def update
+      super
+      update_members_indices
+    end
+
     protected
 
       def presenter
@@ -77,5 +87,12 @@ module Sufia
       def _prefixes
         @_prefixes ||= super + ['catalog']
       end
+
+      def update_members_indices
+        return if Sufia.config.collection_facet.nil?
+        Array(params[:batch_document_ids]).each do |gf|
+          Sufia.queue.push(ResolrizeGenericFileJob.new(gf))
+        end
+      end
   end
 end

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

@@ -1,5 +1,3 @@
-require 'blacklight/catalog'
-
 module Sufia
   module MyControllerBehavior
     extend ActiveSupport::Concern

data/app/helpers/facets_helper.rb

@@ -0,0 +1,13 @@
+module FacetsHelper
+  include Blacklight::FacetsHelperBehavior
+
+  def display_collection_facet
+    if Sufia.config.collection_facet == :public
+      true
+    elsif Sufia.config.collection_facet == :user && current_user
+      true
+    else
+      false
+    end
+  end
+end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -114,8 +114,10 @@ module Sufia
     end
 
     def iconify_auto_link(text, showLink = true)
+      # this block is only executed when a link is inserted;
+      # if we pass text containing no links, it just returns text.
       auto_link(text) do |value|
-        "<i class='glyphicon glyphicon-new-window'></i>&nbsp;#{value if showLink}<br />"
+        "<i class='glyphicon glyphicon-new-window'></i>#{('&nbsp;' + value) if showLink}<br />"
       end
     end
 

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

@@ -57,6 +57,7 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name("based_near", :facetable), label: "Location", limit: 5
     config.add_facet_field solr_name("publisher", :facetable), label: "Publisher", limit: 5
     config.add_facet_field solr_name("file_format", :facetable), label: "File Format", limit: 5
+    config.add_facet_field solr_name("collection", :facetable), label: "Collection", helper_method: :collection_name, limit: 5, show: :display_collection_facet
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.4.0"
+  VERSION = "6.5.0"
 end

data/spec/features/collection_facet_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe "Collection Facet", type: :feature do
+  def visit_dashboard_my_files
+    visit '/dashboard/files'
+    expect(page.title).to eq 'Files listing'
+    expect(page).to have_link('My Files')
+    expect(page).to have_link('My Collections')
+    expect(page).to have_link('Fake PDF Title')
+    expect(page).to have_css('h3', text: 'Filter your files')
+  end
+
+  def search_for_files
+    visit '/'
+    fill_in('search-field-header', with: 'pdf')
+    click_button('search-submit-header')
+    expect(page.title).to eq 'Keyword: pdf - Blacklight Search Results'
+    expect(page).to have_link('Fake PDF Title')
+    expect(page).to have_css('h4', text: 'Limit your search')
+  end
+
+  def facet?(page)
+    f = page.all('a', text: /\ACollection\z/)
+    return true if f.size == 1
+    false
+  end
+
+  let(:auser) { FactoryGirl.create(:curator) }
+
+  let!(:fixtures) do
+    create_file_fixtures(auser.user_key, [:public_pdf]) do |f|
+      f.tag = ['pdf']
+      f.apply_depositor_metadata(auser.user_key)
+    end
+  end
+
+  let(:collection1) do
+    Collection.create(title: 'Test Collection 1', description: 'Description for collection 1',
+                      members: []) { |c| c.apply_depositor_metadata(auser.user_key) }
+  end
+
+  context "with collection having a member" do
+    before do
+      Sufia.config.collection_facet = :public
+      collection1.add_members([fixtures[0].id])
+      collection1.save
+      fixtures[0].update_index
+    end
+
+    context "and collection_facet config == :user" do
+      before do
+        Sufia.config.collection_facet = :user
+      end
+
+      it "shows collection facet in Dashboard -> My Files" do
+        login_as auser
+        visit_dashboard_my_files
+        expect(facet?(page)).to eq true
+      end
+
+      it "does show collection facet in pubic search with user logged in" do
+        login_as auser
+        search_for_files
+        expect(facet?(page)).to eq true
+      end
+
+      it "does NOT show collection facet in pubic search with user NOT logged in" do
+        search_for_files
+        expect(facet?(page)).to eq false
+      end
+    end
+
+    context "and collection_facet config == :public" do
+      before do
+        Sufia.config.collection_facet = :public
+      end
+
+      it "shows collection facet in Dashboard -> My Files" do
+        login_as auser
+        visit_dashboard_my_files
+        expect(facet?(page)).to eq true
+      end
+
+      it "shows collection facet in pubic search with user logged in" do
+        login_as auser
+        search_for_files
+        expect(facet?(page)).to eq true
+      end
+
+      it "shows collection facet in pubic search with user NOT logged in" do
+        search_for_files
+        expect(facet?(page)).to eq true
+      end
+    end
+
+    context "and collection_facet config == nil" do
+      before do
+        Sufia.config.collection_facet = nil
+      end
+
+      it "does NOT show collection facet in Dashboard -> My Files" do
+        login_as auser
+        visit_dashboard_my_files
+        expect(facet?(page)).to eq false
+      end
+
+      it "does NOT show collection facet in pubic search with user logged in" do
+        login_as auser
+        search_for_files
+        expect(facet?(page)).to eq false
+      end
+
+      it "does NOT show collection facet in pubic search with user NOT logged in" do
+        search_for_files
+        expect(facet?(page)).to eq false
+      end
+    end
+  end
+end

data/spec/features/ingest_upload_files_spec.rb

@@ -15,8 +15,8 @@ describe "Uploading files via web form", type: :feature do
 
   context "the terms of service", :js do
     it "is required to be checked" do
-      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/image.jp2")
-      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/jp2_fits.xml")
+      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/image.jp2", visible: false)
+      attach_file("files[]", File.dirname(__FILE__) + "/../../spec/fixtures/jp2_fits.xml", visible: false)
       expect(page).to have_css("button#main_upload_start[disabled]")
       find('#main_upload_start_span').hover
       expect(page).to have_content "Please accept Deposit Agreement before you can upload."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-10 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.4.0
+        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -657,6 +657,7 @@ files:
 - app/helpers/contact_form_helper.rb
 - app/helpers/content_block_helper.rb
 - app/helpers/dashboard_helper.rb
+- app/helpers/facets_helper.rb
 - app/helpers/generic_file_helper.rb
 - app/helpers/sufia/blacklight_override.rb
 - app/helpers/sufia/dashboard_helper_behavior.rb
@@ -1006,6 +1007,7 @@ files:
 - spec/features/browse_files_spec.rb
 - spec/features/catalog_search_spec.rb
 - spec/features/cloud_upload_spec.rb
+- spec/features/collection_facet_spec.rb
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb
@@ -1243,7 +1245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1291,6 +1293,7 @@ test_files:
 - spec/features/browse_files_spec.rb
 - spec/features/catalog_search_spec.rb
 - spec/features/cloud_upload_spec.rb
+- spec/features/collection_facet_spec.rb
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb