europeana-blacklight 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 78442f9dbd68b04249c1bb5d6e0820ef4f75d925
4
- data.tar.gz: bfcb4792d1cc6412a5551b76f67706f4b8aa7a6f
3
+ metadata.gz: d64e1e6023e91a1ddcabdaa53da88fd9562503b5
4
+ data.tar.gz: 540b8b4b23d6bcf5d3eae70bf3047d6f30d48537
5
5
  SHA512:
6
- metadata.gz: 0e0cde651009ecd7b881c0f34edc745d2b431a9f4664cf168c9f436521f664b4f08e127d1e5d4efcfa3721bac065a36ea05dd313ad31dd58fd6d0079b9aca9e8
7
- data.tar.gz: c88b697f78b65c586ac09b377e4b166b9c028de0284fc8c22ca7600c202434a069890b70e3cedcbdb57b5a9373285641beb06812860a32d7dea649febc07ab5c
6
+ metadata.gz: 9d09ddc0e3381b9e7e03a782603654fa1cc433f2bf9e8a50d9e8b2f848288891f9b4e8ed4992f4cc17ed1ecdddd559d8bced6f54d7cd266f70a5691763122774
7
+ data.tar.gz: 6e9a01296e3118835a307a74527f544ea961451bceff56f689d2f89080f21cd7b1004bb8a3decf1fe89a0047761ec1a28d7e02ba3d6e933321b603cf785f2ddf
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
22
22
 
23
23
  spec.add_dependency 'activesupport', '>= 4.0', '< 5.0'
24
24
  spec.add_dependency 'blacklight', '>= 5.12.0', '< 6.0.0'
25
- spec.add_dependency 'europeana-api', '~> 0.4.0'
25
+ spec.add_dependency 'europeana-api', '~> 0.4.1'
26
26
  spec.add_dependency 'iso-639', '~> 0.2.5'
27
27
  spec.add_dependency 'kaminari', '~> 0.16'
28
28
 
@@ -38,12 +38,25 @@ module Europeana
38
38
  end
39
39
 
40
40
  return lang_map unless lang_map?(lang_map)
41
- if lang_map.key?(I18n.locale)
42
- lang_map[I18n.locale]
43
- elsif lang_map.key?(:def)
44
- lang_map[:def]
45
- else
41
+
42
+ lang_map_value(lang_map, I18n.locale.to_s) ||
43
+ lang_map_value(lang_map, I18n.default_locale.to_s) ||
44
+ lang_map[:def] ||
46
45
  lang_map.values
46
+ end
47
+
48
+ def lang_map_value(lang_map, locale)
49
+ iso_locale = ISO_639.find(locale)
50
+ return nil unless lang_map.key?(iso_locale.alpha2) || lang_map.key?(iso_locale.alpha3)
51
+
52
+ alpha2 = lang_map[iso_locale.alpha2]
53
+ alpha3 = lang_map[iso_locale.alpha3]
54
+ if alpha2 && alpha3
55
+ [alpha2, alpha3].flatten
56
+ elsif alpha2
57
+ alpha2
58
+ else
59
+ alpha3
47
60
  end
48
61
  end
49
62
 
@@ -1,5 +1,5 @@
1
1
  module Europeana
2
2
  module Blacklight
3
- VERSION = '0.3.0'
3
+ VERSION = '0.3.1'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: europeana-blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Richard Doe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-02 00:00:00.000000000 Z
11
+ date: 2015-11-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -56,14 +56,14 @@ dependencies:
56
56
  requirements:
57
57
  - - "~>"
58
58
  - !ruby/object:Gem::Version
59
- version: 0.4.0
59
+ version: 0.4.1
60
60
  type: :runtime
61
61
  prerelease: false
62
62
  version_requirements: !ruby/object:Gem::Requirement
63
63
  requirements:
64
64
  - - "~>"
65
65
  - !ruby/object:Gem::Version
66
- version: 0.4.0
66
+ version: 0.4.1
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: iso-639
69
69
  requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
227
227
  version: '0'
228
228
  requirements: []
229
229
  rubyforge_project:
230
- rubygems_version: 2.4.8
230
+ rubygems_version: 2.4.5.1
231
231
  signing_key:
232
232
  specification_version: 4
233
233
  summary: Europeana REST API adapter for Blacklight