sufia 4.3.1 → 5.0.0.rc1

data/spec/features/collection_spec.rb

@@ -5,6 +5,13 @@ describe 'collection', :type => :feature do
     visit '/dashboard'
     first('#hydra-collection-add').click
     expect(page).to have_content 'Create New Collection'
+
+    # Creator is a multi-value field, so it should have button to add more fields
+    expect(page).to have_selector "div.collection_creator .input-append button.add"
+
+    # Title is a single-value field, so it should not have the adder button
+    expect(page).to_not have_selector "div.collection_title .input-append button.add"
+
     fill_in('Title', with: title)
     fill_in('Abstract or Summary', with: description)
     click_button("Create Collection")

data/spec/helpers/records_helper_spec.rb

@@ -1,19 +1,6 @@
 require 'spec_helper'
 
 describe RecordsHelper, :type => :helper do
-  let(:adder) {
-    "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-plus\"></i></span><span class=\"sr-only\">add another test</span></button>"
-  }
-  let(:remover) {
-    "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-remove\"></i></span><span class=\"sr-only\">add another test</span></button>"    
-  }
-  it "draws add button" do
-    expect(helper.add_field(:test)).to eql(adder)
-  end
-
-  it "draws subtract button" do
-    expect(helper.subtract_field(:test)).to eql(remover)
-  end
 
   it "draws help_icon" do
     str = String.new(helper.help_icon(:tag))

data/spec/lib/sufia/breadcrumbs_spec.rb

@@ -54,25 +54,63 @@ describe Sufia::Breadcrumbs do
         expect(crumbs.trail_from_referer).to eql([[I18n.t('sufia.bread_crumb.search_results'), referer]])
       end
     end
-    context "when coming from the dashboard" do
+    context "when coming places other than the catalog" do
       before do
-        allow(crumbs.request).to receive(:referer).and_return("http://...dashboard/")
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
         allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("view")
       end
       specify "the trail goes back to the user's files" do
         allow(crumbs).to receive(:controller_name).and_return("my/files")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
       end
       specify "the trail goes back to the user's collections" do
         allow(crumbs).to receive(:controller_name).and_return("my/collections")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
       end
       specify "the trail goes back to the user's files when on the batch edit page" do
         allow(crumbs).to receive(:controller_name).and_return("batch_edit")
-        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+      end
+    end
+
+    context "when editing a file" do
+      before do
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
+        allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("edit")
+        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:controller_name).and_return("generic_files")
+      end
+
+      specify "the trail goes back to the user's files and the browse view" do
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
+      end
+    end
+
+    context "when viewing file statistics" do
+      before do
+        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
+        allow(crumbs).to receive(:user_signed_in?) { true }
+        allow(crumbs).to receive(:action_name).and_return("stats")
+        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:controller_name).and_return("generic_files")
+      end
+
+      specify "the trail goes back to the user's files and the browse view" do
+        crumbs.trail_from_referer
+        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
       end
     end
   end

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

@@ -14,9 +14,7 @@ describe 'collections/_form.html.erb', :type => :view do
     it "should draw the metadata fields for collection" do
       render
       expect(rendered).to have_selector("input#collection_title", count: 1)
-      expect(rendered).to_not have_selector("div#additional_title_clone button.adder")
       expect(rendered).to have_selector("input#collection_creator", count: 1)
-      expect(rendered).to have_selector("div#additional_creator_clone button.adder")
       expect(rendered).to have_selector("textarea#collection_description", count: 1)
       expect(rendered).to have_selector("input#collection_contributor", count: 1)
       expect(rendered).to have_selector("input#collection_tag", count: 1)

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -54,6 +54,11 @@ module Sufia::User
     { id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key }
   end
 
+  # Populate user instance with attributes from remote system (e.g., LDAP)
+  # There is no default implementation -- override this in your application
+  def populate_attributes
+  end
+
   def email_address
     self.email
   end

data/sufia-models/lib/sufia/models/stats/user_stat_importer.rb

@@ -12,11 +12,11 @@ module Sufia
         start_date = date_since_last_cache(user)
 
         stats = {}
-        files_for_user(user).each do |file|
-          view_stats = FileViewStat.statistics(file.id, start_date, user.id)
+        file_ids_for_user(user).each do |file_id|
+          view_stats = FileViewStat.statistics(file_id, start_date, user.id)
           stats = tally_results(view_stats, :views, stats)
 
-          dl_stats = FileDownloadStat.statistics(file.id, start_date, user.id)
+          dl_stats = FileDownloadStat.statistics(file_id, start_date, user.id)
           stats = tally_results(dl_stats, :downloads, stats)
         end
 
@@ -38,8 +38,12 @@ private
       end
     end
 
-    def files_for_user(user)
-      ::GenericFile.where(Solrizer.solr_name('depositor', :symbol) => user.user_key)
+    def file_ids_for_user(user)
+      ids = []
+      ::GenericFile.find_in_batches("#{Solrizer.solr_name('depositor', :symbol)}:\"#{user.user_key}\"", fl:"id") do |group|
+        ids.concat group.map { |doc| doc["id"] }
+      end
+      ids
     end
 
     # For each date, add the view and download counts for this

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.3.1"
+    VERSION = "5.0.0.rc1"
   end
 end

