hydra-collections 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 878b10998101cbd6d3b1420408215b6605180517
-  data.tar.gz: 015496e71bfabd20eb28668f4dd1d42ed3a83b48
+  metadata.gz: fb3c19c725d2aaea1f447768b62c9025d258829e
+  data.tar.gz: e15c3a7eedf2189af5dc15707c45fd2c7bbe4618
 SHA512:
-  metadata.gz: 374d069be8e10287435c0544a8c571da379cfd8e86d05176f327a4340cba7c95df59005ef599106a516d4f33b1ba0763d1ecded7a9b61546886f229e75c8c64d
-  data.tar.gz: ed325dd51ed6abbfd585702f9a6f796f9d66b088767b4230100669e4116cdcd0678d91a687f0cda705fe3a68f03dce186a3941ba97cf4370f082a1c355e56a6f
+  metadata.gz: 799056d3aa822e1777de9a149da7c88734b5f4a79b4dc33b208480ec55761f84cad5e41276806f30e65520e80cb2276bc9614db05cfe6b87a2f485ecda2409c2
+  data.tar.gz: b8cb44470bcddd4cd75927a1f6fc25bca71269b0dc10b9a7cabf287ec582de0485deaa7199aaed43ee2c0056a26648b7bea488ca89c10d36a83bd60a167e74a2

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

@@ -1,11 +1,11 @@
-include Blacklight::SolrHelper
-
 module Hydra
   module CollectionsControllerBehavior
     extend ActiveSupport::Concern
 
     included do
       include Blacklight::Configurable
+      include Blacklight::SolrHelper
+
       include Hydra::Collections::AcceptsBatches
       include Hydra::Collections::SelectsCollections
 

data/app/helpers/collections_search_helper.rb

@@ -5,8 +5,7 @@ module CollectionsSearchHelper
   # @return [String] the title of the collection if available, otherwise its pid
   def collection_name(collection_pid)
     #TODO this can be loaded from solr
-    # the .result is due to ActiveTriples/ActiveTripes#74
-    Collection.find(collection_pid).title.result || collection_pid
+    Collection.find(collection_pid).title || collection_pid
   end
 
 end

data/lib/hydra/collections/collectible.rb

@@ -19,8 +19,11 @@ module Hydra::Collections::Collectible
   #    return solr_doc
   #   end
   def index_collection_ids(solr_doc={})
-    solr_doc[Solrizer.solr_name(:collection, :facetable)] = self.collection_ids
-    solr_doc[Solrizer.solr_name(:collection)] = self.collection_ids
+    # CollectionAssociation#ids_reader loads from solr on each call, so only call it once
+    # see https://github.com/projecthydra/active_fedora/issues/644
+    ids = collection_ids
+    solr_doc[Solrizer.solr_name(:collection, :facetable)] = ids
+    solr_doc[Solrizer.solr_name(:collection)] = ids
     solr_doc
   end
 

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "4.0.0.beta2"
+    VERSION = "4.0.0.beta3"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -67,7 +67,7 @@ describe CollectionsController, :type => :controller do
       @asset1 = GenericFile.create!
       post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       expect(assigns[:collection].members).to eq [@asset1]
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      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
       expect(doc["id"]).to eq(@asset1.id)
@@ -79,7 +79,7 @@ describe CollectionsController, :type => :controller do
       @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])
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      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
       expect(doc["id"]).to eq(@asset1.id)
@@ -145,7 +145,7 @@ describe CollectionsController, :type => :controller do
       @asset2.reload
       expect(@asset2.to_solr[Solrizer.solr_name(:collection)]).to eq [@collection.id]
       ## Check that member was re-indexed with collection info
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
       expect(doc["id"]).to eq(@asset2.id)
       expect(doc[Solrizer.solr_name(:collection)]).to eq [@collection.id]
@@ -159,7 +159,7 @@ describe CollectionsController, :type => :controller do
       expect(@asset2.to_solr[Solrizer.solr_name(:collection)]).to eq([])
 
       ## Check that member was re-indexed without collection info
-      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
       expect(doc["id"]).to eq(@asset2.id)
       expect(doc[Solrizer.solr_name(:collection)]).to be_nil
@@ -210,14 +210,14 @@ describe CollectionsController, :type => :controller do
         @asset1 = @asset1.reload
         @asset1.update_index
         expect(@asset1.collections).to eq [@collection]
-        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        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
         expect(doc[Solrizer.solr_name(:collection)]).to eq([@collection.id])
 
         delete :destroy, id: @collection
         expect(@asset1.reload.collections).to eq([])
-        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        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
         expect(doc[Solrizer.solr_name(:collection)]).to be_nil

data/spec/helpers/collections_search_helper_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe CollectionsSearchHelper, :type => :helper do
   describe "collection_name" do
-    let (:collection_without_title) { Collection.create!() }
-    let (:collection_with_title) { Collection.create(title: "Title of Collection 2") }
+    let(:collection_without_title) { Collection.create!() }
+    let(:collection_with_title) { Collection.create!(title: "Title of Collection 2") }
 
     it "should return the pid if no title available" do
       expect(collection_name(collection_without_title.id)).to eq collection_without_title.id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight