hydra-collections 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebe55db03846ed51118593543505434956f99125
-  data.tar.gz: db11d0ff1b2513f376e5e381eba5bf32e1bebdfb
+  metadata.gz: 5f0a6d73f747ff5aaa1026b064e55730c1605f36
+  data.tar.gz: 8e5a8f2069f9fc74e661eb2389a4ea6e0b164421
 SHA512:
-  metadata.gz: 4798abcfddaaabe9bb8f63f3cc82bc214f70ead4a5f80a04a2388dc166ed1f8985e96ecb2b672c5f30d260b636e7aa8a5fdb35874b37cadf77ce4b497cf59b2d
-  data.tar.gz: 730fea9bd4c25e8887373e7c04b67be671c5a0d59f495f39b7a36760995471cebbcb73f4ebbaf30d1caafc294319fb9d6e2f99b155c4b7d2af4ed58bb618cf1a
+  metadata.gz: fd07c424bb502667e7cb2cb48aba65de9e14785df444d16a816a7d4169c81a886aa0aaff8e2fcc7ce754fbec0651e7fcf2de3b0e8ee03355d625c21b4db08a19
+  data.tar.gz: 045f31a8e3b174596bcc985be730f642dc3b7beea5b1fb134758fc67050ecde128b9158ffb5706c1f5a3dce138148600c963527bd496fbbe87daccd596929bf7

data/.gitignore

@@ -19,4 +19,4 @@ test/tmp
 test/version_tmp
 tmp
 .internal_test_app
-jetty
+fcrepo4-test-data

data/Changelog.md

@@ -1,4 +1,8 @@
-# 6.0.0.rc1
+# 7.0.0
+
+* Update to Blacklight 6.0.0 [Justin Coyne]
+
+# 6.0.0
 Hydra::Collections 6.0.0 is the first release that sits atop the Portland Common Data Model. It includes the following changes:
 
 * Update for hydra-works 0.2.0 [Justin Coyne]
@@ -6,9 +10,6 @@ Hydra::Collections 6.0.0 is the first release that sits atop the Portland Common
 collection [E. Lynette Rayle]
 * Pass the document_counter to index_default [Justin Coyne]
 * Update changelog with v6.0.0.alpha entry [Michael J. Giarlo]
-
-# 6.0.0.alpha
-
 * Depend upon hydra-works 0.1.0, which brings PCDM-related dependencies. Collections defined by Hydra::Collections are now PCDM collections.
 * Add ParentCollectionAssociation#count_records to calculate the number of a collection's members.
 * Change the default join column for querying members of a collection (was `hasCollectionMember_ssim`, is now `member_ids_ssim`)

data/Gemfile

@@ -8,7 +8,8 @@ group :development, :test do
   gem "factory_girl_rails"
   gem 'devise'
   gem 'capybara'
-  gem 'jettywrapper'
+  gem 'fcrepo_wrapper'
+  gem 'solr_wrapper'
   gem 'byebug', require: false unless ENV['CI']
   gem 'coveralls', require: false
   gem 'rspec-activemodel-mocks'

data/README.md

@@ -2,10 +2,6 @@
 
 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:
@@ -124,7 +120,7 @@ Add `updates-batches` class to your button for submitting the batch
 Example:
 ```erb
 <%= button_to label, collections.collection_path(collection_id), method: :put,
-      class: "btn btn-primary updates-collection submits-batches collection-update", 
+      class: "btn btn-primary updates-collection submits-batches collection-update",
       'data-behavior'=>'hydra-collections', id: 'hydra-collection-update' %>
 ```
 
@@ -143,12 +139,7 @@ In order to make modifications to the gem code and run the tests, clone the repo
 
 ```
     $ bundle install
-    $ rake jetty:unzip
-    $ rake jetty:config
-    $ rake jetty:start
-    $ rake engine_cart:clean
-    $ rake engine_cart:generate
-    $ rake spec
+    $ bundle exec rake ci
 ```
 
 ## License

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

@@ -130,22 +130,32 @@ module Hydra
     protected
 
     def collection_params
-      params.require(:collection).permit(:part_of, :contributor, :creator, :title,
-        :description, :publisher, :date_created, :subject, :language, :rights,
-        :resource_type, :identifier, :based_near, :tag, :related_url, :members)
+      params.require(:collection).permit(:part_of, :contributor, :creator,
+        :publisher, :date_created, :subject, :language, :rights,
+        :resource_type, :identifier, :based_near, :tag, :related_url, :members,
+        title: [], description: [])
     end
 
     # Queries Solr for members of the collection.
     # Populates @response and @member_docs similar to Blacklight Catalog#index populating @response and @documents
     def query_collection_members
-      solr_params =  params.symbolize_keys.merge(q: params[:cq])
-
-      # run the solr query to find the collection members
-      query = collection_member_search_builder.with(solr_params).query
-      @response = repository.search(query)
+      @response = repository.search(query_for_collection_members)
       @member_docs = @response.documents
     end
 
+    # @return <Hash> a representation of the solr query that find the collection members
+    def query_for_collection_members
+      collection_member_search_builder.with(params_for_members_query).query
+    end
+
+    # You can override this method if you need to provide additional inputs to the search
+    # builder. For example:
+    #   search_field: 'all_fields'
+    # @return <Hash> the inputs required for the collection member search builder
+    def params_for_members_query
+      params.symbolize_keys.merge(q: params[:cq])
+    end
+
     def collection_member_search_builder_class
       Hydra::Collections::MemberSearchBuilder
     end

data/app/helpers/collections_helper.rb

@@ -1,5 +1,9 @@
 # View Helpers for Hydra Collections functionality
 module CollectionsHelper
+  def has_collection_search_parameters?
+    !params[:cq].blank?
+  end
+
   # 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 '/collections/button_create_collection', label: label
@@ -15,8 +19,8 @@ module CollectionsHelper
     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 '/collections/button_remove_from_collection', label: label, document: document
+  def button_for_remove_from_collection(collection, document, label = 'Remove From Collection')
+    render '/collections/button_remove_from_collection', collection: collection, label: label, document: document
   end
 
   def button_for_remove_selected_from_collection(collection, label = 'Remove From Collection')

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

@@ -16,11 +16,11 @@ module Hydra::Collections
         index.as :stored_searchable, :facetable
       end
 
-      property :title, predicate: RDF::Vocab::DC.title, multiple: false do |index|
+      property :title, predicate: RDF::Vocab::DC.title do |index|
         index.as :stored_searchable, :sortable
       end
 
-      property :description, predicate: RDF::Vocab::DC.description, multiple: false do |index|
+      property :description, predicate: RDF::Vocab::DC.description do |index|
         index.type :text
         index.as :stored_searchable
       end

data/app/views/collections/_button_remove_from_collection.html.erb

@@ -1,6 +1,4 @@
-<%#= button_to label, ,  :class=>"btn btn-primary collection-remove", 'data-behavior'=>'hydra-collections-remove', members:"delete", batch_document_ids:[document.id] %>
-
-<%= form_for @collection, url:collections.collection_path(@collection.id), :method=>:put, as:'collection' do |f| %>
-  <%= single_item_action_remove_form_fields(f,document) %>
-  <%= f.submit label, :class => "btn btn-primary collection-remove" %>
-<% end %>
+<%= form_for collection, url: collections.collection_path(collection), method: :put, as: 'collection' do |f| %>
+  <%= single_item_action_remove_form_fields(f, document) %>
+  <%= f.submit label, class: "btn btn-primary collection-remove" %>
+<% end %>

data/app/views/collections/_document_header.html.erb

@@ -1,12 +1,9 @@
-     
       <% # header bar for doc items in index view -%>
       <div class="documentHeader clearfix">
-        
         <% # main title container for doc partial view -%>
           <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
 
         <div class="documentFunctions span2">
-          <%= button_for_remove_from_collection(document) %>
+          <%= button_for_remove_from_collection(@collection, document) %>
         </div>
       </div>
-      

data/app/views/collections/_form.html.erb

@@ -14,17 +14,17 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
+    <%= label_tag 'collection_title', 'Title' %><br />
+    <%= text_field_tag 'collection[title][]', nil, id: 'collection_title' %>
   </div>
-  
+
   <div class="field">
-    <%= f.label :description %><br />
-    <%= f.text_area :description %>
+    <%= label_tag 'collection_description', 'Description' %><br />
+    <%= text_area_tag 'collection[description][]', nil, id: 'collection_description' %>
   </div>
-  
+
   <%= hidden_collection_members %>
-  
+
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/collections/_search_form.html.erb

@@ -1,9 +1,9 @@
 <div style="float: right;" >
-  <%= form_for([collections, @collection] , :method => :get, :class => "well form-search") do |f| %>
+  <%= form_for [collections, @collection], method: :get, class: "well form-search" do |f| %>
 
-      <label class="accessible-hidden">Search Collection <%=@collection.title %></label>
-      <%= text_field_tag :cq, params[:cq], :class => "collection-query", :placeholder => "Search Collection", :size => '30', :type => "search", :id => "collection_search" %>
-      <%= hidden_field_tag :sort, params[:sort], :id => 'collection_sort' %>
+      <label class="accessible-hidden">Search Collection <%= @collection.title.first %></label>
+      <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
+      <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
       <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
   <% end %>

data/app/views/collections/show.html.erb

@@ -1,5 +1,29 @@
-<h1><%=@collection.title%><h1>
-<h3><%=@collection.description%> </h3>
-<h3><u>Contained Files</u></h3>
-<%= render 'search_form'%>
-<%= render 'document_list', documents: @member_docs %>
+<div id="sidebar" class="col-md-3 col-sm-4">
+  <%= render 'search_sidebar' %>
+</div>
+
+<div id="content" class="col-md-9 col-sm-8">
+  <div itemscope itemtype="http://schema.org/CollectionPage" class="row">
+    <header>
+      <h1><%= @collection.title.first %></h1>
+      <p class="collection_description"><%= Array(@collection.description).join("\n") %></p>
+    </header>
+  </div>
+
+  <%= render 'sort_and_per_page' %>
+
+
+  <div>
+    <!-- Use CSS class h2 rather than HTML h2 tag to allow header and search box to align vertically -->
+    <span class="h2">
+      <% if has_collection_search_parameters? %>
+          <%= "Search Results within this Collection" %>
+      <% else %>
+          <%= "Items in this Collection" %>
+      <% end %>
+    </span>
+    <%= render 'search_form' %>
+  </div>
+
+  <%= render_document_index @member_docs %>
+</div>

data/app/views/layouts/collections.html.erb

@@ -17,7 +17,6 @@
     <![endif]-->
 
     <title><%= render_page_title %></title>
-    <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
     <%= favicon_link_tag 'favicon.ico' %>
     <%= stylesheet_link_tag "application", media: "all" %>
     <%= javascript_include_tag "application" %>

data/hydra-collections.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '~> 9.1'
+  spec.add_dependency 'active-fedora', '~> 9.9'
   spec.add_dependency 'deprecation', '~> 0.1'
   spec.add_dependency 'blacklight', '~> 6.0'
   spec.add_dependency 'hydra-works', '~> 0.4'

data/lib/hydra-collections.rb

@@ -5,7 +5,6 @@ module Hydra
   module Collections
     extend ActiveSupport::Autoload
     autoload :Version
-    autoload :Collectible
     autoload :SearchService
     autoload :AcceptsBatches
 

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "7.0.0"
+    VERSION = "8.0.0"
   end
 end

data/solr/config/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr/config/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/solr/config/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>

