Mirrors/cobalt.rs
2
0
Fork 0
mirror of https://github.com/cobalt-org/cobalt.rs synced 2024-11-15 00:17:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #370 from Geobert/fix#241

Browse source 
Fix EOL issue with tests
This commit is contained in:
Ed Page 2018-01-27 13:12:25 -06:00 committed by GitHub
commit 0aedcba5fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 607 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.editorconfig Normal file
View file

@ -0,0 +1,5 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true

2
.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
# force LF on checkout to avoid rustfmt messing up the EOL
* text eol=lf

7
Cargo.lock generated
View file

@ -230,6 +230,7 @@ dependencies = [
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"liquid 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -658,6 +659,11 @@ dependencies = [
"libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "normalize-line-endings"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "notify"
version = "4.0.3"
@ -1317,6 +1323,7 @@ dependencies = [
"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1"
"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
"checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79"
"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8"
"checksum notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5c3812da3098f210a0bb440f9c008471a031aa4c1de07a264fdd75456c95a4eb"
"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca"
"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba"

1
Cargo.toml
View file

@ -43,6 +43,7 @@ serde = "1.0"
serde_yaml = "0.7"
serde_json = "1.0"
toml = "0.4.0"
normalize-line-endings = "0.2.2"
[dependencies.sass-rs]
version = "0.2"

4
src/cobalt_model/files.rs
View file

@ -2,11 +2,12 @@ use std::fs;
use std::io::Read;
use std::io::Write;
use std::path;
use std::iter::FromIterator;
use ignore::Match;
use ignore::gitignore::{Gitignore, GitignoreBuilder};
use walkdir::{WalkDir, DirEntry};
use normalize_line_endings::normalized;
use error::Result;
pub struct FilesBuilder {
@ -189,6 +190,7 @@ pub fn read_file<P: AsRef<path::Path>>(path: P) -> Result<String> {
let mut file = fs::File::open(path.as_ref())?;
let mut text = String::new();
file.read_to_string(&mut text)?;
let text = String::from_iter(normalized(text.chars()));
Ok(text)
}

2
src/lib.rs
View file

@ -84,6 +84,8 @@ extern crate lazy_static;
#[macro_use]
extern crate serde;
extern crate normalize_line_endings;
pub use cobalt::build;
pub use error::Error;
pub use cobalt_model::Config;

1
src/template.rs
View file

@ -3,7 +3,6 @@ use std::path;
use std::result;
use liquid;
use error::*;
use cobalt_model;
use cobalt_model::files;

3
tests/fixtures/excerpts_CRLF/.editorconfig vendored Normal file
View file

@ -0,0 +1,3 @@
[*]
end_of_line = crlf
insert_final_newline = true

2
tests/fixtures/excerpts_CRLF/.gitattributes vendored Normal file
View file

@ -0,0 +1,2 @@
# force tests to keep their Windows EOL
* text eol=crlf

3
tests/fixtures/excerpts_CRLF/_cobalt.yml vendored Normal file
View file

@ -0,0 +1,3 @@
source: "."
site:
title: cobalt blog

6
tests/fixtures/excerpts_CRLF/_includes/post.liquid vendored Normal file
View file

@ -0,0 +1,6 @@
<div>
<h2>{{ page.title }}</h2>
<p>
{{ page.content }}
</p>
</div>

15
tests/fixtures/excerpts_CRLF/_layouts/default.liquid vendored Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<title>{{ page.title }}</title>
</head>
<body>
<div>
{% if page.collection == "posts" %}
{% include 'post.liquid' %}
{% else %}
{{ page.content }}
{% endif %}
</div>
</body>
</html>

15
tests/fixtures/excerpts_CRLF/index.liquid vendored Normal file
View file

@ -0,0 +1,15 @@
layout: default.liquid
---
<div >
<h2>Blog!</h2>
<!--<br />-->
<div>
{% for post in collections.posts.pages %}
<div>
<h4>{{post.title}}</h4>
<h4><a href="{{post.permalink}}">{{ post.title }}</a></h4>
{{ post.excerpt }}
</div>
{% endfor %}
</div>
</div>

9
tests/fixtures/excerpts_CRLF/posts/post-1.md vendored Normal file
View file

@ -0,0 +1,9 @@
layout: default.liquid
title: First block is an excerpt
published_date: 2016-01-14 21:00:30 -0500
---
# This is our first Post!
Welcome to the first post ever on cobalt.rs!

12
tests/fixtures/excerpts_CRLF/posts/post-10.md vendored Normal file
View file

@ -0,0 +1,12 @@
layout: default.liquid
title: Reference-style links immediately above first block
published_date: 2017-02-11 04:50:21 -0000
---
[20]: /0
[21]: /1
[22]: /2
[23]: /3
References are placed immediately above the first paragraph:
[20][] [21][] [22][] [23][]

16
tests/fixtures/excerpts_CRLF/posts/post-11.md vendored Normal file
View file

@ -0,0 +1,16 @@
layout: default.liquid
title: Reference-style links immediately below first block do not resolve
published_date: 2017-02-11 04:51:34 -0000
---
References are placed immediately below the first paragraph:
[30][] [31][] [32][] [33][]
[30]: /0
[31]: /1
[32]: /2
[33]: /3
Note that this is at it should be, as the markdown implementations I've tried
(including CommonMark) do not render the above links (when the post is rendered
individually).

14
tests/fixtures/excerpts_CRLF/posts/post-12.liquid vendored Normal file
View file

@ -0,0 +1,14 @@
layout: default.liquid
title: Reference-style links in a non-markdown post do not resolve
published_date: 2017-02-11 04:48:11 -0000
---
References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
[40][] [41][] [42][] [43][]
[40]: /0
[41]: /1
[42]: /2
[43]: /3

5
tests/fixtures/excerpts_CRLF/posts/post-2.md vendored Normal file
View file

@ -0,0 +1,5 @@
layout: default.liquid
title: An empty post means an empty excerpt
published_date: 2016-01-14 21:01:30 -0500
---

10
tests/fixtures/excerpts_CRLF/posts/post-3.md vendored Normal file
View file

@ -0,0 +1,10 @@
layout: default.liquid
title: Explicit `excerpt`
published_date: 2016-01-14 21:02:30 -0500
excerpt: Is in `markdown`
---
# This is our third Post!
Welcome to the third post ever on cobalt.rs!

13
tests/fixtures/excerpts_CRLF/posts/post-4.md vendored Normal file
View file

@ -0,0 +1,13 @@
layout: default.liquid
title: Custom excerpt separator
published_date: 2016-01-14 21:03:30 -0500
excerpt_separator: <!-- more -->
---
# Custom excerpt separator
Welcome to the 4th post on cobalt.rs!
<!-- more -->
Something below the separator.

14
tests/fixtures/excerpts_CRLF/posts/post-5.md vendored Normal file
View file

@ -0,0 +1,14 @@
layout: default.liquid
title: Both excerpt and excerpt separator are there
published_date: 2016-01-14 21:04:30 -0500
excerpt: "`excerpt` wins"
excerpt_separator: <!-- more -->
---
# Both excerpt and excerpt separator are there
Welcome to the 5th post on cobalt.rs!
<!-- more -->
Something below the separator.

13
tests/fixtures/excerpts_CRLF/posts/post-6.liquid vendored Normal file
View file

@ -0,0 +1,13 @@
layout: default.liquid
title: Implicit excerpts work only in markdown
published_date: 2016-01-14 21:05:30 -0500
excerpt_separator: <!-- more -->
---
<h1>Custom excerpt separator</h1>
<p>Welcome to the 6th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>

14
tests/fixtures/excerpts_CRLF/posts/post-7.liquid vendored Normal file
View file

@ -0,0 +1,14 @@
layout: default.liquid
title: Explicit excerpts work even in liquid
published_date: 2016-01-14 21:06:30 -0500
excerpt: <strong>explicit</strong> excerpt
excerpt_separator: <!-- more -->
---
<h1>Custom excerpt separator</h1>
<p>Welcome to the 7th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>

14
tests/fixtures/excerpts_CRLF/posts/post-8.md vendored Normal file
View file

@ -0,0 +1,14 @@
layout: default.liquid
title: Reference-style links above first block and separated by blank line resolve
published_date: 2017-02-11 04:45:01 -0000
---
[00]: /0
[01]: /1
[02]: /2
[03]: /3
References-style links are placed above the first paragraph, and are separated
from the first paragraph by a single blank line:
[00][] [01][] [02][] [03][]

14
tests/fixtures/excerpts_CRLF/posts/post-9.md vendored Normal file
View file

@ -0,0 +1,14 @@
layout: default.liquid
title: Reference-style links below first block and separated by blank line resolve
published_date: 2017-02-11 04:48:11 -0000
---
References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
[10][] [11][] [12][] [13][]
[10]: /0
[11]: /1
[12]: /2
[13]: /3

5
tests/mod.rs
View file

@ -238,6 +238,11 @@ pub fn excerpts() {
run_test("excerpts").unwrap();
}
#[test]
pub fn excerpts_crlf() {
run_test("excerpts_CRLF").unwrap();
}
#[test]
pub fn posts_in_subfolder() {
run_test("posts_in_subfolder").unwrap();

113
tests/target/excerpts_CRLF/index.html Normal file
View file

@ -0,0 +1,113 @@
<!DOCTYPE html>
<html>
<head>
<title>Index</title>
</head>
<body>
<div>
<div >
<h2>Blog!</h2>
<!--<br />-->
<div>
<div>
<h4>Reference-style links immediately below first block do not resolve</h4>
<h4><a href="posts/post-11.html">Reference-style links immediately below first block do not resolve</a></h4>
<p>References are placed immediately below the first paragraph:
<a href="/0">30</a> <a href="/1">31</a> <a href="/2">32</a> <a href="/3">33</a>
<a href="/0">30</a>: /0
<a href="/1">31</a>: /1
<a href="/2">32</a>: /2
<a href="/3">33</a>: /3</p>
</div>
<div>
<h4>Reference-style links immediately above first block</h4>
<h4><a href="posts/post-10.html">Reference-style links immediately above first block</a></h4>
<p>References are placed immediately above the first paragraph:
<a href="/0">20</a> <a href="/1">21</a> <a href="/2">22</a> <a href="/3">23</a></p>
</div>
<div>
<h4>Reference-style links in a non-markdown post do not resolve</h4>
<h4><a href="posts/post-12.html">Reference-style links in a non-markdown post do not resolve</a></h4>
References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
[40][] [41][] [42][] [43][]
</div>
<div>
<h4>Reference-style links below first block and separated by blank line resolve</h4>
<h4><a href="posts/post-9.html">Reference-style links below first block and separated by blank line resolve</a></h4>
<p>References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
<a href="/0">10</a> <a href="/1">11</a> <a href="/2">12</a> <a href="/3">13</a></p>
</div>
<div>
<h4>Reference-style links above first block and separated by blank line resolve</h4>
<h4><a href="posts/post-8.html">Reference-style links above first block and separated by blank line resolve</a></h4>
</div>
<div>
<h4>Explicit excerpts work even in liquid</h4>
<h4><a href="posts/post-7.html">Explicit excerpts work even in liquid</a></h4>
<strong>explicit</strong> excerpt
</div>
<div>
<h4>Implicit excerpts work only in markdown</h4>
<h4><a href="posts/post-6.html">Implicit excerpts work only in markdown</a></h4>
<h1>Custom excerpt separator</h1>
<p>Welcome to the 6th post on cobalt.rs!</p>
</div>
<div>
<h4>Both excerpt and excerpt separator are there</h4>
<h4><a href="posts/post-5.html">Both excerpt and excerpt separator are there</a></h4>
<p><code>excerpt</code> wins</p>
</div>
<div>
<h4>Custom excerpt separator</h4>
<h4><a href="posts/post-4.html">Custom excerpt separator</a></h4>
<h1>Custom excerpt separator</h1>
<p>Welcome to the 4th post on cobalt.rs!</p>
</div>
<div>
<h4>Explicit `excerpt`</h4>
<h4><a href="posts/post-3.html">Explicit `excerpt`</a></h4>
<p>Is in <code>markdown</code></p>
</div>
<div>
<h4>An empty post means an empty excerpt</h4>
<h4><a href="posts/post-2.html">An empty post means an empty excerpt</a></h4>
</div>
<div>
<h4>First block is an excerpt</h4>
<h4><a href="posts/post-1.html">First block is an excerpt</a></h4>
<h1>This is our first Post!</h1>
</div>
</div>
</div>
</div>
</body>
</html>

21
tests/target/excerpts_CRLF/posts/post-1.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<title>First block is an excerpt</title>
</head>
<body>
<div>
<div>
<h2>First block is an excerpt</h2>
<p>
<h1>This is our first Post!</h1>
<p>Welcome to the first post ever on cobalt.rs!</p>
</p>
</div>
</div>
</body>
</html>

21
tests/target/excerpts_CRLF/posts/post-10.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<title>Reference-style links immediately above first block</title>
</head>
<body>
<div>
<div>
<h2>Reference-style links immediately above first block</h2>
<p>
<p>References are placed immediately above the first paragraph:
<a href="/0">20</a> <a href="/1">21</a> <a href="/2">22</a> <a href="/3">23</a></p>
</p>
</div>
</div>
</body>
</html>

28
tests/target/excerpts_CRLF/posts/post-11.html Normal file
View file

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<title>Reference-style links immediately below first block do not resolve</title>
</head>
<body>
<div>
<div>
<h2>Reference-style links immediately below first block do not resolve</h2>
<p>
<p>References are placed immediately below the first paragraph:
[30][] [31][] [32][] [33][]
[30]: /0
[31]: /1
[32]: /2
[33]: /3</p>
<p>Note that this is at it should be, as the markdown implementations I've tried
(including CommonMark) do not render the above links (when the post is rendered
individually).</p>
</p>
</div>
</div>
</body>
</html>

27
tests/target/excerpts_CRLF/posts/post-12.html Normal file
View file

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<title>Reference-style links in a non-markdown post do not resolve</title>
</head>
<body>
<div>
<div>
<h2>Reference-style links in a non-markdown post do not resolve</h2>
<p>
References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
[40][] [41][] [42][] [43][]
[40]: /0
[41]: /1
[42]: /2
[43]: /3
</p>
</div>
</div>
</body>
</html>

19
tests/target/excerpts_CRLF/posts/post-2.html Normal file
View file

@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<title>An empty post means an empty excerpt</title>
</head>
<body>
<div>
<div>
<h2>An empty post means an empty excerpt</h2>
<p>
</p>
</div>
</div>
</body>
</html>

21
tests/target/excerpts_CRLF/posts/post-3.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<title>Explicit `excerpt`</title>
</head>
<body>
<div>
<div>
<h2>Explicit `excerpt`</h2>
<p>
<h1>This is our third Post!</h1>
<p>Welcome to the third post ever on cobalt.rs!</p>
</p>
</div>
</div>
</body>
</html>

23
tests/target/excerpts_CRLF/posts/post-4.html Normal file
View file

@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<title>Custom excerpt separator</title>
</head>
<body>
<div>
<div>
<h2>Custom excerpt separator</h2>
<p>
<h1>Custom excerpt separator</h1>
<p>Welcome to the 4th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>
</p>
</div>
</div>
</body>
</html>

23
tests/target/excerpts_CRLF/posts/post-5.html Normal file
View file

@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<title>Both excerpt and excerpt separator are there</title>
</head>
<body>
<div>
<div>
<h2>Both excerpt and excerpt separator are there</h2>
<p>
<h1>Both excerpt and excerpt separator are there</h1>
<p>Welcome to the 5th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>
</p>
</div>
</div>
</body>
</html>

25
tests/target/excerpts_CRLF/posts/post-6.html Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>Implicit excerpts work only in markdown</title>
</head>
<body>
<div>
<div>
<h2>Implicit excerpts work only in markdown</h2>
<p>
<h1>Custom excerpt separator</h1>
<p>Welcome to the 6th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>
</p>
</div>
</div>
</body>
</html>

25
tests/target/excerpts_CRLF/posts/post-7.html Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>Explicit excerpts work even in liquid</title>
</head>
<body>
<div>
<div>
<h2>Explicit excerpts work even in liquid</h2>
<p>
<h1>Custom excerpt separator</h1>
<p>Welcome to the 7th post on cobalt.rs!</p>
<!-- more -->
<p>Something below the separator.</p>
</p>
</div>
</div>
</body>
</html>

22
tests/target/excerpts_CRLF/posts/post-8.html Normal file
View file

@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<title>Reference-style links above first block and separated by blank line resolve</title>
</head>
<body>
<div>
<div>
<h2>Reference-style links above first block and separated by blank line resolve</h2>
<p>
<p>References-style links are placed above the first paragraph, and are separated
from the first paragraph by a single blank line:
<a href="/0">00</a> <a href="/1">01</a> <a href="/2">02</a> <a href="/3">03</a></p>
</p>
</div>
</div>
</body>
</html>

22
tests/target/excerpts_CRLF/posts/post-9.html Normal file
View file

@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<title>Reference-style links below first block and separated by blank line resolve</title>
</head>
<body>
<div>
<div>
<h2>Reference-style links below first block and separated by blank line resolve</h2>
<p>
<p>References are placed below the first paragraph, and are separated from the
first paragraph by a single blank line:
<a href="/0">10</a> <a href="/1">11</a> <a href="/2">12</a> <a href="/3">13</a></p>
</p>
</div>
</div>
</body>
</html>