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 dd35131cb740..2c9d087927c1 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 @@ -42,7 +42,7 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig protected String layoutsFolder = viewsFolder + File.separator + "layouts"; protected String binFolder = "bin"; protected String configFolder = "config"; - protected String environmentsFolder = configFolder + File.separator + "config"; + protected String environmentsFolder = configFolder + File.separator + "environments"; protected String initializersFolder = configFolder + File.separator + "initializers"; protected String localesFolder = configFolder + File.separator + "locales"; protected String dbFolder = "db"; @@ -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/Gemfile.lock b/samples/server/petstore/rails5/Gemfile.lock deleted file mode 100644 index f544bc0f702f..000000000000 --- a/samples/server/petstore/rails5/Gemfile.lock +++ /dev/null @@ -1,141 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - nio4r (~> 1.2) - websocket-driver (~> 0.6.1) - actionmailer (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.rc1) - actionview (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) - rack (~> 2.x) - rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.rc1) - activesupport (= 5.0.0.rc1) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.rc1) - activesupport (= 5.0.0.rc1) - globalid (>= 0.3.6) - activemodel (5.0.0.rc1) - activesupport (= 5.0.0.rc1) - activerecord (5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) - arel (~> 7.0) - activesupport (5.0.0.rc1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (7.0.0) - builder (3.2.2) - byebug (9.0.0) - concurrent-ruby (1.0.2) - erubis (2.7.0) - ffi (1.9.10) - globalid (0.3.6) - activesupport (>= 4.1.0) - i18n (0.7.0) - jbuilder (2.4.1) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) - json (1.8.3) - listen (3.0.7) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.12.0) - mysql2 (0.4.4) - nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - puma (3.4.0) - rack (2.0.0.rc1) - json - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.0.rc1) - actioncable (= 5.0.0.rc1) - actionmailer (= 5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activerecord (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.rc1) - sprockets-rails (>= 2.0.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (11.1.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - spring (1.7.1) - spring-watcher-listen (2.0.0) - listen (>= 2.7, < 4.0) - spring (~> 1.2) - sprockets (3.6.0) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.0.4) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (0.19.1) - thread_safe (0.3.5) - tzinfo (1.2.2) - thread_safe (~> 0.1) - websocket-driver (0.6.3) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - byebug - jbuilder (~> 2.0) - listen (~> 3.0.5) - mysql2 (>= 0.3.18, < 0.5) - puma (~> 3.0) - rails (>= 5.0.0.racecar1, < 5.1) - spring - spring-watcher-listen (~> 2.0.0) - tzinfo-data - -BUNDLED WITH - 1.11.2 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 diff --git a/samples/server/petstore/rails5/bin/bundle b/samples/server/petstore/rails5/bin/bundle old mode 100755 new mode 100644 diff --git a/samples/server/petstore/rails5/bin/rails b/samples/server/petstore/rails5/bin/rails old mode 100755 new mode 100644 diff --git a/samples/server/petstore/rails5/bin/rake b/samples/server/petstore/rails5/bin/rake old mode 100755 new mode 100644 diff --git a/samples/server/petstore/rails5/bin/setup b/samples/server/petstore/rails5/bin/setup old mode 100755 new mode 100644 diff --git a/samples/server/petstore/rails5/bin/update b/samples/server/petstore/rails5/bin/update old mode 100755 new mode 100644 diff --git a/samples/server/petstore/rails5/config/config/development.rb b/samples/server/petstore/rails5/config/environments/development.rb similarity index 100% rename from samples/server/petstore/rails5/config/config/development.rb rename to samples/server/petstore/rails5/config/environments/development.rb diff --git a/samples/server/petstore/rails5/config/config/production.rb b/samples/server/petstore/rails5/config/environments/production.rb similarity index 100% rename from samples/server/petstore/rails5/config/config/production.rb rename to samples/server/petstore/rails5/config/environments/production.rb diff --git a/samples/server/petstore/rails5/log/development.log b/samples/server/petstore/rails5/log/development.log deleted file mode 100644 index e69de29bb2d1..000000000000