hydra-collections 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c141437035384dcd06f340506ab837348c902a
-  data.tar.gz: a817c59334b68041937292aabe05532713bd08a9
+  metadata.gz: f5ab9c82d9c2b45b6c93d58bb9629d142104cb77
+  data.tar.gz: df870186ca05040cc5f4e07e38f29a03bcfb0900
 SHA512:
-  metadata.gz: 4b4b34237bd666aa7f5ff1b7223f158111085c4a9c52260eea3998b5a01aff1e3969474f41b473633b2405c663b1a9be08f2abcd31905d39fe8c6aab0dfee7e7
-  data.tar.gz: 3390a8a96bb94996a2101111a12a9060a554985c3da39bc4469429f055d3eb7627843d0b61c4c03e102bf893eb57737091eba1423d432fdf3e8c70245c0fe929
+  metadata.gz: d04a46fe91e9f572556e689bf0a7c759d5466f91bbcc8df17aebd68d5489f58629f2e1eeb1d9fdae8742d6ea0e2e497a89d70f0ed72fed7f5b4735cd46c28b31
+  data.tar.gz: b18035284b01b0439912b716346eead6fdabbc6cad9aa8cec7d4ea2123c3c45f80d235ab9ad5b9cf25ba78fca2894b8b92c7843aba23e56ad420e84f81d0339d

data/Changelog.md

@@ -1,3 +1,7 @@
+# 5.0.2
+
+* Using new Hydra::Catalog module and Hydra::Collections::SearchBehaviors
+
 # 5.0.1
 
 * Fixed bug where access controls were not enforced by default

data/README.md

@@ -1,4 +1,4 @@
-# Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/projecthydra-labs/hydra-collections.png?branch=master)](https://travis-ci.org/projecthydra-labs/hydra-collections) [![Dependency Status](https://gemnasium.com/projecthydra/hydra-collections.png)](https://gemnasium.com/projecthydra/hydra-collections)
+# Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/projecthydra/hydra-collections.png?branch=master)](https://travis-ci.org/projecthydra/hydra-collections) [![Dependency Status](https://gemnasium.com/projecthydra/hydra-collections.png)](https://gemnasium.com/projecthydra/hydra-collections)
 
 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.
 

data/app/search_builders/hydra/collections/search_builder.rb

@@ -1,31 +1,5 @@
 module Hydra::Collections
   class SearchBuilder < Hydra::SearchBuilder
-
-    def collection
-      scope.collection
-    end
-
-    # include filters into the query to only include the collection memebers
-    def include_collection_ids(solr_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "{!join from=hasCollectionMember_ssim to=id}id:#{collection.id}"
-    end
-
-    def some_rows(solr_parameters)
-      solr_parameters[:rows] = '100'
-    end
-
-    def add_collection_filter(solr_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
-    end
-
-    def discovery_perms= perms
-      @discovery_perms = perms
-    end
-
-    def discovery_permissions
-      @discovery_perms || super
-    end
+    include Hydra::Collections::SearchBehaviors
   end
 end

data/hydra-collections.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["cam156@psu.edu"]
   spec.description   = "A rails engine for managing Hydra Collections"
   spec.summary       = "A rails engine for managing Hydra Collections"
-  spec.homepage      = "https://github.com/projecthydra-labs/hydra-collections"
+  spec.homepage      = "https://github.com/projecthydra/hydra-collections"
   spec.license       = "APACHE2"
 
   spec.files         = `git ls-files`.split($/)

data/lib/hydra-collections.rb

@@ -9,6 +9,7 @@ module Hydra
     autoload :AcceptsBatches
     autoload :SelectsCollections
     autoload :SolrDocumentBehavior
+    autoload :SearchBehaviors
     class Engine < ::Rails::Engine
       engine_name "collections"
       config.autoload_paths += %W(

data/lib/hydra/collections/search_behaviors.rb

@@ -0,0 +1,30 @@
+module Hydra::Collections::SearchBehaviors
+
+  def collection
+    scope.collection
+  end
+
+  # include filters into the query to only include the collection memebers
+  def include_collection_ids(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] << "{!join from=hasCollectionMember_ssim to=id}id:#{collection.id}"
+  end
+
+  def some_rows(solr_parameters)
+    solr_parameters[:rows] = '100'
+  end
+
+  def add_collection_filter(solr_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
+  end
+
+  def discovery_perms= perms
+    @discovery_perms = perms
+  end
+
+  def discovery_permissions
+    @discovery_perms || super
+  end
+
+end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "5.0.1"
+    VERSION = "5.0.2"
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-include Rails.application.routes.url_helpers
-
 describe CatalogController, :type => :controller do
 
   before do

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

@@ -71,7 +71,7 @@ class TestAppGenerator < Rails::Generators::Base
   
   # Inject collections call into balacklight catalog
   def inject_collections
-    insert_into_file "app/controllers/catalog_controller.rb", :after => 'Hydra::Controller::ControllerBehavior' do
+    insert_into_file "app/controllers/catalog_controller.rb", :after => 'Hydra::Catalog' do
       "\n  include Hydra::Collections::SelectsCollections\n  before_filter :find_collections, :only=>:index"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -150,6 +150,7 @@ files:
 - lib/hydra-collections.rb
 - lib/hydra/collections/accepts_batches.rb
 - lib/hydra/collections/collectible.rb
+- lib/hydra/collections/search_behaviors.rb
 - lib/hydra/collections/search_service.rb
 - lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
@@ -184,7 +185,7 @@ files:
 - spec/views/collections/show.html.erb_spec.rb
 - tasks/hydra-collections-dev.rake
 - tasks/jetty.rake
-homepage: https://github.com/projecthydra-labs/hydra-collections
+homepage: https://github.com/projecthydra/hydra-collections
 licenses:
 - APACHE2
 metadata: {}
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections