fedux_org-stdlib 0.7.8 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19917176440600aaa251a693ac8ad01e49582c4
-  data.tar.gz: d80b5b60c400e61aa160528a61c877fc06ff888c
+  metadata.gz: c6accb714d47690536683c37478a0cba690ef126
+  data.tar.gz: 55977a36a0b594a62c54203541dcd697994a6e79
 SHA512:
-  metadata.gz: 60702f15f704c95209400113ea6706b54af6f6c1c82d2a86aa5e3142cdf5630ce5f73c5fb6be3366b98248841fec1fa0e98eb424f7235c04d069bda81aa8fa47
-  data.tar.gz: 0676f7902a5b1dd69a302583dc894b3c3884e50fff45f0f8afd86c7cf2518f9c5fd866a8ded9714ed481a04312aeed85795b9c88143d0dea646cb7b79f518189
+  metadata.gz: f4be25d1bd0fddc76b4e04868b7d4a6c1730d3d73bf136f16b5a12f8cd032625a8c4cb2b7a61a09fbf4acad2bcb83da7e1357d14a6cb25f1a04d0e6366e7151e
+  data.tar.gz: 740777d025312675a1800c5d0f4253bf3c1fc491523d2402f1ef5b4201cfe260db2523ea2dbcb65a8a1705926337b6a86675c477149bfd27b98b41edb4b6e037

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.7.7)
+    fedux_org-stdlib (0.7.10)
       activesupport
 
 PATH
@@ -18,14 +18,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    activesupport (4.1.4)
+    activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.6)
-    aruba (0.6.0)
+    aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
@@ -141,7 +141,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.4)
-    tins (1.3.1)
+    tins (1.3.2)
     tmrb (1.2.7)
       thor
     travis-lint (2.0.0)

data/lib/fedux_org_stdlib/shell_language_detector.rb

@@ -28,7 +28,7 @@ module FeduxOrgStdlib
 
       lang = environment.fetch 'LANG'
       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? }
-      language_code, country_code, encoding = *overwrite if !overwrite.blank?
+      language_code, country_code, encoding = *overwrite if !overwrite.blank? && overwrite.none? { |o| o.blank? } 
 
       return Language.new(language_code: language_code, country_code: country_code, encoding: encoding) if language_code && (allowed.blank? || allowed.include?(language_code))
       Language.new(language_code: default_language_code, country_code: default_country_code, encoding: default_encoding)

data/lib/fedux_org_stdlib/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # FeduxOrgStdlib
 module FeduxOrgStdlib
-  VERSION = '0.7.8'
+  VERSION = '0.7.10'
 end

data/spec/shell_language_detector_spec.rb

@@ -59,5 +59,29 @@ RSpec.describe ShellLanguageDetector do
       expect(language.country_code).to eq :aw
       expect(language.encoding).to eq :utf_8
     end
+
+    it 'handles empty string in overwrite' do
+      environment = instance_double('FeduxOrgStdlib::ProcessEnvironment')
+      allow(environment).to receive(:fetch).and_return 'en_GB.UTF-8'
+
+      detector = ShellLanguageDetector.new environment: environment, default_country_code: :de, default_language_code: :de
+      language = detector.detect allowed: [:de, :nl, :''], overwrite: ''
+
+      expect(language.language_code).to eq :de
+      expect(language.country_code).to eq :de
+      expect(language.encoding).to eq :utf_8
+    end
+
+    it 'handles nil in overwrite' do
+      environment = instance_double('FeduxOrgStdlib::ProcessEnvironment')
+      allow(environment).to receive(:fetch).and_return 'en_GB.UTF-8'
+
+      detector = ShellLanguageDetector.new environment: environment, default_country_code: :de, default_language_code: :de
+      language = detector.detect allowed: [:de, :nl, :''], overwrite: nil
+
+      expect(language.language_code).to eq :de
+      expect(language.country_code).to eq :de
+      expect(language.encoding).to eq :utf_8
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.10
 platform: ruby
 authors:
 - Max Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport