From a2080810f8d1b0767247f581da4d214c3a5df12a Mon Sep 17 00:00:00 2001
From: Phillip Novess <phillip@novess.com>
Date: Mon, 24 Apr 2017 05:16:10 -0500
Subject: [PATCH] updated to fix issue #5053 (#5057)

* updated to fix issue #5053

* updated test
---
 .../io/swagger/codegen/languages/Rails5ServerCodegen.java     | 4 ++--
 .../app/controllers/{pets_controller.rb => pet_controller.rb} | 0
 .../controllers/{stores_controller.rb => store_controller.rb} | 0
 .../controllers/{users_controller.rb => user_controller.rb}   | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename samples/server/petstore/rails5/app/controllers/{pets_controller.rb => pet_controller.rb} (100%)
 rename samples/server/petstore/rails5/app/controllers/{stores_controller.rb => store_controller.rb} (100%)
 rename samples/server/petstore/rails5/app/controllers/{users_controller.rb => user_controller.rb} (100%)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
index dd35131cb74..61eef3fba02 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Rails5ServerCodegen.java
@@ -186,7 +186,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
     }
 
     @Override
-    public String escapeReservedWord(String name) {           
+    public String escapeReservedWord(String name) {
         if(this.reservedWordsMappings().containsKey(name)) {
             return this.reservedWordsMappings().get(name);
         }
@@ -285,7 +285,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
         name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. DefaultController => defaults_controller.rb
-        return underscore(name) + "s_controller";
+        return underscore(name) + "_controller";
     }
 
     @Override
diff --git a/samples/server/petstore/rails5/app/controllers/pets_controller.rb b/samples/server/petstore/rails5/app/controllers/pet_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/pets_controller.rb
rename to samples/server/petstore/rails5/app/controllers/pet_controller.rb
diff --git a/samples/server/petstore/rails5/app/controllers/stores_controller.rb b/samples/server/petstore/rails5/app/controllers/store_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/stores_controller.rb
rename to samples/server/petstore/rails5/app/controllers/store_controller.rb
diff --git a/samples/server/petstore/rails5/app/controllers/users_controller.rb b/samples/server/petstore/rails5/app/controllers/user_controller.rb
similarity index 100%
rename from samples/server/petstore/rails5/app/controllers/users_controller.rb
rename to samples/server/petstore/rails5/app/controllers/user_controller.rb