data/solr/config/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# The ASF licenses this file to You 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.
+
+# Syntax:
+#   "source" => "target"
+#     "source".length() > 0 (source cannot be empty.)
+#     "target".length() >= 0 (target can be empty.)
+
+# example:
+#   "??" => "A"
+#   "\u00C0" => "A"
+#   "\u00C0" => "\u0041"
+#   "??" => "ss"
+#   "\t" => " "
+#   "\n" => ""
+
+# ?? => A
+"\u00C0" => "A"
+
+# ?? => A
+"\u00C1" => "A"
+
+# ?? => A
+"\u00C2" => "A"
+
+# ?? => A
+"\u00C3" => "A"
+
+# ?? => A
+"\u00C4" => "A"
+
+# ?? => A
+"\u00C5" => "A"
+
+# ?? => AE
+"\u00C6" => "AE"
+
+# ?? => C
+"\u00C7" => "C"
+
+# ?? => E
+"\u00C8" => "E"
+
+# ?? => E
+"\u00C9" => "E"
+
+# ?? => E
+"\u00CA" => "E"
+
+# ?? => E
+"\u00CB" => "E"
+
+# ?? => I
+"\u00CC" => "I"
+
+# ?? => I
+"\u00CD" => "I"
+
+# ?? => I
+"\u00CE" => "I"
+
+# ?? => I
+"\u00CF" => "I"
+
+# ?? => IJ
+"\u0132" => "IJ"
+
+# ?? => D
+"\u00D0" => "D"
+
+# ?? => N
+"\u00D1" => "N"
+
+# ?? => O
+"\u00D2" => "O"
+
+# ?? => O
+"\u00D3" => "O"
+
+# ?? => O
+"\u00D4" => "O"
+
+# ?? => O
+"\u00D5" => "O"
+
+# ?? => O
+"\u00D6" => "O"
+
+# ?? => O
+"\u00D8" => "O"
+
+# ?? => OE
+"\u0152" => "OE"
+
+# ??
+"\u00DE" => "TH"
+
+# ?? => U
+"\u00D9" => "U"
+
+# ?? => U
+"\u00DA" => "U"
+
+# ?? => U
+"\u00DB" => "U"
+
+# ?? => U
+"\u00DC" => "U"
+
+# ?? => Y
+"\u00DD" => "Y"
+
+# ?? => Y
+"\u0178" => "Y"
+
+# ?? => a
+"\u00E0" => "a"
+
+# ?? => a
+"\u00E1" => "a"
+
+# ?? => a
+"\u00E2" => "a"
+
+# ?? => a
+"\u00E3" => "a"
+
+# ?? => a
+"\u00E4" => "a"
+
+# ?? => a
+"\u00E5" => "a"
+
+# ?? => ae
+"\u00E6" => "ae"
+
+# ?? => c
+"\u00E7" => "c"
+
+# ?? => e
+"\u00E8" => "e"
+
+# ?? => e
+"\u00E9" => "e"
+
+# ?? => e
+"\u00EA" => "e"
+
+# ?? => e
+"\u00EB" => "e"
+
+# ?? => i
+"\u00EC" => "i"
+
+# ?? => i
+"\u00ED" => "i"
+
+# ?? => i
+"\u00EE" => "i"
+
+# ?? => i
+"\u00EF" => "i"
+
+# ?? => ij
+"\u0133" => "ij"
+
+# ?? => d
+"\u00F0" => "d"
+
+# ?? => n
+"\u00F1" => "n"
+
+# ?? => o
+"\u00F2" => "o"
+
+# ?? => o
+"\u00F3" => "o"
+
+# ?? => o
+"\u00F4" => "o"
+
+# ?? => o
+"\u00F5" => "o"
+
+# ?? => o
+"\u00F6" => "o"
+
+# ?? => o
+"\u00F8" => "o"
+
+# ?? => oe
+"\u0153" => "oe"
+
+# ?? => ss
+"\u00DF" => "ss"
+
+# ?? => th
+"\u00FE" => "th"
+
+# ?? => u
+"\u00F9" => "u"
+
+# ?? => u
+"\u00FA" => "u"
+
+# ?? => u
+"\u00FB" => "u"
+
+# ?? => u
+"\u00FC" => "u"
+
+# ?? => y
+"\u00FD" => "y"
+
+# ?? => y
+"\u00FF" => "y"
+
+# ??? => ff
+"\uFB00" => "ff"
+
+# ??? => fi
+"\uFB01" => "fi"
+
+# ??? => fl
+"\uFB02" => "fl"
+
+# ??? => ffi
+"\uFB03" => "ffi"
+
+# ??? => ffl
+"\uFB04" => "ffl"
+
+# ??? => ft
+"\uFB05" => "ft"
+
+# ??? => st
+"\uFB06" => "st"