From f611c8545f3d8ad8bf47ede3bd798a91527841db Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Tue, 2 Jun 2015 13:48:32 +0400 Subject: [PATCH] improve post_chunk_body method: get rid of initial 401 error and fix Accepted Language header --- .../lib/devops-client/handler/helpers/http_utils.rb | 5 +++-- devops-client/lib/devops-client/i18n.rb | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/devops-client/lib/devops-client/handler/helpers/http_utils.rb b/devops-client/lib/devops-client/handler/helpers/http_utils.rb index 49cd16c..a5119e5 100644 --- a/devops-client/lib/devops-client/handler/helpers/http_utils.rb +++ b/devops-client/lib/devops-client/handler/helpers/http_utils.rb @@ -30,7 +30,8 @@ module HttpUtils h = (json ? self.headers : self.headers("Content-Type", "Accept")) submit do |http| buf = "" - resp = http.post(create_url(path), body, h) do |chunk| + http.force_basic_auth = true + resp = http.post(create_url(path), body: body, header: h) do |chunk| puts chunk buf = chunk end @@ -126,7 +127,7 @@ module HttpUtils "Content-Type" => "application/json; charset=UTF-8" } - h["Accept-Language"] = I18n.lang + h["Accept-Language"] = I18n.locale exclude.each do |key| h.delete(key) end diff --git a/devops-client/lib/devops-client/i18n.rb b/devops-client/lib/devops-client/i18n.rb index 2a3bb51..95576ba 100644 --- a/devops-client/lib/devops-client/i18n.rb +++ b/devops-client/lib/devops-client/i18n.rb @@ -2,8 +2,10 @@ module I18n @@lang = {} + @@locale = '' def self.language= locale + @locale = locale spec = Gem::Specification.find_by_name(DevopsClient::NAME) gem_root = spec.gem_dir path = File.join(gem_root, "locales", "#{locale}.yml") @@ -51,4 +53,8 @@ module I18n @@lang end + def self.locale + @locale + end + end