Trim trailing whitespace after rendering

tcd · Nov 18, 2019 · 9a9df1e · 9a9df1e
1 parent 47401e3
commit 9a9df1e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/lib/ginny/models/attr.rb b/lib/ginny/models/attr.rb
@@ -52,7 +52,7 @@ def render()
       parts << (@description&.length&.positive? ? @description.comment : nil)
       parts << "@return [#{self.type}]".comment
       parts << "attr_#{self.read_only ? 'reader' : 'accessor'} :#{self.name.downcase}"
-      return parts.compact.join("\n")
+      return parts.compact.join("\n").gsub(/\s+$/, "")
     end
 
     # Used for documenting attributes that are "declared dynamically via meta-programming".
@@ -66,7 +66,7 @@ def render_dynamic()
       parts << "@!attribute #{self.name.downcase} [#{self.read_only ? 'r' : 'rw'}]".comment
       parts << (@description&.length&.positive? ? @description.indent(2).comment : nil)
       parts << "@return [#{self.type}]".indent(2).comment
-      return parts.compact.join("\n")
+      return parts.compact.join("\n").gsub(/\s+$/, "")
     end
 
   end

diff --git a/lib/ginny/models/class.rb b/lib/ginny/models/class.rb
@@ -49,7 +49,7 @@ def render()
       parts << (self.parent.nil? ? "class #{self.name}" : "class #{self.name} < #{self.parent}")
       parts << self.render_attributes()
       parts << "end"
-      return parts.compact.join("\n")
+      return parts.compact.join("\n").gsub(/\s+$/, "")
     end
 
     # @return [String]

diff --git a/lib/ginny/models/param.rb b/lib/ginny/models/param.rb
@@ -64,7 +64,7 @@ def render
       elsif default
         parts << (" = " + default)
       end
-      return parts.compact.join("")
+      return parts.compact.join("").gsub(/\s+$/, "")
     end
 
     # @return [String,nil]

diff --git a/test/ginny/ginny_test.rb b/test/ginny/ginny_test.rb
@@ -29,10 +29,10 @@ def test_load_from_yaml
     assert_equal(@person, have)
   end
 
-  # def test_yaml_with_multiline_string
-  #   want = File.read(file_fixture("out/directive.rb"))
-  #   have = Ginny::Class.create(Ginny.load_yaml(file_fixture("in/directive.yml"))).render()
-  #   assert_equal(want, have)
-  # end
+  def test_yaml_with_multiline_string
+    want = File.read(file_fixture("out/directive.rb")).strip
+    have = Ginny::Class.create(Ginny.load_yaml(file_fixture("in/directive.yml"))).render()
+    assert_equal(want, have)
+  end
 
 end