Updated verbly (datafile versioning)

2 files changed, 9 insertions, 6 deletions

@@ -73,6 +73,8 @@ int main(int argc, char** argv)
   std::string configfile(argv[1]);
   YAML::Node config = YAML::LoadFile(configfile);
 
+  verbly::database database(config["verbly_datafile"].as<std::string>());
+
   twitter::auth auth;
   auth.setConsumerKey(config["consumer_key"].as<std::string>());
   auth.setConsumerSecret(config["consumer_secret"].as<std::string>());
@@ -81,8 +83,6 @@ int main(int argc, char** argv)
 
   std::set<twitter::user_id> streamedFriends;
 
-  verbly::database database(config["verbly_datafile"].as<std::string>());
-
   twitter::client client(auth);
 
   std::cout << "Starting streaming..." << std::endl;
@@ -155,8 +155,8 @@ int main(int argc, char** argv)
 
                 if (secondAdjective.isValid())
                 {
-                  name << verbly::token::capitalize(firstAdverb);
-                  name << verbly::token::capitalize(secondAdjective);
+                  name << firstAdverb;
+                  name << secondAdjective;
                 }
               }
             }
@@ -170,7 +170,7 @@ int main(int argc, char** argv)
 
               if (firstAdjective.isValid())
               {
-                name = verbly::token::capitalize(firstAdjective);
+                name = firstAdjective;
               }
             }
 
@@ -179,7 +179,10 @@ int main(int argc, char** argv)
             {
               verbly::token action = {
                 "Hi",
-                verbly::token::punctuation(",", name),
+                verbly::token::punctuation(",",
+                  verbly::token::capitalize(
+                    verbly::token::casing::title_case,
+                    name)),
                 "I'm Dad."};
 
               std::string result =
-Subproject 8916c6911c23ca7ff7e78a90b30a295c2b9b9c2
+Subproject 350bfdb5ea9b4f7e50746c50a46d8032cbc5a10