europeana-blacklight 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb81441c4273124e40f92b211e8f8e4a867b6bd
-  data.tar.gz: fa194c25a1b778b52b03cf982f4565aa1f559b3a
+  metadata.gz: 337f8c94916109a20fa3b1fbc5e47861f11bba11
+  data.tar.gz: 1d36e7d6abfb729595ca7d97ee1b82004b9598fd
 SHA512:
-  metadata.gz: 9d0f4b83372d001682a62b692810648b19f29dc49ea5a015549f40d170fec5efcebb3d3f7bd4277dfa0d58e96386c9e8c1abaa641d77ff72cea6cbccff368677
-  data.tar.gz: 1a082504cba1b0519a03751f37a89559a307f547e9292de4b5198c160fe0cf5008e49623d18b3abe1adeec8b6c74409f67f27a4c7d06b056236df4dc61261118
+  metadata.gz: b59c3fb0b34697ac2b270529f2c44720739d38c4504e144d75b3e7212dbeca8ac20648affc8ab0e779dc3866d36cdebf33d8ecebb9102c2a00def220590e2949
+  data.tar.gz: b998ec7c69ffd80bc166f49cbb2ad1bcf498647c8158443615c7972ab1cacfa3b95edeba2f62afd69be4f751796218fea098b1a3ebc007011c86db3a617e2f15

data/lib/europeana/blacklight/search_builder.rb

@@ -88,9 +88,7 @@ module Europeana
       def add_facet_qf_to_api(api_parameters)
         return unless blacklight_params[:f]
 
-        salient_facets = blacklight_params[:f].select do |k, _v|
-          !STANDALONE_FACETS.include?(k) && api_request_facet_fields.keys.include?(k)
-        end
+        salient_facets = salient_facets_for_api_facet_qf
 
         salient_facets.each_pair do |facet_field, value_list|
           Array(value_list).reject(&:blank?).each do |value|
@@ -100,6 +98,12 @@ module Europeana
         end
       end
 
+      def salient_facets_for_api_facet_qf
+        blacklight_params[:f].select do |k, _v|
+          !STANDALONE_FACETS.include?(k) && api_request_facet_fields.keys.include?(k)
+        end
+      end
+
       def quote_facet_value(facet_field, value)
         return value if Europeana::API::Search::Fields::MEDIA.include?(facet_field)
         return value if value.include?('*')
@@ -142,9 +146,7 @@ module Europeana
       # @see http://labs.europeana.eu/api/search/#individual-facets
       # @see http://labs.europeana.eu/api/search/#offset-and-limit-of-facets
       def add_facetting_to_api(api_parameters)
-        api_parameters[:facet] = api_request_facet_fields.keys.map do |field|
-          Europeana::API::Search::Fields::MEDIA.include?(field) ? 'DEFAULT' : field
-        end.uniq.join(',')
+        api_parameters[:facet] = api_request_facet_fields.keys.uniq.join(',')
 
         api_request_facet_fields.each do |field_name, facet|
           api_parameters[:"f.#{facet.field}.facet.limit"] = facet_limit_for(field_name) if facet_limit_for(field_name)

data/lib/europeana/blacklight/version.rb

@@ -1,5 +1,5 @@
 module Europeana
   module Blacklight
-    VERSION = '0.4.4'.freeze
+    VERSION = '0.4.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight