yass 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4660b4c1e315a8dfca13d59ebc7dc2df7927cc267662c008591d1eab2dc7aecc
4
- data.tar.gz: 19e7865fa6f842204a35b75c741eafafaaadab9c47b33dfd1da19906c607e6f5
3
+ metadata.gz: d2403483776bfafa63a1b62961f516a4419905c8392e4d76eb79fd48503bbd91
4
+ data.tar.gz: cc86724e2ae2474080e88f0e58aef30a8bb052875ffe8593d33a6db6c81bd89a
5
5
  SHA512:
6
- metadata.gz: 18c222a12583757264009d42ce31aa6445066099e55c88cfb87c88a07af4e407cfdaea444a46a6c214a1f6d4ab16d30f572d01d8c9bfa87acb08bef702f42ff7
7
- data.tar.gz: 1df53ed9bcbaaf438db53316a2d8f1e4487b912b96726ba622c42d8e3b257bd8038368857b5b00c54f5c2698e44f0a25bc5f087a8885223c36ec3ba9ed1f4f3b
6
+ metadata.gz: b6d05f3567714a26ae05fc8b9ec8f9bf61eef897293e504b2745bb81e36c99470eff39f6a12be73081d4d27a1016ee32ebc73f7128cb8cb224735bf88bcccb07
7
+ data.tar.gz: '0814026244474ee279a5f8c45886bdeebece7da03d6c6523c798adaac2a3980ff038139f8603f388adac3cff061e7584598348e1f60ef4b2d1fa4b309bf298c4'
data/README.md CHANGED
@@ -52,8 +52,6 @@ yass watch
52
52
 
53
53
  Layouts live in `layouts/` and will be applied to files with matching names. The `content` variable contains the data to render in the layout.
54
54
 
55
- *layouts/page.html.liquid*
56
-
57
55
  ```html
58
56
  <!DOCTYPE html>
59
57
  <html lang="en">
@@ -64,9 +62,14 @@ Layouts live in `layouts/` and will be applied to files with matching names. The
64
62
  </html>
65
63
  ```
66
64
 
67
- This template will be applied to files with names like `foo.page.html` and `foo.page.html.liquid`. The `.page` part of the name will be removed from the final file.
65
+ If the above layout is named *page.html.liquid*, it will match any file named `*.page.html*`. Examples:
66
+
67
+ * foo.page.html
68
+ * foo.page.html.*
69
+ * foo.page.md (because *.md* converts to *.html*)
70
+ * foo.page.md.*
68
71
 
69
- Since Markdown files (`foo.page.md`, `foo.page.md.liquid`) are converted to `.html` files, they'll also use `.html` layouts.
72
+ The name of the layout (e.g. `page`) is removed from the final filename, resulting in `foo.html`.
70
73
 
71
74
  ## Templates
72
75
 
data/lib/yass/source.rb CHANGED
@@ -31,10 +31,11 @@ module Yass
31
31
  return name, nil if exts.nil?
32
32
 
33
33
  exts = exts.split(".").map { |x| EXT_CONVERSIONS[x] || x } - %w[liquid]
34
- return "#{name}.#{exts.join "."}", nil if exts.size < 2
34
+ return "#{name}.#{exts[0]}", config.layout_cache["default.#{exts[0]}"] if exts.size == 1
35
35
 
36
36
  layout = config.layout_cache["#{exts[-2..].join(".")}"]
37
37
  exts.delete_at(-2) if layout
38
+ layout ||= config.layout_cache["default.#{exts[-1]}"]
38
39
 
39
40
  return "#{name}.#{exts.join "."}", layout
40
41
  end
data/lib/yass/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Yass
2
- VERSION = "0.2.1".freeze
2
+ VERSION = "0.3.0".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: yass
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jordan Hollinger
@@ -75,7 +75,7 @@ files:
75
75
  - site-template/layouts/default.html.liquid
76
76
  - site-template/site/assets/highlight-default.css
77
77
  - site-template/site/assets/highlight.min.js
78
- - site-template/site/index.default.html.liquid
78
+ - site-template/site/index.html.liquid
79
79
  - site-template/templates/css_links.liquid
80
80
  - site-template/templates/js_scripts.liquid
81
81
  homepage: https://github.com/jhollinger/yass/