fedux_org-stdlib 0.6.31 → 0.6.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debe4504f6ce05957dd618b8d1845eec75bf5e12
-  data.tar.gz: 0827b4f70c6aaf190a5e64b0c46c5becc0572147
+  metadata.gz: 69aa01e29157f2d631a407061411cc0d891f9788
+  data.tar.gz: 1ddd3906967616669c60bffcc76c2864e513bd5a
 SHA512:
-  metadata.gz: 714775ebeca90a98700cdddfe0952c762ee00cebbcd07cf4348a49e634928d03774f1c9bc829c99428347265b5e8a8c6d762dad7fc25e84db997713f8aa1d3b5
-  data.tar.gz: cc2ca79b83308f5372634f23da037242bdeece5c0fb573d2206accb75b21cb89cdca73cbc1d4cbbfb5d316875cb2dcc1d5d8b3dead93e5e797f275038563db58
+  metadata.gz: a10a12e181f1ffaba6ff256145963315ff91e4aed7067a67aa161c5098b0d81416019d91787b3f198e6bc8f131c65dd017bf90b34820c6ae305939498d07e2bd
+  data.tar.gz: 646d1ecdaed99374ca92a0871cc7534d034489d90e26f667be7312499e5081a0d6592e4406b30c00db0d849c87cbb03fb233dfddb2c6954cbf0bd185fcabdd3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fedux_org-stdlib (0.6.30)
+    fedux_org-stdlib (0.6.31)
       activesupport
 
 GEM

data/lib/fedux_org_stdlib/shell_language_detector.rb

@@ -22,10 +22,13 @@ module FeduxOrgStdlib
     #
     # @return [Language]
     #    The detected language or the default language if no allowed language was detected
-    def detect(allowed: [])
+    def detect(allowed: [], overwrite: [])
+      allowed   = Array(allowed).map(&:to_sym)
+      overwrite = Array(overwrite).map(&:to_sym)
+
       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? }
-      allowed = Array(allowed).map(&:to_sym)
+      language_code, country_code, encoding = *overwrite if !overwrite.blank? && overwrite.size == 3
 
       return Language.new(language_code: language_code, country_code: country_code, encoding: encoding) if language_code && country_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.6.31'
+  VERSION = '0.6.32'
 end

data/spec/shell_language_detector_spec.rb

@@ -47,5 +47,17 @@ RSpec.describe ShellLanguageDetector do
       expect(language.language_code).to eq :de
       expect(language.country_code).to eq :de
     end
+
+    it 'overwrite detected language' 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: [:nl, :aw, :utf_8]
+
+      expect(language.language_code).to eq :nl
+      expect(language.country_code).to eq :aw
+      expect(language.encoding).to eq :utf_8
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.6.31
+  version: 0.6.32
 platform: ruby
 authors:
 - Max Meyer