rgen 0.4.5 → 0.4.6

data/test/template_language_test.rb

@@ -65,20 +65,28 @@ class TemplateContainerTest < Test::Unit::TestCase
     tc.expand('root::Root', :for => TEST_MODEL, :indent => 1)
     result = expected = ""
     File.open(OUTPUT_DIR+"/testout.txt") {|f| result = f.read}
-    File.open(OUTPUT_DIR+"/expected_result.txt") {|f| expected = f.read}
+    File.open(OUTPUT_DIR+"/expected_result1.txt") {|f| expected = f.read}
     assert_equal expected, result
   end
   
+  def test_immediate_result
+    tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
+    tc.load(TEMPLATES_DIR)
+    expected = ""
+    File.open(OUTPUT_DIR+"/expected_result2.txt","rb") {|f| expected = f.read}
+    assert_equal expected, tc.expand('code/array::ArrayDefinition', :for => TEST_MODEL.sampleArray).to_s
+  end
+  
   def test_indent_string
     tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
     tc.load(TEMPLATES_DIR)
     tc.indentString = "  "  # 2 spaces instead of 3 (default)
     tc.expand('indent_string_test::IndentStringTest', :for => :dummy)
-    File.open(OUTPUT_DIR+"/indentStringTestDefaultIndent.out") do |f|
-      assert_equal "  <- your default here\n", f.read
+    File.open(OUTPUT_DIR+"/indentStringTestDefaultIndent.out","rb") do |f|
+      assert_equal "  <- your default here\r\n", f.read
     end
-    File.open(OUTPUT_DIR+"/indentStringTestTabIndent.out") do |f|
-      assert_equal "\t<- tab\n", f.read
+    File.open(OUTPUT_DIR+"/indentStringTestTabIndent.out","rb") do |f|
+      assert_equal "\t<- tab\r\n", f.read
     end
   end
   
@@ -86,10 +94,23 @@ class TemplateContainerTest < Test::Unit::TestCase
     tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
     tc.load(TEMPLATES_DIR)
     assert_raise StandardError do 
+      # the template must raise an exception because it calls expand :for => nil
       tc.expand('null_context_test::NullContextTestBad', :for => :dummy)
     end
+    assert_raise StandardError do 
+      # the template must raise an exception because it calls expand :foreach => nil
+      tc.expand('null_context_test::NullContextTestBad2', :for => :dummy)
+    end
     assert_nothing_raised do
       tc.expand('null_context_test::NullContextTestOk', :for => :dummy)
     end
   end
+
+  def test_no_backslash_r
+    tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
+    tc.load(TEMPLATES_DIR)
+    expected = ""
+    File.open(OUTPUT_DIR+"/expected_result3.txt") {|f| expected = f.read}
+    assert_equal expected, tc.expand('no_backslash_r_test::Test', :for => :dummy).to_s
+  end
 end

data/test/template_language_test/expected_result2.txt

@@ -0,0 +1,9 @@
+int myArray[5] = {
+   1,
+   2,
+   3,
+   4,
+   5
+};
+Text from Root
+Text from Root

data/test/template_language_test/expected_result3.txt

@@ -0,0 +1,4 @@
+This file was created on Linux and does not contain \r before \n
+The next blank line is done by the "nl" command which shall only add a \n, no \r:
+
+END

data/test/template_language_test/templates/code/array.tpl

@@ -1,6 +1,6 @@
 <% define 'ArrayDefinition', :for => CArray do %>
   <%= getType %> <%= name %>[<%= size %>] = {<%iinc%>
-    <% expand 'InitValue', :foreach => initvalue, :separator => ",\n" %><%nl%><%idec%>
+    <% expand 'InitValue', :foreach => initvalue, :separator => ",\r\n" %><%nl%><%idec%>
   };
   <% expand '../root::TextFromRoot' %>
   <% expand '/root::TextFromRoot' %>

data/test/template_language_test/templates/no_backslash_r_test.tpl

@@ -0,0 +1,5 @@
+<% define 'Test', :for => Object do %>
+This file was created on Linux and does not contain \r before \n
+The next blank line is done by the "nl" command which shall only add a \n, no \r:
+<%nl%>END
+<% end %>

data/test/template_language_test/templates/null_context_test.tpl

@@ -3,6 +3,11 @@
 	<% expand 'Callee', :for => nil %>
 <% end %>
 
+<% define 'NullContextTestBad2', :for => Object do %>
+	<%# this must raise an exception %>
+	<% expand 'Callee', :foreach => nil %>
+<% end %>
+
 <% define 'NullContextTestOk', :for => Object do %>
 	<%# however this is ok %>
 	<% expand 'Callee' %>

data/test/template_language_test/templates/root.tpl

@@ -18,7 +18,7 @@
 		<% expand 'content/chapter::Root', :foreach => chapters, :separator => ", " %><%nl%>
 		<%nl%>
 		Chapters each in one line:
-		<% expand 'content/chapter::Root', :foreach => chapters, :separator => ",\n" %><%nl%>
+		<% expand 'content/chapter::Root', :foreach => chapters, :separator => ",\r\n" %><%nl%>
 		<%nl%>
 		Here are some code examples:
 		<% expand 'code/array::ArrayDefinition', :for => sampleArray %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rgen
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Martin Thiede
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 +01:00
+date: 2009-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -97,7 +97,9 @@ files:
 - test/output_handler_test.rb
 - test/rgen_test.rb
 - test/template_language_test
-- test/template_language_test/expected_result.txt
+- test/template_language_test/expected_result1.txt
+- test/template_language_test/expected_result2.txt
+- test/template_language_test/expected_result3.txt
 - test/template_language_test/indentStringTestDefaultIndent.out
 - test/template_language_test/indentStringTestTabIndent.out
 - test/template_language_test/templates
@@ -111,6 +113,7 @@ files:
 - test/template_language_test/templates/index/c
 - test/template_language_test/templates/index/c/cmod.tpl
 - test/template_language_test/templates/index/chapter.tpl
+- test/template_language_test/templates/no_backslash_r_test.tpl
 - test/template_language_test/templates/null_context_test.tpl
 - test/template_language_test/templates/root.tpl
 - test/template_language_test/testout.txt
@@ -199,6 +202,7 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
+- Rakefile
 has_rdoc: true
 homepage: ruby-gen.org
 post_install_message: