hydra-collections 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5ab9c82d9c2b45b6c93d58bb9629d142104cb77
-  data.tar.gz: df870186ca05040cc5f4e07e38f29a03bcfb0900
+  metadata.gz: 7585019c90e5e1209d393c315e52f88b73169a95
+  data.tar.gz: 2655fad70f96136e738e3e11ffd81dcabb9ddfec
 SHA512:
-  metadata.gz: d04a46fe91e9f572556e689bf0a7c759d5466f91bbcc8df17aebd68d5489f58629f2e1eeb1d9fdae8742d6ea0e2e497a89d70f0ed72fed7f5b4735cd46c28b31
-  data.tar.gz: b18035284b01b0439912b716346eead6fdabbc6cad9aa8cec7d4ea2123c3c45f80d235ab9ad5b9cf25ba78fca2894b8b92c7843aba23e56ad420e84f81d0339d
+  metadata.gz: ac2cedd5a619df9ae770e8c1f3998dd36ce5ab8352be884d75e08512f8dc0649890625ad7f384f4d697d216cc7f77653ab9e8ce60002d83a991528326d2a776b
+  data.tar.gz: cee8d4465333e5378c95c1ff3575b996b8e843cc8a552f1d3d713be40f7a6963bf55d538a229958ff6b560ef4c433d3ca6ba45360f87e5ce33d407e1b0d402ec

data/.travis.yml

@@ -7,8 +7,8 @@ env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-  - "RAILS_VERSION=4.1.8"
-  - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=4.1.10"
+  - "RAILS_VERSION=4.2.1"
 notifications:
   email:
     recipients:
@@ -21,3 +21,5 @@ notifications:
       - "irc.freenode.org#projecthydra"
     template:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+before_script:
+  - jdk_switcher use oraclejdk8

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hydra-collections.gemspec
 gemspec
 
-gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
+gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
 
 group :development, :test do
   gem 'sqlite3'

data/app/controllers/concerns/hydra/collections/selects_collections.rb

@@ -11,16 +11,35 @@ module Hydra::Collections::SelectsCollections
     { read: [:read, :edit], edit: [:edit] }
   end
 
-  # add one of the following methods as a before filter on any page that shows the form_for_select_collection
+  ##
+  # Return list of collections for which the current user has read access.
+  # Add this or find_collections_with_edit_access as a before filter on any page that shows the form_for_select_collection
+  #
+  # @return [Array<SolrDocument>] Solr documents for each collection the user has read access
   def find_collections_with_read_access
     find_collections(:read)
   end
 
-  def find_collections_with_edit_access
+  ##
+  # Return list of collections for which the current user has edit access.  Optionally prepend with default
+  # that can be used in a select menu to instruct user to select a collection.
+  # Add this or find_collections_with_read_access as a before filter on any page that shows the form_for_select_collection
+  #
+  # @param [TrueClass|FalseClass] :include_default if true, prepends the default_option; otherwise, if false, returns only collections
+  # @param [Fixnum] :default_id for select menus, this is the id of the first selection representing the instructions
+  # @param [String] :default_title for select menus, this is the text displayed as the first item serving as instructions
+  #
+  # @return [Array<SolrDocument>] Solr documents for each collection the user has edit access, plus optional instructions
+  def find_collections_with_edit_access(include_default=false, default_id=-1, default_title="Select collection...")
     find_collections(:edit)
+    default_option = SolrDocument.new(id: default_id, title_tesim: default_title)
+    @user_collections.unshift(default_option) if include_default
   end
 
-  #
+  ##
+  # Return list of collections matching the passed in access_level for the current user.
+  # @param [Symbol] :access_level one of :read or :edit
+  # @return [Array<SolrDocument>] Solr documents for each collection the user has the appropriate access level
   def find_collections (access_level = nil)
     # need to know the user if there is an access level applied otherwise we are just doing public collections
     authenticate_user! unless access_level.blank?

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

@@ -172,7 +172,7 @@ module Hydra
 
     def add_members_to_collection collection = nil
       collection ||= @collection
-      collection.member_ids = batch.concat(collection.member_ids)
+      collection.add_members batch
     end
 
     def remove_members_from_collection

data/app/models/concerns/hydra/collection.rb

@@ -21,5 +21,9 @@ module Hydra
       member.update_index
     end
 
+    def add_members new_member_ids
+      return if new_member_ids.nil? || new_member_ids.size < 1
+      self.members << ActiveFedora::Base.find(new_member_ids)
+    end
  end
 end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "5.0.2"
