europeana-blacklight 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3b33734136e3321b7c3bad989be93690a479f98
-  data.tar.gz: 9a074bd2838c7eebfb1e2a6aca9f9191fc98d9c0
+  metadata.gz: fdb81441c4273124e40f92b211e8f8e4a867b6bd
+  data.tar.gz: fa194c25a1b778b52b03cf982f4565aa1f559b3a
 SHA512:
-  metadata.gz: bb07e72f2e73a96b03efa331cdd5262a3074eae8afa9d6ff83ba1d3238e28e40fd959565e6d555317d2892c1873bdcf86fced824d3c72e0300b9e9f9a8eb6621
-  data.tar.gz: 0d5fc80c5518a447e195b19f01fee849d7bb6faac3df87956e1c8feaad5654e8f17e52f81edcde9576f88e398838a202049b14622452d7e4065df3bad226a55b
+  metadata.gz: 9d0f4b83372d001682a62b692810648b19f29dc49ea5a015549f40d170fec5efcebb3d3f7bd4277dfa0d58e96386c9e8c1abaa641d77ff72cea6cbccff368677
+  data.tar.gz: 1a082504cba1b0519a03751f37a89559a307f547e9292de4b5198c160fe0cf5008e49623d18b3abe1adeec8b6c74409f67f27a4c7d06b056236df4dc61261118

data/lib/europeana/blacklight/response/facets.rb

@@ -96,6 +96,12 @@ module Europeana
               FacetItem.new(value: value['label'], hits: value['count'])
             end
 
+            if blacklight_config && blacklight_config.facet_fields[facet_field_name]
+              if blacklight_config.facet_fields[facet_field_name].group.present?
+                items = grouped_facet_field_items(facet_field_name, items)
+              end
+            end
+
             hash[facet_field_name] = FacetField.new(facet_field_name, items, facet_field_aggregation_options(facet_field_name))
 
             if blacklight_config && !blacklight_config.facet_fields[facet_field_name]
@@ -107,6 +113,21 @@ module Europeana
           end
         end
 
+        def grouped_facet_field_items(facet_field_name, items)
+          groups = {}
+
+          items.each do |item|
+            item_group = blacklight_config.facet_fields[facet_field_name].group.call(item)
+            if groups.key?(item_group)
+              groups[item_group].hits += item.hits
+            else
+              groups[item_group] = FacetItem.new(item_group, item.hits)
+            end
+          end
+
+          groups.values.sort_by { |item| -item.hits }
+        end
+
         def facet_field_aggregation_options(name)
           options = {}
 

data/lib/europeana/blacklight/search_builder.rb

@@ -102,6 +102,7 @@ module Europeana
 
       def quote_facet_value(facet_field, value)
         return value if Europeana::API::Search::Fields::MEDIA.include?(facet_field)
+        return value if value.include?('*')
         '"' + value.gsub('"', '\"') + '"'
       end
 

data/lib/europeana/blacklight/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -312,3 +312,4 @@ test_files:
 - spec/models/europeana/blacklight/document_spec.rb
 - spec/presenters/europeana/blacklight/document_presenter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: