From ddc4b0a5482d382454a3e732ff3b88976d9e9075 Mon Sep 17 00:00:00 2001
From: xhh <xhh@xhh.me>
Date: Sat, 12 Dec 2015 21:33:32 +0800
Subject: [PATCH] Ruby: place properties on separate lines with description

---
 .../src/main/resources/ruby/model.mustache     |  9 +++++----
 .../ruby/lib/petstore/models/category.rb       |  4 +++-
 .../petstore/ruby/lib/petstore/models/order.rb | 14 ++++++++++++--
 .../petstore/ruby/lib/petstore/models/pet.rb   | 14 ++++++++++++--
 .../petstore/ruby/lib/petstore/models/tag.rb   |  4 +++-
 .../petstore/ruby/lib/petstore/models/user.rb  | 18 ++++++++++++++++--
 6 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
index 5d4eb954767..f253a2c0e60 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache
@@ -1,13 +1,14 @@
 module {{moduleName}}{{#models}}{{#model}}{{#description}}
   # {{{description}}}{{/description}}
-  class {{classname}} < BaseObject
-    attr_accessor {{#vars}}:{{{name}}}{{#hasMore}}, {{/hasMore}}{{/vars}}{{newline}}
+  class {{classname}} < BaseObject{{#vars}}{{#description}}
+    # {{{description}}}{{/description}}
+    attr_accessor :{{{name}}}
+{{/vars}}
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        {{#vars}}{{#description}}
-        # {{{description}}}{{/description}}
+        {{#vars}}
         :'{{{name}}}' => :'{{{baseName}}}'{{#hasMore}},{{/hasMore}}
         {{/vars}}
       }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb
index 8864ad10f75..e223e747e74 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/category.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb
@@ -1,6 +1,8 @@
 module Petstore
   class Category < BaseObject
-    attr_accessor :id, :name
+    attr_accessor :id
+
+    attr_accessor :name
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb
index 59c84f65666..19a33d1cfc3 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb
@@ -1,6 +1,17 @@
 module Petstore
   class Order < BaseObject
-    attr_accessor :id, :pet_id, :quantity, :ship_date, :status, :complete
+    attr_accessor :id
+
+    attr_accessor :pet_id
+
+    attr_accessor :quantity
+
+    attr_accessor :ship_date
+
+    # Order Status
+    attr_accessor :status
+
+    attr_accessor :complete
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -14,7 +25,6 @@ module Petstore
         
         :'ship_date' => :'shipDate',
         
-        # Order Status
         :'status' => :'status',
         
         :'complete' => :'complete'
diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
index 303a12d702c..fb967cbbab4 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb
@@ -1,6 +1,17 @@
 module Petstore
   class Pet < BaseObject
-    attr_accessor :id, :category, :name, :photo_urls, :tags, :status
+    attr_accessor :id
+
+    attr_accessor :category
+
+    attr_accessor :name
+
+    attr_accessor :photo_urls
+
+    attr_accessor :tags
+
+    # pet status in the store
+    attr_accessor :status
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -16,7 +27,6 @@ module Petstore
         
         :'tags' => :'tags',
         
-        # pet status in the store
         :'status' => :'status'
         
       }
diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
index 06d779c2c54..681c2a2a5c9 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb
@@ -1,6 +1,8 @@
 module Petstore
   class Tag < BaseObject
-    attr_accessor :id, :name
+    attr_accessor :id
+
+    attr_accessor :name
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb
index 1b49db1c96b..ca00bf34be1 100644
--- a/samples/client/petstore/ruby/lib/petstore/models/user.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb
@@ -1,6 +1,21 @@
 module Petstore
   class User < BaseObject
-    attr_accessor :id, :username, :first_name, :last_name, :email, :password, :phone, :user_status
+    attr_accessor :id
+
+    attr_accessor :username
+
+    attr_accessor :first_name
+
+    attr_accessor :last_name
+
+    attr_accessor :email
+
+    attr_accessor :password
+
+    attr_accessor :phone
+
+    # User Status
+    attr_accessor :user_status
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -20,7 +35,6 @@ module Petstore
         
         :'phone' => :'phone',
         
-        # User Status
         :'user_status' => :'userStatus'
         
       }