+    VERSION = "5.0.3"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -72,7 +72,7 @@ describe CollectionsController, :type => :controller do
       @asset1 = ActiveFedora::Base.create!
       @asset2 = ActiveFedora::Base.create!
       post :create, batch_document_ids: [@asset1, @asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      expect(assigns[:collection].members).to eq([@asset1, @asset2])
+      expect(assigns[:collection].members).to match_array [@asset1, @asset2]
     end
     it "should call after_create" do
        expect(controller).to receive(:after_create).and_call_original
@@ -94,7 +94,7 @@ describe CollectionsController, :type => :controller do
       @asset1 = GenericFile.create!
       @asset2 = GenericFile.create!
       post :create, batch_document_ids: [@asset1,@asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      expect(assigns[:collection].members).to eq([@asset1,@asset2])
+      expect(assigns[:collection].members).to match_array [@asset1, @asset2]
       asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first

data/spec/controllers/selects_collections_spec.rb

@@ -91,6 +91,11 @@ describe SelectsCollectionsController, :type => :controller do
           subject.find_collections_with_edit_access
           expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
         end
+
+        it "should return only public or editable collections & instructions" do
+          subject.find_collections_with_edit_access(true)
+          expect(assigns[:user_collections].map(&:id)).to match_array [-1, @collection.id, @collection3.id]
+        end
       end
     end
   end

data/spec/lib/collectible_spec.rb

@@ -1,32 +1,39 @@
 require "spec_helper"
-class CollectibleThing < ActiveFedora::Base
-  include Hydra::Collections::Collectible
-end
 
 describe Hydra::Collections::Collectible do
   before do
-    @collection1 = FactoryGirl.create(:collection)
-    @collection2 = FactoryGirl.create(:collection)
-    @collectible = CollectibleThing.new
+    class CollectibleThing < ActiveFedora::Base
+      include Hydra::Collections::Collectible
+    end
   end
+
+  let(:collection1) { FactoryGirl.create(:collection) }
+  let(:collection2) { FactoryGirl.create(:collection) }
+  let(:collectible) { CollectibleThing.new }
+
+  after do
+    Object.send(:remove_const, :CollectibleThing)
+  end
+
   describe "collections associations" do
     it "should allow adding and removing" do
-      @collectible.save
-      @collection1.members << @collectible
-      @collection1.save
-      @collectible.collections << @collection2
-      reloaded = CollectibleThing.find(@collectible.id)
-      expect(@collection2.reload.members).to eq [@collectible]
-      expect(reloaded.collections).to eq [@collection1, @collection2]
+      collectible.save
+      collection1.members << collectible
+      collection1.save
+      collectible.collections << collection2
+      reloaded = CollectibleThing.find(collectible.id)
+      expect(collection2.reload.members).to eq [collectible]
+      expect(reloaded.collections).to eq [collection1, collection2]
     end
   end
+
   describe "index_collection_ids" do
     it "should add ids for all associated collections" do
-      @collectible.save
-      @collectible.collections << @collection1
-      @collectible.collections << @collection2
+      collectible.save
+      collectible.collections << collection1
+      collectible.collections << collection2
       expect(Deprecation).to receive(:warn)
-      expect(@collectible.index_collection_ids["collection_sim"]).to eq [@collection1.id, @collection2.id]
+      expect(collectible.index_collection_ids["collection_sim"]).to eq [collection1.id, collection2.id]
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -14,6 +14,7 @@ describe Collection, :type => :model do
 
   let(:gf1) { GenericFile.create }
   let(:gf2) { GenericFile.create }
+  let(:gf3) { GenericFile.create }
 
   let(:user) { @user }
 
@@ -71,7 +72,7 @@ describe Collection, :type => :model do
         subject { Collection.create(members: [gf1, gf2]) }
 
         it "should have many files" do
-          expect(subject.reload.members).to eq [gf1, gf2]
+          expect(subject.reload.members).to match_array [gf1, gf2]
         end
       end
 
@@ -84,7 +85,14 @@ describe Collection, :type => :model do
           subject.reload
           subject.members << gf2
           subject.save
-          expect(subject.reload.members).to eq [gf1, gf2]
+          expect(subject.reload.members).to match_array [gf1, gf2]
+        end
+
+        it "should allow multiple files to be added" do
+          subject.reload
+          subject.add_members [gf2.id, gf3.id]
+          subject.save
+          expect(subject.reload.members).to match_array [gf1, gf2, gf3]
         end
       end
     end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1 @@
-gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
+gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'

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

@@ -9,7 +9,7 @@ describe 'collections/_thumbnail_default.html.erb' do
   end
 
   before do
-    assign :response, double(:params => {})
+    assign :response, double(:params => {}, :start => 0)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:current_search_session).and_return nil

data/tasks/hydra-collections-dev.rake

@@ -3,8 +3,6 @@ require 'rspec/core/rake_task'
 require 'jettywrapper'
 require 'engine_cart/rake_task'
 
-Jettywrapper.hydra_jetty_version = "v8.1.0"
-
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--backtrace'] if ENV['CI']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections