Merge lp:~dobey/unity-scope-click/accept-language into lp:unity-scope-click/devel

[dobey]

Create a valid string for the Accept-Language HTTP header.
Add the Accept-Language header by default to all HTTP requests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/32/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Nice, looks good!

review: Approve

=== modified file 'scope/click/configuration.cpp'
--- scope/click/configuration.cpp	2014-04-28 15:02:17 +0000
+++ scope/click/configuration.cpp	2014-05-01 21:06:15 +0000
@@ -34,6 +34,7 @@
 #include <QProcess>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/replace.hpp>
 
 #include "configuration.h"
 
@@ -105,4 +106,19 @@
     return lang_parts[0];
 }
 
+std::string Configuration::get_accept_languages()
+{
+    std::string language = get_language();
+    std::vector<std::string> lang_parts;
+    boost::split(lang_parts, language, boost::is_any_of("_"));
+    std::string result;
+    if (lang_parts.size() > 1) {
+        boost::replace_first(language, "_", "-");
+        result = language + ", " + get_language_base();
+    } else {
+        result = language;
+    }
+    return result;
+}
+
 } // namespace click

=== modified file 'scope/click/configuration.h'
--- scope/click/configuration.h	2014-04-25 17:17:22 +0000
+++ scope/click/configuration.h	2014-05-01 21:06:15 +0000
@@ -49,6 +49,7 @@
 
     virtual std::string get_language_base();
     virtual std::string get_language();
+    virtual std::string get_accept_languages();
 
     virtual ~Configuration() {}
 protected:

=== modified file 'scope/click/webclient.cpp'
--- scope/click/webclient.cpp	2014-04-29 03:38:05 +0000
+++ scope/click/webclient.cpp	2014-05-01 21:06:15 +0000
@@ -30,6 +30,7 @@
 #include <QBuffer>
 #include <QDebug>
 
+#include "configuration.h"
 #include "webclient.h"
 #include "smartconnect.h"
 
@@ -93,6 +94,10 @@
     QSharedPointer<QBuffer> buffer(new QBuffer());
     buffer->setData(data.c_str(), data.length());
 
+    // Set the Accept-Language header for all requests.
+    request->setRawHeader(ACCEPT_LANGUAGE_HEADER.c_str(),
+                          Configuration().get_accept_languages().c_str());
+
     for (const auto& kv : headers) {
         QByteArray header_name(kv.first.c_str(), kv.first.length());
         QByteArray header_value(kv.second.c_str(), kv.second.length());

=== modified file 'scope/click/webclient.h'
--- scope/click/webclient.h	2014-04-29 03:17:38 +0000
+++ scope/click/webclient.h	2014-05-01 21:06:15 +0000
@@ -49,6 +49,7 @@
 namespace web
 {
 
+const std::string ACCEPT_LANGUAGE_HEADER ="Accept-Language";
 const std::string AUTHORIZATION_HEADER = "Authorization";
 const std::string CONTENT_TYPE_HEADER = "Content-Type";
 

=== modified file 'scope/tests/test_configuration.cpp'
--- scope/tests/test_configuration.cpp	2014-04-28 15:02:17 +0000
+++ scope/tests/test_configuration.cpp	2014-05-01 21:06:15 +0000
@@ -132,16 +132,43 @@
     ASSERT_EQ(Configuration().get_language_base(), "C");
 }
 
-TEST(Configuration, getLanguageBasNoCharseteCorrect)
-{
-    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US", 1), 0);
-    EXPECT_EQ(Configuration().get_language_base(), "en");
-    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
-}
-
-TEST(Configuration, getLanguageBasNoRegionOrCharseteCorrect)
-{
-    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en", 1), 0);
-    EXPECT_EQ(Configuration().get_language_base(), "en");
+TEST(Configuration, getLanguageBaseNoCharseteCorrect)
+{
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US", 1), 0);
+    EXPECT_EQ(Configuration().get_language_base(), "en");
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(Configuration, getLanguageBaseNoRegionOrCharseteCorrect)
+{
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en", 1), 0);
+    EXPECT_EQ(Configuration().get_language_base(), "en");
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(Configuration, getAcceptLanguagesCorrect)
+{
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
+    EXPECT_EQ(Configuration().get_accept_languages(), "en-US, en");
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(Configuration, getAcceptLanguagesUnsetFallback)
+{
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+    ASSERT_EQ(Configuration().get_accept_languages(), "C");
+}
+
+TEST(Configuration, getAcceptLanguagesNoCharseteCorrect)
+{
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US", 1), 0);
+    EXPECT_EQ(Configuration().get_accept_languages(), "en-US, en");
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(Configuration, getAcceptLanguagesNoRegionOrCharseteCorrect)
+{
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en", 1), 0);
+    EXPECT_EQ(Configuration().get_accept_languages(), "en");
     ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
 }

=== modified file 'scope/tests/test_webclient.cpp'
--- scope/tests/test_webclient.cpp	2014-04-29 03:38:05 +0000
+++ scope/tests/test_webclient.cpp	2014-05-01 21:06:15 +0000
@@ -28,6 +28,7 @@
  */
 #include <QDebug>
 
+#include "click/configuration.h"
 #include "click/webclient.h"
 
 #include "mock_network_access_manager.h"
@@ -50,6 +51,12 @@
         .startsWith("OAuth ");
 }
 
+MATCHER_P(IsCorrectAcceptLanguageHeader, refAcceptLanguages, "")
+{
+    return arg.hasRawHeader(click::web::ACCEPT_LANGUAGE_HEADER.c_str()) &&
+        arg.rawHeader(click::web::ACCEPT_LANGUAGE_HEADER.c_str()) == refAcceptLanguages;
+}
+
 MATCHER_P(IsCorrectCookieHeader, refCookie, "")
 {
     return arg.hasRawHeader("Cookie") && arg.rawHeader("Cookie") == refCookie;
@@ -333,3 +340,23 @@
     EXPECT_CALL(*reply, abort()).Times(1);
     response->abort();
 }
+
+TEST_F(WebClientTest, testAcceptLanguageSetCorrectly)
+{
+    using namespace ::testing;
+
+    auto reply = new NiceMock<MockNetworkReply>();
+    ON_CALL(*reply, readAll()).WillByDefault(Return("HOLA"));
+    QSharedPointer<click::network::Reply> replyPtr(reply);
+
+    click::web::Client wc(namPtr);
+
+    ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
+                     "en_US.UTF-8", 1), 0);
+    EXPECT_CALL(nam, sendCustomRequest(IsCorrectAcceptLanguageHeader("en-US, en"), _, _))
+            .Times(1)
+            .WillOnce(Return(replyPtr));
+
+    auto wr = wc.call(FAKE_SERVER + FAKE_PATH);
+    ASSERT_EQ(unsetenv(click::Configuration::LANGUAGE_ENVVAR), 0);
+}