hydra-collections 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7585019c90e5e1209d393c315e52f88b73169a95
-  data.tar.gz: 2655fad70f96136e738e3e11ffd81dcabb9ddfec
+  metadata.gz: 36ddec8b1586e43c728658973979db06786efb05
+  data.tar.gz: 07d3a47de4e1fac51cb63cbce5dcab0e7f1078e0
 SHA512:
-  metadata.gz: ac2cedd5a619df9ae770e8c1f3998dd36ce5ab8352be884d75e08512f8dc0649890625ad7f384f4d697d216cc7f77653ab9e8ce60002d83a991528326d2a776b
-  data.tar.gz: cee8d4465333e5378c95c1ff3575b996b8e843cc8a552f1d3d713be40f7a6963bf55d538a229958ff6b560ef4c433d3ca6ba45360f87e5ce33d407e1b0d402ec
+  metadata.gz: 008fb15b304508524d24bbf9c25246e6e32db12b744d974fe762659544acde8f2b266f8a641a6ba39491a9d6400096e382a3ff0e48930cdb587170fe500ae261
+  data.tar.gz: 995ff18102b0a35df5e089ea1c45818323a7d16460f2c386993f4b64fe06b5d5321d73d393b34d513a5d9f4678d4c3e7ddf9b297bfbfaa4ccef54bd54db23c65

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

@@ -16,19 +16,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
+  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/app/controllers/concerns/hydra/collections/selects_collections.rb

@@ -66,7 +66,7 @@ module Hydra::Collections::SelectsCollections
   # Defines which search_params_logic should be used when searching for Collections
   def collection_search_params_logic
     [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params,
-      :add_collection_filter, :some_rows]
+      :add_collection_filter, :some_rows, :sort_by_title]
   end
 
 end

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

@@ -2,61 +2,76 @@ 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|
-        index.as :stored_searchable
+
+      property :title, predicate: RDF::Vocab::DC.title, multiple: false do |index|
+        index.as :stored_searchable, :sortable
       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
 
+      property :related_url, predicate: RDF::RDFS.seeAlso
     end
   end
 end

data/hydra-collections.gemspec

@@ -21,7 +21,8 @@ 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 'rdf-vocab', '~> 0'
 
-  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/search_behaviors.rb

@@ -19,6 +19,13 @@ module Hydra::Collections::SearchBehaviors
     solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
   end
 
+  # Sort results by title if no query was supplied.
+  # This overrides the default 'relevance' sort.
+  def sort_by_title(solr_parameters)
+    return if solr_parameters[:q]
+    solr_parameters[:sort] ||= "#{sort_field} asc"
+  end
+
   def discovery_perms= perms
     @discovery_perms = perms
   end
@@ -27,4 +34,8 @@ module Hydra::Collections::SearchBehaviors
     @discovery_perms || super
   end
 
+  def sort_field
+    Solrizer.solr_name('title', :sortable)
+  end
+
 end

data/lib/hydra/collections/version.rb

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

data/spec/controllers/collections_controller_spec.rb

@@ -14,7 +14,7 @@ describe CollectionsController, :type => :controller do
       include Hydra::Collections::Collectible
       include Hydra::AccessControls::Permissions
 
-      property :title, predicate: ::RDF::DC.title, multiple: false
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
 
       def to_solr(solr_doc={})
         super.tap do |solr_doc|
@@ -39,15 +39,15 @@ describe CollectionsController, :type => :controller do
   end
 
   describe "#index" do
-    let!(:collection1) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
-    let!(:collection2) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection1) { Collection.create(title: 'Beta') { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection2) { Collection.create(title: 'Alpha') { |c| c.apply_depositor_metadata(user.user_key) } }
     let!(:generic_file) { GenericFile.create }
 
-    it "should show a list of collections" do
+    it "shows a list of collections sorted alphabetically" do
       get :index
       expect(response).to be_successful
       expect(assigns[:document_list].map(&:id)).not_to include generic_file.id
-      expect(assigns[:document_list].map(&:id)).to eq [collection1.id, collection2.id]
+      expect(assigns[:document_list].map(&:id)).to eq [collection2.id, collection1.id]
     end
   end
 

data/spec/controllers/selects_collections_spec.rb

@@ -11,8 +11,8 @@ end
 describe SelectsCollectionsController, :type => :controller do
 
   describe "#find_collections" do
-    it "should use collection_search_params_logic" do
-      expect(subject.collection_search_params_logic).to eq([:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows])
+    it "uses collection_search_params_logic" do
+      expect(subject.collection_search_params_logic).to eq [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
       expect(Hydra::Collections::SearchBuilder).to receive(:new).with(subject.collection_search_params_logic, subject).and_call_original
       subject.find_collections
     end

data/spec/models/collection_spec.rb

@@ -23,8 +23,9 @@ describe Collection, :type => :model do
 
     subject { collection.to_solr }
 
-    it "should have title and depositor information" do
+    it "has title and depositor information" do
       expect(subject['title_tesim']).to eq ['A good title']
+      expect(subject['title_si']).to eq 'A good title'
       expect(subject['depositor_tesim']).to eq [user.user_key]
       expect(subject['depositor_ssim']).to eq [user.user_key]
     end

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !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
@@ -205,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections