Modified the format for default values of function identifiers.

Header file default value: Input file name (without extension)
Identifier default value: Based on input file. Format is "NameExt"
For #51 and #58.

Author: end2endzone

README.md

@@ -196,7 +196,7 @@ namespace bin2cpp
     virtual bool save(const char * filename) const = 0;
   };
   #endif //BIN2CPP_EMBEDDEDFILE_CLASS
-  const File & getHelloworldhtmlFile();
+  const File & getHelloworldHtmlFile();
 }; //bin2cpp
 
 #endif //HELLOWORLD_H
@@ -222,11 +222,11 @@ namespace bin2cpp
 #include <fstream>  //for ofstream
 namespace bin2cpp
 {
-  class HelloworldhtmlFile : public virtual bin2cpp::File
+  class HelloworldHtmlFile : public virtual bin2cpp::File
   {
   public:
-    HelloworldhtmlFile() { build(); }
-    virtual ~HelloworldhtmlFile() {}
+    HelloworldHtmlFile() { build(); }
+    virtual ~HelloworldHtmlFile() {}
     virtual size_t getSize() const { return 238; }
     virtual const char * getFileName() const { return "helloworld.html"; }
     virtual const char * getFilePath() const { return getFileName(); }
@@ -251,7 +251,7 @@ namespace bin2cpp
   private:
     std::string mBuffer;
   };
-  const File & getHelloworldhtmlFile() { static HelloworldhtmlFile _instance; return _instance; }
+  const File & getHelloworldHtmlFile() { static HelloworldHtmlFile _instance; return _instance; }
 }; //bin2cpp
 ```
 

samples/demo_helloworld/demo_helloworld.cpp

@@ -7,7 +7,7 @@
 int main(int argc, char* argv[])
 {
   //get a reference to the embedded file
-  const bin2cpp::File & resource = bin2cpp::getHelloworldhtmlFile();
+  const bin2cpp::File & resource = bin2cpp::getHelloworldHtmlFile();
 
   //print information about the file.
   std::cout << "Embedded file '" << resource.getFileName() << "' is " << resource.getSize() << " bytes long.\n";

src/bin2cpp/common.cpp

@@ -157,8 +157,12 @@ namespace bin2cpp
   {
     std::string id;
 
-    //get filename of the given path
-    id = ra::filesystem::GetFilename(path.c_str());
+    //build default id
+    std::string name = ra::filesystem::GetFilenameWithoutExtension(path.c_str());
+    std::string ext  = ra::filesystem::GetFileExtention(path.c_str());
+    name = ra::strings::CapitalizeFirstCharacter(name);
+    ext  = ra::strings::CapitalizeFirstCharacter(ext );
+    id = name + ext;
 
     //filter out characters which are not alphanumeric characters or '_'.
     static const std::string validCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";

test/bin2cpp_unittest/TestExtraction.cpp

@@ -562,7 +562,7 @@ TEST_F(TestExtraction, testIssue56a)
   std::string output_path1234 = "generated_files/testIssue56a/saved_files/_testIssue56a.index.1234.css";
   {
     ra::filesystem::NormalizePath(output_path1234);
-    const issue56a::File & file = issue56a::get_testIssue56aindex1234cssFile();
+    const issue56a::File & file = issue56a::get_testIssue56aindex1234CssFile();
     bool extractSuccess = file.save(output_path1234.c_str());
     ASSERT_TRUE(extractSuccess);
   }
@@ -571,7 +571,7 @@ TEST_F(TestExtraction, testIssue56a)
   std::string output_path4321 = "generated_files/testIssue56a/saved_files/_testIssue56a.index.4321.css";
   {
     ra::filesystem::NormalizePath(output_path4321);
-    const issue56a::File & file = issue56a::get_testIssue56aindex4321cssFile();
+    const issue56a::File & file = issue56a::get_testIssue56aindex4321CssFile();
     bool extractSuccess = file.save(output_path4321.c_str());
     ASSERT_TRUE(extractSuccess);
   }