data/sufia.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'font-awesome-rails'
   gem.add_dependency 'hydra-editor', '~> 0.3'
   gem.add_dependency 'hydra-collections', '~> 2.0'
+  gem.add_dependency 'simple_form', '~> 3.1.0'
   gem.add_dependency 'bootstrap_form', '~> 2.1'
   gem.add_dependency 'blacklight-gallery'
   gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 5.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 5.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -424,7 +438,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - History.md
-- LICENSE.md
+- LICENSE
 - README.md
 - RELEASING.md
 - Rakefile
@@ -502,7 +516,7 @@ files:
 - app/assets/javascripts/sufia/featured_works.js
 - app/assets/javascripts/sufia/fileupload.js
 - app/assets/javascripts/sufia/ga_events.js
-- app/assets/javascripts/sufia/multiForm.js
+- app/assets/javascripts/sufia/manage_repeating_fields.js
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/proxy_rights.js
 - app/assets/javascripts/sufia/search.js
@@ -533,6 +547,7 @@ files:
 - app/assets/stylesheets/sufia/_file-listing.scss
 - app/assets/stylesheets/sufia/_header.scss
 - app/assets/stylesheets/sufia/_home-page.scss
+- app/assets/stylesheets/sufia/_multi_value_fields.css.scss
 - app/assets/stylesheets/sufia/_proxy-rights.scss
 - app/assets/stylesheets/sufia/_settings.scss
 - app/assets/stylesheets/sufia/_styles.scss
@@ -594,6 +609,7 @@ files:
 - app/helpers/sufia/records_helper_behavior.rb
 - app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
+- app/inputs/multi_value_input.rb
 - app/jobs/content_delete_event_job.rb
 - app/jobs/content_deposit_event_job.rb
 - app/jobs/content_depositor_change_event_job.rb
@@ -774,6 +790,7 @@ files:
 - app/views/my/index.html.erb
 - app/views/pages/show.html.erb
 - app/views/records/_edit_field.html.erb
+- app/views/records/_rights_modal.html.erb
 - app/views/records/edit_fields/_default.html.erb
 - app/views/records/edit_fields/_description.html.erb
 - app/views/records/edit_fields/_resource_type.html.erb
@@ -831,8 +848,11 @@ files:
 - app/views/users/notifications_number.js.erb
 - app/views/users/show.html.erb
 - bin/audit_repository
+- config/initializers/simple_form.rb
+- config/initializers/simple_form_bootstrap.rb
 - config/initializers/sufia_events.rb
 - config/jetty.yml
+- config/locales/simple_form.en.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
 - db/data.yml
@@ -1210,12 +1230,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University

data/LICENSE.md

@@ -1,14 +0,0 @@
-Copyright 2012 Penn State University  
-Additional copyright may be held by others, as reflected in the commit history.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

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

@@ -1,67 +0,0 @@
-(function( $ ){
-
-  $.fn.multiForm = function( options ) {  
-
-    // Create some defaults, extending them with any options that were provided
-    var settings = $.extend( { }, options);
-
-    function addField() {
-      count = $(this).closest('.form-group').find('input').size();
-      var cloneId = this.id.replace("submit", "clone");
-      var newId = this.id.replace("submit", "elements");
-      var cloneElem = $('#'+cloneId).clone();
-      // change the add button to a remove button
-      var plusbttn = cloneElem.find('#'+this.id);
-      var sr_hidden = '<span aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></span>';
-      var sr_only = '<span class="sr-only">remove this ' + this.name.replace("_", " ") + '</span>';
-      var remove_button = sr_hidden + sr_only; 
-      plusbttn.html(remove_button);
-      plusbttn.on('click',removeField);
-
-
-      // remove the help tag on subsequent added fields
-      cloneElem.find('.formHelp').remove();
-      cloneElem.find('.modal-div').remove();
-
-      //clear out the value for the element being appended
-      //so the new element has a blank value
-      // Note: there may be more than one input field. Example:
-      //   creator_name
-      //   creator_role
-      textFields = cloneElem.find('input[type=text]')
-      $.each(textFields, function(n, tf) {
-        newName = $(tf).attr('name').replace('[0]', '['+count+']');
-        $(tf).attr('name', newName).val('').attr("required", false)
-      })
-
-      if (settings.afterAdd) {
-        settings.afterAdd(this, cloneElem)
-      }
-
-      $('#'+newId).append(cloneElem);
-      cloneElem.find('input[type=text]').focus();
-      return false;
-    }
-
-    function removeField () {
-      // get parent and remove it
-      $(this).parent().remove();
-      return false;
-    }
-
-    return this.each(function() {        
-
-      // Tooltip plugin code here
-      /*
-       * adds additional metadata elements
-       */
-      $('.adder', this).click(addField);
-
-      $('.remover', this).click(removeField);
-
-
-    });
-
-  };
-})( jQuery );  
-