hydra-collections 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58ecccf89dad05d1c6d7f4a4c4bca86c48e7b8f5
-  data.tar.gz: b577fa44ad18ccafbff7a85170420867da356be7
+  metadata.gz: bd41a2217ea7401629be851956099428aebe6fff
+  data.tar.gz: affc685ac79e5b4ac9234f5a67b85d63e676aff6
 SHA512:
-  metadata.gz: 50ac8eb42dec432f8aeadba9e2fe1bb4bed3397c77e8d1aac6cc8e3331e4240af6c5017768ac08178ee462b28857f7bff3b7b7494db554a6200fead7d663eff0
-  data.tar.gz: 4862a0d4f8c78ff9caf3b3614a478535980e4d20793cf23654dcc3dff67fa8c3aa5d416f6a0c227bcc67f3dc9688335dc0fd71f125db3e134012d8bc5c3fc6f5
+  metadata.gz: 3ec6260a0153978aac853ba6dd77b9f5f21dfb49685493e03987e8530ef223ff9a465f1087812efbd50ede1779a1b6d469cbbdb4795817236b097d5a5b1950c6
+  data.tar.gz: 29fe2010e53ea5e75decb713dea95530f261c07412c890af48497c56cfa20d3c5acc10f4f58e59b232b5b0e6d42c008cf3cd4c9f317b7ff5702640f5328895ba

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

@@ -122,7 +122,7 @@ module Hydra
      end
     
     protected
-    
+
     # 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
@@ -134,7 +134,7 @@ module Hydra
       # run the solr query to find the collections
       (@response, @member_docs) = get_search_results(solr_params)
     end
-    
+
     def process_member_changes
       unless params[:collection].nil?
         change_members = []
@@ -170,11 +170,6 @@ module Hydra
       end
     end
     
-    # this is only needed until the version of balcklight that we are using this include it in it's solr helper  
-    def blacklight_solr
-        Blacklight.solr
-    end
-
     # include filters into the query to only include the collection memebers
     def include_collection_ids(solr_parameters, user_parameters)
       solr_parameters[:fq] ||= []

data/app/models/datastreams/hydra/collection_rdf_datastream.rb

@@ -67,5 +67,9 @@ module Hydra
       end
       map.related_url(:to => "seeAlso", :in => RDF::RDFS)
     end
+
+    def prefix
+      ""
+    end
   end
 end

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

@@ -20,7 +20,7 @@ limitations under the License.
       <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' %>
-      <%= search_as_hidden_fields(:omit_keys => [:cq, :sort, :qt, :page]).html_safe %>
+      <%= render_hash_as_hidden_fields(params_for_search.except(:cq, :sort, :qt, :page)).html_safe %>
       <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
   <% end %>
 </div>

data/hydra-collections.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "blacklight"
-  spec.add_dependency "hydra-head", "~> 6.4.0"
+  spec.add_dependency "hydra-head", "~> 7.0.1"
   spec.add_dependency "active-fedora", ">= 6.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "1.3.2"
+    VERSION = "2.0.0"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -70,7 +70,7 @@ describe CollectionsController do
       @asset1 = GenericFile.create!
       post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       assigns[:collection].members.should == [@asset1]
-      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       asset_results["response"]["numFound"].should == 1
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset1.pid
@@ -82,7 +82,7 @@ describe CollectionsController do
       @asset2 = GenericFile.create!
       post :create, batch_document_ids: [@asset1,@asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       assigns[:collection].members.should == [@asset1,@asset2]
-      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       asset_results["response"]["numFound"].should == 1
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset1.pid
@@ -145,7 +145,7 @@ describe CollectionsController do
       @asset2.reload
       @asset2.to_solr[Solrizer.solr_name(:collection)].should == [@collection.pid]
       ## Check that member was re-indexed with collection info
-      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset2.pid
       doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
@@ -157,7 +157,7 @@ describe CollectionsController do
       @asset2.reload
       @asset2.to_solr[Solrizer.solr_name(:collection)].should == []
       ## Check that member was re-indexed without collection info
-      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
       doc = asset_results["response"]["docs"].first
       doc["id"].should == @asset2.pid
       doc[Solrizer.solr_name(:collection)].should be_nil
@@ -200,14 +200,14 @@ describe CollectionsController do
         @asset1 = @asset1.reload
         @asset1.update_index
         @asset1.collections.should == [@collection]
-        asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
         asset_results["response"]["numFound"].should == 1
         doc = asset_results["response"]["docs"].first
         doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
 
         delete :destroy, id: @collection.id
         @asset1.reload.collections.should == []
-        asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        asset_results = blacklight_solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
         asset_results["response"]["numFound"].should == 1
         doc = asset_results["response"]["docs"].first
         doc[Solrizer.solr_name(:collection)].should be_nil

data/spec/controllers/selects_collections_spec.rb

@@ -6,8 +6,6 @@ class SelectsCollectionsController < ApplicationController
   include Hydra::Collections::SelectsCollections
 
   SelectsCollectionsController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-  # This filters out objects that you want to exclude from search results, like FileAssets
-  SelectsCollectionsController.solr_search_params_logic += [:exclude_unwanted_models]
 
 end
 

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

@@ -6,7 +6,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
 
-    generate 'blacklight', '--devise'
+    generate "blacklight:install", '--devise'
   end
 
   def run_hydra_head_generator
@@ -68,4 +68,9 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
+  def add_create_permissions
+    insert_into_file 'app/models/ability.rb', after: 'custom_permissions' do
+          "\n    can :create, :all if user_groups.include? 'registered'\n"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections