Fix patterns for trimming whitespace

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!-- ## master (unreleased) -->
 
+## 0.5.4 (2019-12-09)
+
+### Changed
+
+- Improve regular expressions for trimming trailing whitespace.
+
 ## 0.5.3 (2019-12-09)
 
 ### Changed

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ginny (0.5.3)
+    ginny (0.5.4)
       coolkit (~> 0.2.2)
       dry-inflector (~> 0.2.0)
 

lib/ginny/models/class.rb

@@ -70,10 +70,10 @@ def render()
       parts << (self.body&.length&.positive? ? self.body.indent(2) : nil)
       parts << "end"
       if self.modules.length > 0
-        body = parts.compact.join("\n").gsub(/(\s+)$/, "")
+        body = parts.compact.join("\n").gsub(/([[:blank:]]+)$/, "")
         return Ginny.mod(body, self.modules)
       end
-      return parts.compact.join("\n").gsub(/(\s+)$/, "")
+      return parts.compact.join("\n").gsub(/([[:blank:]]+)$/, "")
     end
 
     # @return [String]

lib/ginny/version.rb

@@ -1,3 +1,3 @@
 module Ginny
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.4".freeze
 end

test/ginny/class_test.rb

@@ -127,4 +127,48 @@ def initialize()
     assert_equal(want.strip, have.strip)
   end
 
+  def test_preserving_newlines
+    want = <<~RUBY.strip
+      module Eddy
+        module Elements
+          class SecurityInformationQualifier < Eddy::Element::ID
+            # @return [void]
+            def initialize()
+              @id = "I03"
+            end
+
+            # @return [Array<String>]
+            def code_list()
+              return [
+                "00",
+                "01"
+              ]
+            end
+          end
+        end
+      end
+    RUBY
+    constructor = Ginny::Func.create({
+      name: "initialize",
+      body: '@id = "I03"',
+    }).render()
+    code_list = Ginny::Func.create({
+      name: "code_list",
+      return_type: "Array<String>",
+      body: <<~FUNC_BODY,
+        return [
+          "00",
+          "01"
+        ]
+      FUNC_BODY
+    }).render()
+    have = Ginny::Class.create({
+      name: "SecurityInformationQualifier",
+      parent: "Eddy::Element::ID",
+      modules: ["Eddy", "Elements"],
+      body: constructor + "\n\n" + code_list,
+    }).render()
+    assert_equal(want, have)
+  end
+
 end