From 43c22164fb931e23cdcbd4a9d3769288b1d63574 Mon Sep 17 00:00:00 2001 From: "nathan@stravinsky.local" Date: Thu, 27 May 2010 20:07:53 -0700 Subject: [PATCH] slogged through tests fixing for strict whitespace (maybe we could swallow \n after section token?) --- .../array_of_partials_implicit_partial.2.html | 2 +- .../array_of_partials_implicit_partial.html | 4 +--- .../array_of_partials_implicit_partial.txt | 1 + examples/array_of_partials_partial.2.html | 2 +- examples/array_of_partials_partial.html | 5 ++--- examples/array_of_partials_partial.txt | 1 + examples/array_of_strings.html | 3 +-- examples/array_of_strings.txt | 2 +- examples/array_of_strings_options.html | 3 +-- examples/array_of_strings_options.txt | 2 +- examples/complex.html | 18 +++++------------- examples/complex.txt | 13 ++++++++++--- examples/delimiters.txt | 4 +++- examples/empty_partial.html | 2 +- examples/empty_template.txt | 2 +- examples/error_not_found.txt | 1 - examples/inverted_section.txt | 1 + examples/recursion_with_same_names.html | 4 ++-- examples/recursion_with_same_names.txt | 3 +++ examples/reuse_of_enumerables.html | 6 +++--- examples/reuse_of_enumerables.txt | 5 +++++ examples/section_as_context.html | 7 +++---- examples/section_as_context.txt | 4 +++- examples/simple.txt | 1 + examples/two_in_a_row.txt | 2 +- examples/unescaped.txt | 2 +- examples/unknown_pragma.txt | 2 +- test/mustache_spec.rb | 6 +++--- 28 files changed, 58 insertions(+), 50 deletions(-) diff --git a/examples/array_of_partials_implicit_partial.2.html b/examples/array_of_partials_implicit_partial.2.html index 12f7159..91012a6 100644 --- a/examples/array_of_partials_implicit_partial.2.html +++ b/examples/array_of_partials_implicit_partial.2.html @@ -1 +1 @@ -{{.}} +{{.}} \ No newline at end of file diff --git a/examples/array_of_partials_implicit_partial.html b/examples/array_of_partials_implicit_partial.html index 11537e9..0fba4c5 100644 --- a/examples/array_of_partials_implicit_partial.html +++ b/examples/array_of_partials_implicit_partial.html @@ -1,5 +1,3 @@ Here is some stuff! {{%IMPLICIT-ITERATOR}} -{{#numbers}} -{{>partial}} -{{/numbers}} +{{#numbers}}{{>partial}}{{/numbers}} diff --git a/examples/array_of_partials_implicit_partial.txt b/examples/array_of_partials_implicit_partial.txt index f622375..5578617 100644 --- a/examples/array_of_partials_implicit_partial.txt +++ b/examples/array_of_partials_implicit_partial.txt @@ -1,4 +1,5 @@ Here is some stuff! + 1 2 3 diff --git a/examples/array_of_partials_partial.2.html b/examples/array_of_partials_partial.2.html index bdde77d..6f890e1 100644 --- a/examples/array_of_partials_partial.2.html +++ b/examples/array_of_partials_partial.2.html @@ -1 +1 @@ -{{i}} +{{i}} \ No newline at end of file diff --git a/examples/array_of_partials_partial.html b/examples/array_of_partials_partial.html index 1af6d68..ba5ae8f 100644 --- a/examples/array_of_partials_partial.html +++ b/examples/array_of_partials_partial.html @@ -1,4 +1,3 @@ Here is some stuff! -{{#numbers}} -{{>partial}} -{{/numbers}} +{{#numbers}}{{>partial}} +{{/numbers}} \ No newline at end of file diff --git a/examples/array_of_partials_partial.txt b/examples/array_of_partials_partial.txt index f622375..4107dcc 100644 --- a/examples/array_of_partials_partial.txt +++ b/examples/array_of_partials_partial.txt @@ -3,3 +3,4 @@ Here is some stuff! 2 3 4 + diff --git a/examples/array_of_strings.html b/examples/array_of_strings.html index ab058c4..b466a3f 100644 --- a/examples/array_of_strings.html +++ b/examples/array_of_strings.html @@ -1,2 +1 @@ -{{%IMPLICIT-ITERATOR}} -{{#array_of_strings}} {{.}} {{/array_of_strings}} \ No newline at end of file +{{%IMPLICIT-ITERATOR}}{{#array_of_strings}}{{.}} {{/array_of_strings}} \ No newline at end of file diff --git a/examples/array_of_strings.txt b/examples/array_of_strings.txt index 4a1f475..f63e6ab 100644 --- a/examples/array_of_strings.txt +++ b/examples/array_of_strings.txt @@ -1 +1 @@ -hello world +hello world \ No newline at end of file diff --git a/examples/array_of_strings_options.html b/examples/array_of_strings_options.html index 87fbf5e..eaf8248 100644 --- a/examples/array_of_strings_options.html +++ b/examples/array_of_strings_options.html @@ -1,2 +1 @@ -{{%IMPLICIT-ITERATOR iterator=rob}} -{{#array_of_strings_options}} {{rob}} {{/array_of_strings_options}} \ No newline at end of file +{{%IMPLICIT-ITERATOR iterator=rob}}{{#array_of_strings_options}}{{rob}} {{/array_of_strings_options}} \ No newline at end of file diff --git a/examples/array_of_strings_options.txt b/examples/array_of_strings_options.txt index 4a1f475..f63e6ab 100644 --- a/examples/array_of_strings_options.txt +++ b/examples/array_of_strings_options.txt @@ -1 +1 @@ -hello world +hello world \ No newline at end of file diff --git a/examples/complex.html b/examples/complex.html index e7ca1b5..a3708b4 100644 --- a/examples/complex.html +++ b/examples/complex.html @@ -1,16 +1,8 @@

{{header}}

{{#list}} - + {{/list}} -{{#empty}} -

The list is empty.

-{{/empty}} \ No newline at end of file +{{#empty}}

The list is empty.

{{/empty}} \ No newline at end of file diff --git a/examples/complex.txt b/examples/complex.txt index eb78d45..a5dd36b 100644 --- a/examples/complex.txt +++ b/examples/complex.txt @@ -1,6 +1,13 @@

Colors

- + diff --git a/examples/delimiters.txt b/examples/delimiters.txt index 698a6bb..084b64a 100644 --- a/examples/delimiters.txt +++ b/examples/delimiters.txt @@ -1,5 +1,7 @@ * It worked the first time. * And it worked the second time. + * Then, surprisingly, it worked the third time. -* Fourth time also fine!. + +* Fourth time also fine!. \ No newline at end of file diff --git a/examples/empty_partial.html b/examples/empty_partial.html index a710047..a5cbb99 100644 --- a/examples/empty_partial.html +++ b/examples/empty_partial.html @@ -1,2 +1,2 @@ hey {{foo}} -{{>partial}} +{{>partial}} \ No newline at end of file diff --git a/examples/empty_template.txt b/examples/empty_template.txt index 60652b6..bb2367a 100644 --- a/examples/empty_template.txt +++ b/examples/empty_template.txt @@ -1 +1 @@ -

Test

+

Test

\ No newline at end of file diff --git a/examples/error_not_found.txt b/examples/error_not_found.txt index 8b13789..e69de29 100644 --- a/examples/error_not_found.txt +++ b/examples/error_not_found.txt @@ -1 +0,0 @@ - diff --git a/examples/inverted_section.txt b/examples/inverted_section.txt index 5fd0de1..06d5d66 100644 --- a/examples/inverted_section.txt +++ b/examples/inverted_section.txt @@ -1 +1,2 @@ + No repos :( diff --git a/examples/recursion_with_same_names.html b/examples/recursion_with_same_names.html index c331d04..d804f17 100644 --- a/examples/recursion_with_same_names.html +++ b/examples/recursion_with_same_names.html @@ -2,6 +2,6 @@ {{ description }} {{#terms}} - {{name}} +{{name}} {{index}} -{{/terms}} +{{/terms}} \ No newline at end of file diff --git a/examples/recursion_with_same_names.txt b/examples/recursion_with_same_names.txt index 0f3e1bc..b9f3226 100644 --- a/examples/recursion_with_same_names.txt +++ b/examples/recursion_with_same_names.txt @@ -1,6 +1,9 @@ name desc + + t1 0 + t2 1 diff --git a/examples/reuse_of_enumerables.html b/examples/reuse_of_enumerables.html index cc0cb7a..ae4c805 100644 --- a/examples/reuse_of_enumerables.html +++ b/examples/reuse_of_enumerables.html @@ -1,8 +1,8 @@ {{#terms}} - {{name}} +{{name}} {{index}} {{/terms}} {{#terms}} - {{name}} +{{name}} {{index}} -{{/terms}} +{{/terms}} \ No newline at end of file diff --git a/examples/reuse_of_enumerables.txt b/examples/reuse_of_enumerables.txt index c6d5170..8a9d183 100644 --- a/examples/reuse_of_enumerables.txt +++ b/examples/reuse_of_enumerables.txt @@ -1,8 +1,13 @@ + t1 0 + t2 1 + + t1 0 + t2 1 diff --git a/examples/section_as_context.html b/examples/section_as_context.html index 6a39a43..1bcf00d 100644 --- a/examples/section_as_context.html +++ b/examples/section_as_context.html @@ -1,9 +1,8 @@ {{#a_object}} -

{{title}}

+

{{title}}

{{description}}

-{{/a_object}} +{{/a_object}} \ No newline at end of file diff --git a/examples/section_as_context.txt b/examples/section_as_context.txt index 55d4179..cf0c260 100644 --- a/examples/section_as_context.txt +++ b/examples/section_as_context.txt @@ -1,6 +1,8 @@ +

this is an object

one of its attributes is a list

+ + diff --git a/examples/simple.txt b/examples/simple.txt index 5d75d65..e2943b9 100644 --- a/examples/simple.txt +++ b/examples/simple.txt @@ -1,3 +1,4 @@ Hello Chris You have just won $10000! + Well, $6000, after taxes. diff --git a/examples/two_in_a_row.txt b/examples/two_in_a_row.txt index c6d6a9b..97f4a2f 100644 --- a/examples/two_in_a_row.txt +++ b/examples/two_in_a_row.txt @@ -1 +1 @@ -Welcome, Joe! +Welcome, Joe! \ No newline at end of file diff --git a/examples/unescaped.txt b/examples/unescaped.txt index 089ad79..01fa404 100644 --- a/examples/unescaped.txt +++ b/examples/unescaped.txt @@ -1 +1 @@ -

Bear > Shark

+

Bear > Shark

\ No newline at end of file diff --git a/examples/unknown_pragma.txt b/examples/unknown_pragma.txt index a34840d..3d5ab32 100644 --- a/examples/unknown_pragma.txt +++ b/examples/unknown_pragma.txt @@ -1 +1 @@ -ERROR: This implementation of mustache doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma +ERROR: This mustache implementation doesn't understand the 'I-HAVE-THE-GREATEST-MUSTACHE' pragma \ No newline at end of file diff --git a/test/mustache_spec.rb b/test/mustache_spec.rb index 9ede6c8..c04693d 100644 --- a/test/mustache_spec.rb +++ b/test/mustache_spec.rb @@ -68,7 +68,7 @@ describe "mustache" do } JS - run_js(runner).should == expect + run_js(runner).should == expect + "\n" end it "should sendFun the correct html" do @@ -86,7 +86,7 @@ describe "mustache" do } var template = #{template}; Mustache.to_html(template, #{testname}, null, sendFun); - print(chunks.join("\\n")); + print(chunks.join("")); } catch(e) { print('ERROR: ' + e.message); } @@ -137,7 +137,7 @@ describe "mustache" do } } Mustache.to_html(template, partial_context, partials, sendFun); - print(chunks.join("\\n")); + print(chunks.join("")); } catch(e) { print('ERROR: ' + e.message); }