curation_concerns 1.0.0.beta7 → 1.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22cca2bceccfc06d12a86825fe10d8f27ecfc0b7
-  data.tar.gz: 2cb151b95b0c2da91d3fcb2b0b54404e4d4ad1d1
+  metadata.gz: 2d831ace32b6cd1aacb1efdaf22ac5a9fcf69168
+  data.tar.gz: 8fc0d5456aa13666591e2939182b0c59257cc6db
 SHA512:
-  metadata.gz: 080f23f93d1c098d0f15e3c1c6c416de18cf2f40894d8fb2b700e8a4e571b632d8c0a680b50fc72a6547336ad3aef527196c76c9eb65f66e72de57ea5be19538
-  data.tar.gz: 99c4d8ee5bf8f9f6e7272cc45a54a114672e7371f64a3b108cfb1ad9bff90d3897a2619de52f58bb6274e03be48b22414d7678059f07aeceeea34d7d76d9d723
+  metadata.gz: 9fdcb4b58d985603b5181365d90e944506b94971849009c4d2539af81215f02647a221d61ac21e27b0f2c84ffa57ceb233b58652e69e062b5f7135f8a7760583
+  data.tar.gz: 0b120bb5c099ed53c352b533728e088e6dced3b95b08cf2bb57770344415fb46f20b153329c9d5f9a03f4020dcb3320da41857a737c1e8e3a0953f732b11b376

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -11,6 +11,8 @@ module CurationConcerns
                     :representative_id, :thumbnail_id, :identifier, :based_near,
                     :related_url, :visibility]
 
+      self.required_fields = [:title]
+
       # Test to see if the given field is required
       # @param [Symbol] key a field
       # @return [Boolean] is it required or not

data/app/search_builders/curation_concerns/filter_by_type.rb

@@ -9,11 +9,25 @@ module CurationConcerns
     # Add queries that excludes everything except for works and collections
     def filter_models(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << '(' + (work_clauses + collection_clauses).join(' OR ') + ')'
+      solr_parameters[:fq] << '{!terms f=has_model_ssim}' + (work_clauses + collection_clauses).join(',')
     end
 
+    protected
+
+      def only_collections?
+        generic_type_field.include?('Collection')
+      end
+
+      def only_works?
+        generic_type_field.include?('Work')
+      end
+
     private
 
+      def generic_type_field
+        Array.wrap(blacklight_params.fetch(:f, {}).fetch(:generic_type_sim, []))
+      end
+
       # Override this method if you want to limit some of the registered
       # types from appearing in search results
       # @returns [Array<Class>] the list of work types to include in searches
@@ -22,15 +36,13 @@ module CurationConcerns
       end
 
       def work_clauses
-        return [] if blacklight_params.key?(:f) && Array.wrap(blacklight_params[:f][:generic_type_sim]).include?('Collection')
-        work_types.map do |klass|
-          ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: klass.to_class_uri)
-        end
+        return [] if only_collections?
+        work_types.map(&:to_class_uri)
       end
 
       def collection_clauses
-        return [] if blacklight_params.key?(:f) && Array.wrap(blacklight_params[:f][:generic_type_sim]).include?('Work')
-        [ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)]
+        return [] if only_works?
+        [::Collection.to_class_uri]
       end
   end
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.0.0.beta7".freeze
+  VERSION = "1.0.0.beta8".freeze
 end

data/lib/generators/curation_concerns/templates/catalog_controller.rb

@@ -30,7 +30,6 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name('language', :facetable), limit: 5
     config.add_facet_field solr_name('based_near', :facetable), limit: 5
     config.add_facet_field solr_name('publisher', :facetable), limit: 5
-    config.add_facet_field solr_name('file_format', :facetable), limit: 5
     config.add_facet_field 'generic_type_sim', show: false, single: true
 
     # Have BL send all facet field names to Solr, which has been the default
@@ -78,7 +77,7 @@ class CatalogController < ApplicationController
       label_name = solr_name('title', :stored_searchable, type: :string)
       contributor_name = solr_name('contributor', :stored_searchable, type: :string)
       field.solr_parameters = {
-        qf: "#{title_name} #{label_name} file_format_tesim #{contributor_name}",
+        qf: "#{title_name} #{label_name} #{contributor_name}",
         pf: title_name.to_s
       }
     end

data/spec/features/collection_spec.rb

@@ -17,6 +17,17 @@ feature 'collection' do
     Collection.destroy_all
   end
 
+  describe 'collection creation fields' do
+    before do
+      sign_in user
+      visit '/collections/new'
+    end
+
+    it 'visibly marks the title field as required' do
+      expect(page).to have_content 'Title required'
+    end
+  end
+
   describe 'create collection' do
     before do
       sign_in user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta7
+  version: 1.0.0.beta8
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head