europeana-blacklight 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ad04523f752587c4b28ffe8115eaa6b6de4b44
-  data.tar.gz: 249cefb4cece87713a7d42e7c1c311871f72acb9
+  metadata.gz: 83d5b7488e74357b03a95438f478a61b65b170eb
+  data.tar.gz: 168a4be610d544986d85c053c075c4b064692446
 SHA512:
-  metadata.gz: baedf8ef132c38592f47ac4ac3bee19fc10fb1d3475e4a15d33d37ee9bf9d6405ca40af9a22afa113fb5b5218216d701b726ebc703f52b2915df8da1e1b62687
-  data.tar.gz: 97a4143b8bd29f3a3d7f2e0fcef19ef3072a824a392261a7407332c0c71422817da37504ade2ceefb00b28675936c55cf2ceaeb187b97a55399f179f8b25d5e8
+  metadata.gz: 450e5219a9a6e07628d18072bdd36cc0ab9796b454047d5ee871eff58bc39f9b73a31e5d9d64793ccb834780a696dd1d609f6e7a39b682e9d91bfca72e7a49ce
+  data.tar.gz: 5083dbcfa6ae7c160fa5f551b8a3b2b0dd829163aa7ce5175606e071b60557403701a8ff0fbe1530af4d302bbe2a3cf5e8b00ad28581e0ce625e073f3a1af105

data/README.md

@@ -57,3 +57,21 @@ And then execute:
      config.europeana_api_cache_expires_in = 60.minutes # defaults to 24.hours
    end
    ```
+
+## Query facets
+
+In the configuration for query facet fields, the `:fq` option is a `Hash`, to
+permit specification of multiple parameters to be passed to the API:
+
+```ruby
+configure_blacklight do |config|
+  config.add_facet_field 'Cities (reusable content)', query: [
+    { label: 'Paris', fq: { qf: 'paris', reusability: 'open' } },
+    { label: 'Berlin', fq: { qf: 'berlin', reusability: 'open' } }
+  ]
+end
+```
+
+*Warning:* query facets are achieved by sending additional queries to the
+API. If you configure 10 query facets, this will result in an additional
+10 queries being sent to the API.

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

@@ -127,13 +127,17 @@ module Europeana
         def facet_query_aggregations
           return {} unless blacklight_config
 
-          blacklight_config.facet_fields.select { |_k, v| v.query }.each_with_object({}) do |(field_name, facet_field), hash|
-            salient_facet_queries = facet_field.query.map { |_k, x| x[:fq] }
-            items = []
-            facet_queries.select { |k, _v| salient_facet_queries.include?(k) }.reject { |_value, hits| hits == 0 }.map do |value, hits|
+          query_facet_fields = blacklight_config.facet_fields.select { |_k, v| v.query }
+          query_facet_fields.each_with_object({}) do |(field_name, facet_field), hash|
+            facet_query_params = facet_field.query.map { |_k, v| v[:fq] }
+            response_facet_queries = facet_queries.dup
+            response_facet_queries.select! { |k, _hits| facet_query_params.include?(k) }
+            response_facet_queries.reject! { |_k, hits| hits == 0 }
+
+            items = response_facet_queries.map do |value, hits|
               salient_fields = facet_field.query.select { |_k, v| v[:fq] == value }
               key = ((salient_fields.keys if salient_fields.respond_to? :keys) || salient_fields.first).first
-              items << FacetItem.new(value: key, hits: hits, label: facet_field.query[key][:label])
+              FacetItem.new(value: key, hits: hits, label: facet_field.query[key][:label])
             end
 
             hash[field_name] = FacetField.new(field_name, items)

data/lib/europeana/blacklight/search_builder.rb

@@ -3,7 +3,6 @@ module Europeana
     ##
     # Core search builder for {Europeana::Blacklight::ApiRepository}
     class SearchBuilder < ::Blacklight::SearchBuilder
-      require 'europeana/blacklight/search_builder/channels'
       require 'europeana/blacklight/search_builder/facet_pagination'
       require 'europeana/blacklight/search_builder/more_like_this'
       require 'europeana/blacklight/search_builder/ranges'
@@ -15,7 +14,6 @@ module Europeana
         :add_sorting_to_api
       ]
 
-      include Channels
       include FacetPagination
       include MoreLikeThis
       include Ranges

data/lib/europeana/blacklight/version.rb

@@ -1,6 +1,6 @@
 module Europeana
   #:nodoc:
   module Blacklight
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -132,7 +132,6 @@ files:
 - lib/europeana/blacklight/response/more_like_this.rb
 - lib/europeana/blacklight/response/pagination.rb
 - lib/europeana/blacklight/search_builder.rb
-- lib/europeana/blacklight/search_builder/channels.rb
 - lib/europeana/blacklight/search_builder/facet_pagination.rb
 - lib/europeana/blacklight/search_builder/more_like_this.rb
 - lib/europeana/blacklight/search_builder/ranges.rb
@@ -157,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Europeana REST API adapter for Blacklight

data/lib/europeana/blacklight/search_builder/channels.rb

@@ -1,18 +0,0 @@
-module Europeana
-  module Blacklight
-    class SearchBuilder
-      ##
-      # Search builder with content channel qf
-      module Channels
-        # @todo remove hard-coded controller check
-        def add_channel_qf_to_api(api_parameters)
-          return unless blacklight_params[:controller] == 'channels' && blacklight_params[:id].present?
-          channel_qf = scope.channels_search_query
-          return if channel_qf.blank?
-          api_parameters[:qf] ||= []
-          api_parameters[:qf] << channel_qf
-        end
-      end
-    end
-  end
-end