1 files changed, 19 insertions, 82 deletions

@@ -1,35 +1,27 @@
 #include "configuration.h"
 #include <json.hpp>
 #include <cassert>
-
-using nlohmann::json;
+#include "codes.h"
 
 namespace twitter {
   
-  configuration::configuration()
+  configuration::configuration(std::string data) try
   {
-    _valid = false;
-  }
-  
-  configuration::configuration(std::string data)
-  {
-    _valid = true;
-    
-    auto _data = json::parse(data);
+    auto json_data = nlohmann::json::parse(data);
     
-    _characters_reserved_per_media = _data.at("characters_reserved_per_media");
-    _dm_text_character_limit = _data.at("dm_text_character_limit");
-    _max_media_per_upload = _data.at("max_media_per_upload");
-    _photo_size_limit = _data.at("photo_size_limit");
-    _short_url_length = _data.at("short_url_length");
-    _short_https_url_length = _data.at("short_url_length_https");
+    _characters_reserved_per_media = json_data["characters_reserved_per_media"].get<size_t>();
+    _dm_text_character_limit = json_data["dm_text_character_limit"].get<size_t>();
+    _max_media_per_upload = json_data["max_media_per_upload"].get<size_t>();
+    _photo_size_limit = json_data["photo_size_limit"].get<size_t>();
+    _short_url_length = json_data["short_url_length"].get<size_t>();
+    _short_https_url_length = json_data["short_url_length_https"].get<size_t>();
     
-    for (json::iterator sizedata = _data.at("photo_sizes").begin(); sizedata != _data.at("photo_sizes").end(); ++sizedata)
+    for (auto sizedata = std::begin(json_data["photo_sizes"]); sizedata != std::end(json_data["photo_sizes"]); ++sizedata)
     {
       photosize size;
-      size.height = sizedata.value().at("h");
-      size.width = sizedata.value().at("w");
-      if (sizedata.value().at("resize") == "fit")
+      size.height = sizedata.value()["h"].get<size_t>();
+      size.width = sizedata.value()["w"].get<size_t>();
+      if (sizedata.value()["resize"].get<std::string>() == "fit")
       {
         size.resize = resizetype::fit;
       } else {
@@ -39,71 +31,16 @@ namespace twitter {
       _photo_sizes[sizedata.key()] = size;
     }
     
-    for (auto path : _data.at("non_username_paths"))
+    for (auto path : json_data["non_username_paths"])
     {
       _non_username_paths.insert(path.get<std::string>());
     }
-  }
-  
-  size_t configuration::getCharactersReservedPerMedia() const
-  {
-    assert(_valid);
-    
-    return _characters_reserved_per_media;
-  }
-  
-  size_t configuration::getDirectMessageCharacterLimit() const
-  {
-    assert(_valid);
-    
-    return _dm_text_character_limit;
-  }
-  
-  size_t configuration::getMaxMediaPerUpload() const
-  {
-    assert(_valid);
-    
-    return _max_media_per_upload;
-  }
-  
-  size_t configuration::getPhotoSizeLimit() const
-  {
-    assert(_valid);
-    
-    return _photo_size_limit;
-  }
-  
-  std::map<std::string, configuration::photosize> configuration::getPhotoSizes() const
-  {
-    assert(_valid);
-    
-    return _photo_sizes;
-  }
-  
-  size_t configuration::getShortUrlLength() const
-  {
-    assert(_valid);
-    
-    return _short_url_length;
-  }
-  
-  size_t configuration::getShortHttpsUrlLength() const
-  {
-    assert(_valid);
-    
-    return _short_https_url_length;
-  }
-  
-  std::set<std::string> configuration::getNonUsernamePaths() const
+  } catch (const std::invalid_argument& error)
   {
-    assert(_valid);
-    
-    return _non_username_paths;
-  }
-  
-  configuration::operator bool() const
+    std::throw_with_nested(malformed_object("configuration", data));
+  } catch (const std::domain_error& error)
   {
-    return _valid;
+    std::throw_with_nested(malformed_object("configuration", data));
   }
-  
+
 };