europeana-blacklight 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc8eda7f1866737f406348228cc88fd59b228ce
-  data.tar.gz: 95920756f24cf7dd857f01b1aa3c6b0bb265817c
+  metadata.gz: 332413f00fbe66dc175eb213d174b4e3aa7f67b0
+  data.tar.gz: c5a1b0b0ae51b4ee350289659cb8c6978c455984
 SHA512:
-  metadata.gz: 78009641836391f5b337581d9d49982f9771f5d5c65c1aad42c73ae6a4211699da39b81322da55b7d8402fbfd37c831190bb5b4e110bb5c6de8c81efbd2e4d91
-  data.tar.gz: 5c2915e1e65cdd4e55c572426eee17eac8a2ab03639c238820af4d28bc76d5c20d7ffeb26ea030652ebdf245305ac3af25ec6f11c15e3c939c32f08c54658cce
+  metadata.gz: ba0200e294ce97524fc25d645bfc88fe96c1d4b6c01ffcbafed8d3758d7bf1d02cfdd6eb1fcc672505750e90bb8f051400b2237e65435b7b7655c3a2a3f1df1f
+  data.tar.gz: dc63f5f6b57840fa6609c96c86aa2d1721907ed9b7a681b440c7a227a3d823ffb2746b246276c379545f8257a9c7cb630b8d7ab0d555f8c15b2b3a62af2c10be

data/app/models/europeana/blacklight/document/lang_maps.rb

@@ -43,18 +43,27 @@ module Europeana
           end
 
           def lang_map_value(lang_map, locale)
-            iso_locale = ISO_639.find(locale)
-            return nil unless lang_map.key?(iso_locale.alpha2) || lang_map.key?(iso_locale.alpha3)
+            keys = salient_lang_map_keys(lang_map, locale)
+            return nil unless keys.present?
+            keys.map { |k| lang_map[k] }.flatten.uniq
+          end
 
-            alpha2 = lang_map[iso_locale.alpha2]
-            alpha3 = lang_map[iso_locale.alpha3]
-            if alpha2 && alpha3
-              [alpha2, alpha3].flatten
-            elsif alpha2
-              alpha2
-            else
-              alpha3
-            end
+          protected
+
+          def salient_lang_map_keys(lang_map, locale)
+            iso_code = locale.split('-').first
+            iso_locale = ISO_639.find(iso_code)
+
+            # Favour exact matches
+            keys = lang_map.keys.select do |k|
+              [locale, iso_locale.alpha2, iso_locale.alpha3].include?(k)
+            end.flatten.compact
+            return keys unless keys.blank?
+
+            # Any sub-code will do
+            lang_map.keys.select do |k|
+              k =~ %r{\A#{iso_code}-}
+            end.flatten.compact
           end
         end
 

data/lib/europeana/blacklight/search_builder.rb

@@ -205,8 +205,7 @@ module Europeana
       def api_request_facet_fields
         @api_request_facet_fields ||= blacklight_config.facet_fields.select do |field_name, facet|
           !facet.query &&
-          (facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request)) &&
-          (field_name == 'REUSABILITY' || Europeana::API::Search::Fields.include?(field_name))
+            (facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request))
         end
       end
 

data/lib/europeana/blacklight/version.rb

@@ -1,5 +1,5 @@
 module Europeana
   module Blacklight
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight