europeana-blacklight 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332413f00fbe66dc175eb213d174b4e3aa7f67b0
-  data.tar.gz: c5a1b0b0ae51b4ee350289659cb8c6978c455984
+  metadata.gz: d3b33734136e3321b7c3bad989be93690a479f98
+  data.tar.gz: 9a074bd2838c7eebfb1e2a6aca9f9191fc98d9c0
 SHA512:
-  metadata.gz: ba0200e294ce97524fc25d645bfc88fe96c1d4b6c01ffcbafed8d3758d7bf1d02cfdd6eb1fcc672505750e90bb8f051400b2237e65435b7b7655c3a2a3f1df1f
-  data.tar.gz: dc63f5f6b57840fa6609c96c86aa2d1721907ed9b7a681b440c7a227a3d823ffb2746b246276c379545f8257a9c7cb630b8d7ab0d555f8c15b2b3a62af2c10be
+  metadata.gz: bb07e72f2e73a96b03efa331cdd5262a3074eae8afa9d6ff83ba1d3238e28e40fd959565e6d555317d2892c1873bdcf86fced824d3c72e0300b9e9f9a8eb6621
+  data.tar.gz: 0d5fc80c5518a447e195b19f01fee849d7bb6faac3df87956e1c8feaad5654e8f17e52f81edcde9576f88e398838a202049b14622452d7e4065df3bad226a55b

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

@@ -13,6 +13,7 @@ module Europeana
       include MoreLikeThis
       include Relations
 
+      attr_reader :root
       attr_writer :provider_id, :record_id
 
       class << self
@@ -23,8 +24,9 @@ module Europeana
         end
       end
 
-      def initialize(source_doc = {}, response = nil)
+      def initialize(source_doc = {}, response = nil, root = self)
         fields, @relations = extract_relations(source_doc)
+        @root = root
         super(fields, response)
       end
 
@@ -41,7 +43,7 @@ module Europeana
         else
           super
         end
-        Document.localize_lang_map(value)
+        localize_lang_map(value)
       end
 
       def respond_to?(*args)

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

@@ -5,8 +5,6 @@ module Europeana
       # Methods for working with "LangMap" data types in API JSON responses
       # @see http://labs.europeana.eu/api/getting-started#datatypes
       module LangMaps
-        extend ActiveSupport::Concern
-
         # @see https://www.loc.gov/standards/iso639-2/php/code_changes.php
         DEPRECATED_ISO_LANG_CODES = %w(in iw jaw ji jw mo mol scc scr sh)
 
@@ -15,59 +13,72 @@ module Europeana
         #   output; remove when fixed at source
         NON_ISO_LANG_CODES = ['def', '']
 
-        class_methods do
-          # @todo Are three-letter language codes valid in EDM?
-          def lang_map?(obj)
-            return false unless obj.is_a?(Hash)
-            obj.keys.map(&:to_s).all? { |key| known_lang_map_key?(key) }
-          end
+        # @todo Are three-letter language codes valid in EDM?
+        def lang_map?(obj)
+          return false unless obj.is_a?(Hash)
+          obj.keys.map(&:to_s).all? { |key| known_lang_map_key?(key) }
+        end
 
-          def known_lang_map_key?(key)
-            key = key.dup.downcase
-            DEPRECATED_ISO_LANG_CODES.include?(key) ||
-              NON_ISO_LANG_CODES.include?(key) ||
-              (!ISO_639.find(key.split('-').first).nil?)
+        def known_lang_map_key?(key)
+          key = key.dup.downcase
+          DEPRECATED_ISO_LANG_CODES.include?(key) ||
+            NON_ISO_LANG_CODES.include?(key) ||
+            !ISO_639.find(key.split('-').first).nil?
+        end
+
+        def localize_lang_map(lang_map)
+          if lang_map.is_a?(Array)
+            return lang_map.map { |l| localize_lang_map(l) }
           end
 
-          def localize_lang_map(lang_map)
-            if lang_map.is_a?(Array)
-              return lang_map.map { |l| localize_lang_map(l) }
-            end
+          return lang_map unless lang_map?(lang_map)
 
