Merge pull request #57 from Medium/daniel-fmt-upper

fix upper-under formatting
Medium · Aug 17, 2016 · b4d2fa1 · b4d2fa1
2 parents aa19260 + 760ce2b
commit b4d2fa1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -85,7 +85,7 @@ exports.toTitleCase = function(str) {
  * @return {string}
  */
 exports.toUpperUnderscoreCase = function(str) {
-  return String(str).replace(/([A-Z])/g, '_$1').toUpperCase()
+  return String(str).replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase()
 }
 
 

diff --git a/tests/project_test.js b/tests/project_test.js
@@ -174,8 +174,9 @@ builder.add(function testServiceTypeResolution(test) {
 
   var running = shoes.services[0]
   test.equal('shoes.RunningShoe', running.fullName)
-  test.equal('Lace', running.methods[0].name)
-  test.equal('lace', running.methods[0].camelName)
+  test.equal('LaceShoe', running.methods[0].name)
+  test.equal('laceShoe', running.methods[0].camelName)
+  test.equal('LACE_SHOE', running.methods[0].upperUnderscoreName)
   var laceMethod = running.methods[0]
   test.equal('shoes.Shoe', laceMethod.inputTypeDescriptor.fullName)
   test.equal('shoes.FullShoe', laceMethod.outputTypeDescriptor.fullName)

diff --git a/tests/protos/services.proto b/tests/protos/services.proto
@@ -12,6 +12,6 @@ message FullShoe {
 }
 
 service RunningShoe {
-  rpc Lace (Shoe) returns (FullShoe);
+  rpc LaceShoe (Shoe) returns (FullShoe);
   rpc Stride (Shoe) returns (FullShoe);
 }