fedux_org-stdlib 0.7.8 → 0.7.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +4 -4
- data/lib/fedux_org_stdlib/shell_language_detector.rb +1 -1
- data/lib/fedux_org_stdlib/version.rb +1 -1
- data/spec/shell_language_detector_spec.rb +24 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c6accb714d47690536683c37478a0cba690ef126
|
4
|
+
data.tar.gz: 55977a36a0b594a62c54203541dcd697994a6e79
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f4be25d1bd0fddc76b4e04868b7d4a6c1730d3d73bf136f16b5a12f8cd032625a8c4cb2b7a61a09fbf4acad2bcb83da7e1357d14a6cb25f1a04d0e6366e7151e
|
7
|
+
data.tar.gz: 740777d025312675a1800c5d0f4253bf3c1fc491523d2402f1ef5b4201cfe260db2523ea2dbcb65a8a1705926337b6a86675c477149bfd27b98b41edb4b6e037
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fedux_org-stdlib (0.7.
|
4
|
+
fedux_org-stdlib (0.7.10)
|
5
5
|
activesupport
|
6
6
|
|
7
7
|
PATH
|
@@ -18,14 +18,14 @@ GEM
|
|
18
18
|
remote: https://rubygems.org/
|
19
19
|
specs:
|
20
20
|
CFPropertyList (2.2.8)
|
21
|
-
activesupport (4.1.
|
21
|
+
activesupport (4.1.5)
|
22
22
|
i18n (~> 0.6, >= 0.6.9)
|
23
23
|
json (~> 1.7, >= 1.7.7)
|
24
24
|
minitest (~> 5.1)
|
25
25
|
thread_safe (~> 0.1)
|
26
26
|
tzinfo (~> 1.1)
|
27
27
|
addressable (2.3.6)
|
28
|
-
aruba (0.6.
|
28
|
+
aruba (0.6.1)
|
29
29
|
childprocess (>= 0.3.6)
|
30
30
|
cucumber (>= 1.1.1)
|
31
31
|
rspec-expectations (>= 2.7.0)
|
@@ -141,7 +141,7 @@ GEM
|
|
141
141
|
tins (~> 1.0)
|
142
142
|
thor (0.19.1)
|
143
143
|
thread_safe (0.3.4)
|
144
|
-
tins (1.3.
|
144
|
+
tins (1.3.2)
|
145
145
|
tmrb (1.2.7)
|
146
146
|
thor
|
147
147
|
travis-lint (2.0.0)
|
@@ -28,7 +28,7 @@ module FeduxOrgStdlib
|
|
28
28
|
|
29
29
|
lang = environment.fetch 'LANG'
|
30
30
|
language_code, country_code, encoding = lang.scan(/([^_-]+)[_-]([^.]+)\.([A-Za-z0-9_-]*)/i).flatten.map(&:downcase).map { |e| e.gsub('-', '_') }.map { |e| e.to_sym if !e.nil? }
|
31
|
-
language_code, country_code, encoding = *overwrite if !overwrite.blank?
|
31
|
+
language_code, country_code, encoding = *overwrite if !overwrite.blank? && overwrite.none? { |o| o.blank? }
|
32
32
|
|
33
33
|
return Language.new(language_code: language_code, country_code: country_code, encoding: encoding) if language_code && (allowed.blank? || allowed.include?(language_code))
|
34
34
|
Language.new(language_code: default_language_code, country_code: default_country_code, encoding: default_encoding)
|
@@ -59,5 +59,29 @@ RSpec.describe ShellLanguageDetector do
|
|
59
59
|
expect(language.country_code).to eq :aw
|
60
60
|
expect(language.encoding).to eq :utf_8
|
61
61
|
end
|
62
|
+
|
63
|
+
it 'handles empty string in overwrite' do
|
64
|
+
environment = instance_double('FeduxOrgStdlib::ProcessEnvironment')
|
65
|
+
allow(environment).to receive(:fetch).and_return 'en_GB.UTF-8'
|
66
|
+
|
67
|
+
detector = ShellLanguageDetector.new environment: environment, default_country_code: :de, default_language_code: :de
|
68
|
+
language = detector.detect allowed: [:de, :nl, :''], overwrite: ''
|
69
|
+
|
70
|
+
expect(language.language_code).to eq :de
|
71
|
+
expect(language.country_code).to eq :de
|
72
|
+
expect(language.encoding).to eq :utf_8
|
73
|
+
end
|
74
|
+
|
75
|
+
it 'handles nil in overwrite' do
|
76
|
+
environment = instance_double('FeduxOrgStdlib::ProcessEnvironment')
|
77
|
+
allow(environment).to receive(:fetch).and_return 'en_GB.UTF-8'
|
78
|
+
|
79
|
+
detector = ShellLanguageDetector.new environment: environment, default_country_code: :de, default_language_code: :de
|
80
|
+
language = detector.detect allowed: [:de, :nl, :''], overwrite: nil
|
81
|
+
|
82
|
+
expect(language.language_code).to eq :de
|
83
|
+
expect(language.country_code).to eq :de
|
84
|
+
expect(language.encoding).to eq :utf_8
|
85
|
+
end
|
62
86
|
end
|
63
87
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fedux_org-stdlib
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Max Meyer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|