-            return lang_map unless lang_map?(lang_map)
+          lang_map_value(lang_map, I18n.locale.to_s) ||
+            lang_map_value(lang_map, I18n.default_locale.to_s) ||
+            dereferenced_lang_map_value(lang_map[:def]) ||
+            lang_map.values
+        end
 
-            lang_map_value(lang_map, I18n.locale.to_s) ||
-              lang_map_value(lang_map, I18n.default_locale.to_s) ||
-              lang_map[:def] ||
-              lang_map.values
+        def lang_map_value(lang_map, locale)
+          keys = salient_lang_map_keys(lang_map, locale)
+          return nil unless keys.present?
+          keys.map { |k| lang_map[k] }.flatten.uniq
+        end
+
+        def dereferenced_lang_map_value(value)
+          return nil if value.nil?
+
+          if value.is_a?(Array)
+            return value.map { |v| dereferenced_lang_map_value(v) }
           end
 
-          def lang_map_value(lang_map, locale)
-            keys = salient_lang_map_keys(lang_map, locale)
-            return nil unless keys.present?
-            keys.map { |k| lang_map[k] }.flatten.uniq
+          return value unless value.is_a?(String)
+
+          concept = root.fetch('concepts', []).detect { |c| c[:about] == value }
+          if concept.present? && concept.key?(:prefLabel)
+            localize_lang_map(concept[:prefLabel])
+          else
+            return value
           end
+        end
 
-          protected
+        protected
 
-          def salient_lang_map_keys(lang_map, locale)
-            iso_code = locale.split('-').first
-            iso_locale = ISO_639.find(iso_code)
+        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?
+          # 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
+          # Any sub-code will do
+          lang_map.keys.select do |k|
+            k =~ %r{\A#{iso_code}-}
+          end.flatten.compact
         end
-
-        delegate :lang_map?, :localize_lang_map, to: :class
       end
     end
   end

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

@@ -24,9 +24,9 @@ module Europeana
           relation_keys.each do |k|
             if source_doc.key?(k)
               if source_doc[k].is_a?(Hash)
-                relations[k] = self.class.new(source_doc[k], nil)
+                relations[k] = self.class.new(source_doc[k], nil, self)
               elsif source_doc[k].is_a?(Array)
-                relations[k] = source_doc[k].map { |v| self.class.new(v, nil) }
+                relations[k] = source_doc[k].map { |v| self.class.new(v, nil, self) }
               else
                 fail StandardError,
                      'Relations should be a collection of objects.'

data/app/presenters/europeana/blacklight/document_presenter.rb

@@ -29,7 +29,7 @@ module Europeana
       end
 
       def get_field_values(field, field_config, options = {})
-        Document.localize_lang_map(super)
+        @document.localize_lang_map(super)
       end
     end
   end

data/lib/europeana/blacklight/version.rb

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

data/spec/models/europeana/blacklight/document_spec.rb

@@ -51,11 +51,11 @@ RSpec.describe Europeana::Blacklight::Document do
     it { is_expected.to eq('Document') }
   end
 
-  describe '.lang_map?' do
+  describe '#lang_map?' do
     context 'when not a Hash' do
       it 'returns false' do
         [nil, 0, 1, 'xyz', Array].each do |arg|
-          expect(described_class.lang_map?(arg)).to eq(false)
+          expect(subject.lang_map?(arg)).to eq(false)
         end
       end
     end
@@ -63,20 +63,17 @@ RSpec.describe Europeana::Blacklight::Document do
     context 'when a Hash' do
       context 'when full EDM' do
         it 'returns false' do
-          expect(described_class.lang_map?(edm)).to eq(false)
+          expect(subject.lang_map?(edm)).to eq(false)
         end
       end
       context 'when a record relation' do
         it 'returns false' do
-          expect(described_class.lang_map?(edm[:proxies].first)).to eq(false)
+          expect(subject.lang_map?(edm[:proxies].first)).to eq(false)
         end
       end
     end
   end
 
-  it { is_expected.to delegate_method(:lang_map?).to(:class) }
-  it { is_expected.to delegate_method(:localize_lang_map).to(:class) }
-
   describe '#provider_id' do
     it 'returns first part of ID' do
       expect(subject.provider_id).to eq('abc')

metadata

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