hydra-collections 6.0.0.rc1 → 6.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f660059815d3e4687d927cbfebc290aa43b1c029
-  data.tar.gz: 3eec16c408c10c7f08d9f4c77a52ec6ea9555619
+  metadata.gz: 70208265112262f5fb9156ac22eddc1cb7566e45
+  data.tar.gz: 033f7fbf3ad9571401b8ad2d74a22d9c36b26018
 SHA512:
-  metadata.gz: 61d400608b2fb3b865dfbee6c14d73d39f5aa70172bd5d88c9ab379207798f36065bf22d9d1a08fc2ec85ff61a3ed92ca7793b26cbf7b5b112e9c355162e75c6
-  data.tar.gz: e4f3c3ef0120f0734ab46fc6d76f67767f6b2965235cca7f3008635ef2b73043fb8dd961e17dadf72002db15dd6b5d47018a153dedca079158608bb3231bb5cf
+  metadata.gz: 7ee7153015e13dd46a7f23ea9e45183bc9a3608f58691617f9a2199e285aec2010c1cbeb16611878853c3d90adc98a671db0906b94a0b6549a5cd8f175cf35b7
+  data.tar.gz: b43ab33b68eb9ee9b55374ffcbb78a049ee641027ce6d01c230f60b3900277e2ee80c56390bab45a64a377448ac7d2277beae3fa81b4d2b46b222b06c61915f7

data/.gitignore

@@ -18,5 +18,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-spec/internal
+.internal_test_app
 jetty

data/.travis.yml

@@ -2,13 +2,12 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1
+  - 2.2
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-  - "RAILS_VERSION=4.1.10"
-  - "RAILS_VERSION=4.2.1"
+  - "RAILS_VERSION=4.2.5"
 notifications:
   email:
     recipients:

data/Gemfile

@@ -14,22 +14,28 @@ group :development, :test do
   gem 'rspec-activemodel-mocks'
 end
 
-gem 'slop', '~> 3.6' # because rails installs byebug in the Gemfile
-
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.0
+# engine_cart stanza: 0.8.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
 else
-  extra_file = File.expand_path("../spec/test_app_templates/Gemfile.extra", __FILE__)
-  instance_eval File.read(extra_file)
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] !~ /^4.2/
-    gem 'sass-rails', "< 5.0"
-  else
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
+  else
+    gem 'sass-rails', "< 5.0"
   end
 end
+# END ENGINE_CART BLOCK

data/README.md

@@ -2,6 +2,10 @@
 
 Add collections to your Hydra application.  These collections are typically created by depositors (instead of librarians or curators).  Any collectible item can belong to many different collections.  The collection does not confer access rights onto any of the members of the collections.
 
+## CAVEAT (READ THIS)
+
+If you do **not** require PCDM, or do not know what PCDM is, please disregard this README (which is for a release candidate version of Hydra::Collections that relies upon a new stack of gems in support of PCDM) and use [Hydra::Collections' latest stable branch README](https://github.com/projecthydra/hydra-collections/blob/5.0-stable/README.md) instead.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -35,16 +39,16 @@ Or install it yourself as:
 
 ### Make your Models Collectible
 
-Add `include Hydra::Works::GenericWorkBehavior` to the models for anything that you want to be able to add to collections (ie. GenericFile, Book, Article, etc.).
+Add `include Hydra::Works::WorkBehavior` to the models for anything that you want to be able to add to collections (ie. GenericFile, Book, Article, etc.).
 
 Example:
 ```ruby
 class GenericFile < ActiveFedora::Base
-  include Hydra::Works::GenericWorkBehavior
+  include Hydra::Works::WorkBehavior
 end
 ```
 
-Any items that include the `Hydra::Works::GenericWorkBehavior` module can look up which collections they belong to via `.in_collections`.
+Any items that include the `Hydra::Works::WorkBehavior` module can look up which collections they belong to via `.in_collections`.
 
 ### Make your Controller Accept a Batch
 

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

@@ -57,7 +57,7 @@ module Hydra::Collections::SelectsCollections
   end
 
   def collections_search_builder(access_level = nil)
-    @collections_search_builder ||= collections_search_builder_class.new(collection_search_params_logic, self).tap do |builder|
+    collections_search_builder_class.new(collection_search_params_logic, self).tap do |builder|
       builder.current_ability = current_ability
       builder.discovery_perms = access_levels[access_level] if access_level
     end

data/app/helpers/collections_helper.rb

@@ -1,54 +1,50 @@
 # View Helpers for Hydra Collections functionality
-module CollectionsHelper 
-  
- 
+module CollectionsHelper
   # Displays the Collections create collection button.  Put this in your search result page template.  We recommend putting it in catalog/_sort_and_per_page.html.erb
   def button_for_create_collection(label = 'Create Collection')
-    render partial:'/collections/button_create_collection', locals:{label:label}
+    render '/collections/button_create_collection', label: label
   end
 
   # Displays the Collections update collection button.  Put this in your search result page template.  We recommend putting it in catalog/_sort_and_per_page.html.erb
-  def button_for_update_collection(label = 'Update Collection', collection_id = 'collection_replace_id' )
-    render partial:'/collections/button_for_update_collection', locals:{label:label, collection_id:collection_id}
+  def button_for_update_collection(label = 'Update Collection', collection_id = 'collection_replace_id')
+    render '/collections/button_for_update_collection', label: label, collection_id: collection_id
   end
-  
+
   # Displays the Collections delete collection button.  Put this in your search result page for each collection found.
-  def button_for_delete_collection(collection, label = 'Delete Collection', confirm = 'Are you sure?') 
-    render partial:'/collections/button_for_delete_collection', locals:{collection:collection,label:label, confirm:confirm}
+  def button_for_delete_collection(collection, label = 'Delete Collection', confirm = 'Are you sure?')
+    render '/collections/button_for_delete_collection', collection: collection, label: label, confirm: confirm
   end
 
   def button_for_remove_from_collection(document, label = 'Remove From Collection')
-    render partial:'/collections/button_remove_from_collection', locals:{label:label, document:document}
+    render '/collections/button_remove_from_collection', label: label, document: document
   end
 
   def button_for_remove_selected_from_collection(collection, label = 'Remove From Collection')
-    render partial:'/collections/button_for_remove_selected_from_collection', locals:{collection:collection, label:label}
+    render '/collections/button_for_remove_selected_from_collection', collection: collection, label: label
   end
 
-
   # add hidden fields to a form for removing a single document from a collection
   def single_item_action_remove_form_fields(form, document)
-    single_item_action_form_fields(form, document, "remove")
+    single_item_action_form_fields(form, document, 'remove')
   end
-  
+
   # add hidden fields to a form for adding a single document to a collection
   def single_item_action_add_form_fields(form, document)
-    single_item_action_form_fields(form, document, "add")
+    single_item_action_form_fields(form, document, 'add')
   end
 
-  # add hidden fields to a form for performing an action on a single document on a collection      
+  # add hidden fields to a form for performing an action on a single document on a collection
   def single_item_action_form_fields(form, document, action)
-    render partial:'/collections/single_item_action_fields', locals:{form:form, document:document, action: action}
+    render '/collections/single_item_action_fields', form: form, document: document, action: action
   end
 
   def hidden_collection_members
     _erbout = ''
     if params[:batch_document_ids].present?
       params[:batch_document_ids].each do |batch_item|
-        _erbout.concat hidden_field_tag("batch_document_ids[]", batch_item)
+        _erbout.concat hidden_field_tag('batch_document_ids[]', batch_item)
       end
     end
     _erbout.html_safe
   end
-  
 end

data/app/models/concerns/hydra/collections/metadata.rb

@@ -2,57 +2,57 @@ module Hydra::Collections
   module Metadata
     extend ActiveSupport::Concern
     included do
-      property :depositor, predicate: ::RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false do |index|
+      property :depositor, predicate: RDF::Vocab::MARCRelators.dpt, multiple: false do |index|
         index.as :symbol, :stored_searchable
       end
 
-      property :part_of, predicate: RDF::DC.isPartOf
-      property :contributor, predicate: RDF::DC.contributor do |index|
+      property :part_of, predicate: RDF::Vocab::DC.isPartOf
+      property :contributor, predicate: RDF::Vocab::DC.contributor do |index|
         index.as :stored_searchable, :facetable
       end
-      property :creator, predicate: RDF::DC.creator do |index|
+      property :creator, predicate: RDF::Vocab::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end
-      property :title, predicate: RDF::DC.title, multiple: false do |index|
+      property :title, predicate: RDF::Vocab::DC.title, multiple: false do |index|
         index.as :stored_searchable
       end
-      property :description, predicate: RDF::DC.description, multiple: false do |index|
+      property :description, predicate: RDF::Vocab::DC.description, multiple: false do |index|
         index.type :text
         index.as :stored_searchable
       end
-      property :publisher, predicate: RDF::DC.publisher do |index|
+      property :publisher, predicate: RDF::Vocab::DC.publisher do |index|
         index.as :stored_searchable, :facetable
       end
-      property :date_created, predicate: RDF::DC.created do |index|
+      property :date_created, predicate: RDF::Vocab::DC.created do |index|
         index.as :stored_searchable
       end
-      property :date_uploaded, predicate: RDF::DC.dateSubmitted, multiple: false do |index|
+      property :date_uploaded, predicate: RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-      property :date_modified, predicate: RDF::DC.modified, multiple: false do |index|
+      property :date_modified, predicate: RDF::Vocab::DC.modified, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-      property :subject, predicate: RDF::DC.subject do |index|
+      property :subject, predicate: RDF::Vocab::DC.subject do |index|
         index.as :stored_searchable, :facetable
       end
-      property :language, predicate: RDF::DC.language do |index|
+      property :language, predicate: RDF::Vocab::DC.language do |index|
         index.as :stored_searchable, :facetable
       end
-      property :rights, predicate: RDF::DC.rights do |index|
+      property :rights, predicate: RDF::Vocab::DC.rights do |index|
         index.as :stored_searchable
       end
-      property :resource_type, predicate: RDF::DC.type do |index|
+      property :resource_type, predicate: RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
-      property :identifier, predicate: RDF::DC.identifier do |index|
+      property :identifier, predicate: RDF::Vocab::DC.identifier do |index|
         index.as :stored_searchable
       end
-      property :based_near, predicate: RDF::FOAF.based_near do |index|
+      property :based_near, predicate: RDF::Vocab::FOAF.based_near do |index|
         index.as :stored_searchable, :facetable
       end
-      property :tag, predicate: RDF::DC.relation do |index|
+      property :tag, predicate: RDF::Vocab::DC.relation do |index|
         index.as :stored_searchable, :facetable
       end
       property :related_url, predicate: RDF::RDFS.seeAlso

data/hydra-collections.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hydra-head', '~> 9.1'
   spec.add_dependency 'deprecation', '~> 0.1'
   spec.add_dependency 'blacklight', '~> 5.10'
-  spec.add_dependency 'hydra-works', '~> 0.2'
+  spec.add_dependency 'hydra-works', '~> 0.4'
+  spec.add_dependency 'rdf', '~> 1.99'
 
-  spec.add_development_dependency 'engine_cart', '~> 0.5'
+  spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
 end

data/lib/hydra/collections/collectible.rb

@@ -7,8 +7,8 @@ module Hydra::Collections
     extend Deprecation
 
     included do
-      include Hydra::Works::GenericWorkBehavior
-      Deprecation.warn(Collectible, "Hydra::Collections::Collectible is deprecated. include Hydra::Works::GenericWorkBehavior instead. Hydra::Collections::Collectible will be removed in Hydra::Collections 7.0")
+      include Hydra::Works::WorkBehavior
+      Deprecation.warn(Collectible, "Hydra::Collections::Collectible is deprecated. include Hydra::Works::WorkBehavior instead. Hydra::Collections::Collectible will be removed in Hydra::Collections 7.0")
     end
 
     def collection_ids

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "6.0.0.rc1"
+    VERSION = "6.0.0.rc2"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -12,7 +12,7 @@ describe CollectionsController, :type => :controller do
 
     class GenericWork < ActiveFedora::Base
       include Hydra::AccessControls::Permissions
-      include Hydra::Works::GenericWorkBehavior
+      include Hydra::Works::WorkBehavior
 
       property :title, predicate: ::RDF::DC.title, multiple: false
 

data/spec/controllers/other_collections_controller_spec.rb

@@ -8,7 +8,7 @@ describe OtherCollectionsController, :type => :controller do
     end
 
     class Member < ActiveFedora::Base
-      include Hydra::Works::GenericWorkBehavior
+      include Hydra::Works::WorkBehavior
       include Hydra::AccessControls::Permissions
     end
   end

data/spec/controllers/selects_collections_spec.rb

@@ -86,15 +86,26 @@ describe SelectsCollectionsController, :type => :controller do
       describe "signed in" do
         before { sign_in @user }
 
-        it "should return only public or editable collections" do
+        it "returns only public or editable collections" 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
+        it "returns 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
+
+        context "after querying for read access" do
+          before do
+            subject.find_collections
+            subject.find_collections_with_edit_access
+          end
+
+          it "returns collections with edit access" do
+            expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
+          end
+        end
       end
     end
   end

data/spec/helpers/collections_helper_spec.rb

@@ -62,7 +62,7 @@ describe CollectionsHelper, :type => :helper do
       before(:all) do
         class OtherCollection < ActiveFedora::Base
           include Hydra::Collection
-          include Hydra::Works::GenericWorkBehavior
+          include Hydra::Works::WorkBehavior
         end
 
         @collection = OtherCollection.create

data/spec/lib/search_service_spec.rb

@@ -23,15 +23,7 @@ describe Hydra::Collections::SearchService do
       expect(@group_query).to eq('edit_access_group_ssim:umg\/test.group.1')
     end
     it "should allow overriding Solr's access control suffix" do
-      module Hydra
-        module Collections
-          class SearchService
-            def solr_access_control_suffix(key)
-              "edit_#{key}_customfield"
-            end
-          end
-        end
-      end
+      allow_any_instance_of(Hydra::Collections::SearchService).to receive(:solr_access_control_suffix).and_return("edit_group_customfield")
       @service = Hydra::Collections::SearchService.new({}, '')
       params = @service.apply_gated_search({}, {})
       @public_query = params[:fq].first.split(' OR ')[0]

data/spec/models/collection_spec.rb

@@ -4,7 +4,7 @@ describe Collection, :type => :model do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
     class GenericFile < ActiveFedora::Base
-      include Hydra::Works::GenericWorkBehavior
+      include Hydra::Works::WorkBehavior
     end
   end
   after(:all) do
@@ -144,7 +144,7 @@ describe Collection, :type => :model do
       end
 
       class Member < ActiveFedora::Base
-        include Hydra::Works::GenericWorkBehavior
+        include Hydra::Works::WorkBehavior
       end
     end
     after do

data/spec/spec_helper.rb

@@ -5,12 +5,11 @@ else
   require 'byebug'
 end
 
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 ENV["RAILS_ENV"] ||= 'test'
 
-require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+require 'engine_cart'
+EngineCart.load_application!
+
 require 'rspec/rails'
 require 'hydra-collections'
 

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1 @@
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
-gem 'active-fedora', github: 'projecthydra/active_fedora'

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

@@ -1,7 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   def update_gemfile
     append_to_file "Gemfile" do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'collections/show.html.erb' do
-  let(:response) { Blacklight::SolrResponse.new(sample_response, {}) }
+  let(:response) { Blacklight::Solr::Response.new(sample_response, {}) }
   let(:collection) { mock_model(Collection, id: '123', title: "My Collection", description: "Just a collection") }
 
   let(:blacklight_config) { CatalogController.blacklight_config }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc2
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -58,28 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.99'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections