octopress-ink 1.0.0.alpha.20 → 1.0.0.alpha.21

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.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/lib/octopress-ink/helpers/var.rb +32 -0
  3. data/lib/octopress-ink/helpers.rb +1 -0
  4. data/lib/octopress-ink/tags/assign.rb +34 -0
  5. data/lib/octopress-ink/tags/capture.rb +31 -0
  6. data/lib/octopress-ink/tags.rb +2 -0
  7. data/lib/octopress-ink/version.rb +1 -1
  8. data/lib/octopress-ink.rb +2 -0
  9. data/test/expected/{layout_tests → test_layouts}/local.html +0 -0
  10. data/test/expected/{layout_tests → test_layouts}/plugin_layout.html +0 -0
  11. data/test/expected/{layout_tests → test_layouts}/theme.html +0 -0
  12. data/test/expected/{layout_tests → test_layouts}/theme_override.html +0 -0
  13. data/test/expected/test_tags/assign.html +22 -0
  14. data/test/expected/test_tags/capture.html +19 -0
  15. data/test/expected/{tag_tests → test_tags}/content_for.html +0 -0
  16. data/test/expected/{tag_tests → test_tags}/footer.html +0 -0
  17. data/test/expected/test_tags/head.html +4 -0
  18. data/test/expected/{tag_tests → test_tags}/include.html +0 -0
  19. data/test/expected/{tag_tests → test_tags}/include_if.html +0 -0
  20. data/test/expected/{tag_tests → test_tags}/include_plugin.html +0 -0
  21. data/test/expected/{tag_tests → test_tags}/include_theme.html +0 -0
  22. data/test/expected/{tag_tests → test_tags}/include_theme_override.html +0 -0
  23. data/test/expected/{tag_tests → test_tags}/scripts.html +0 -0
  24. data/test/site/{layout_tests → test_layouts}/local.html +0 -0
  25. data/test/site/{layout_tests → test_layouts}/plugin_layout.html +0 -0
  26. data/test/site/{layout_tests → test_layouts}/theme.html +0 -0
  27. data/test/site/{layout_tests → test_layouts}/theme_override.html +0 -0
  28. data/test/site/test_tags/assign.html +22 -0
  29. data/test/site/test_tags/capture.html +19 -0
  30. data/test/site/{tag_tests → test_tags}/content_for.html +0 -0
  31. data/test/site/{tag_tests → test_tags}/footer.html +0 -0
  32. data/test/site/test_tags/head.html +4 -0
  33. data/test/site/{tag_tests → test_tags}/include.html +0 -0
  34. data/test/site/{tag_tests → test_tags}/include_if.html +0 -0
  35. data/test/site/{tag_tests → test_tags}/include_plugin.html +0 -0
  36. data/test/site/{tag_tests → test_tags}/include_theme.html +0 -0
  37. data/test/site/{tag_tests → test_tags}/include_theme_override.html +0 -0
  38. data/test/site/{tag_tests → test_tags}/scripts.html +0 -0
  39. data/test/source/{layout_tests → test_layouts}/local.html +0 -0
  40. data/test/source/{layout_tests → test_layouts}/plugin_layout.html +0 -0
  41. data/test/source/{layout_tests → test_layouts}/theme.html +0 -0
  42. data/test/source/{layout_tests → test_layouts}/theme_override.html +0 -0
  43. data/test/source/test_tags/assign.html +25 -0
  44. data/test/source/test_tags/capture.html +24 -0
  45. data/test/source/{tag_tests → test_tags}/content_for.html +0 -0
  46. data/test/source/{tag_tests → test_tags}/footer.html +0 -0
  47. data/test/source/{tag_tests → test_tags}/head.html +0 -0
  48. data/test/source/{tag_tests → test_tags}/include.html +0 -0
  49. data/test/source/{tag_tests → test_tags}/include_if.html +0 -0
  50. data/test/source/{tag_tests → test_tags}/include_plugin.html +0 -0
  51. data/test/source/{tag_tests → test_tags}/include_theme.html +0 -0
  52. data/test/source/{tag_tests → test_tags}/include_theme_override.html +0 -0
  53. data/test/source/{tag_tests → test_tags}/scripts.html +0 -0
  54. data/test/test.rb +3 -3
  55. metadata +94 -79
  56. data/test/expected/tag_tests/head.html +0 -4
  57. data/test/site/tag_tests/head.html +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6d06768e2605f32b222536b3b637371edeb7c8ee
4
- data.tar.gz: 10ec8710720d37bfc0dc963849f8e05ef0e25d85
3
+ metadata.gz: 45467e05d9e1d22c806b1ec34b7e54d7ce2c53e0
4
+ data.tar.gz: 7bdf2595993c6c2d7c11fb6bcb0f322e451ee060
5
5
  SHA512:
6
- metadata.gz: 4c7fb93d8f87cad0e5cb196e34c02733baf38672d9de4e1862ebcd8e0326fdba1eb8bb5436309992b00a7b9880cf4d5548e7ffc9dc2dad16ef3bb5656eeb1d1e
7
- data.tar.gz: 6fe264b8152f0f8a12e0295e1f111d66650d561eda2a55b7ff424aa7487ebfa548fc5b80fc6f9451b51b2581c6d51292b437d2128c45886e97557da7ffaa5bd3
6
+ metadata.gz: d385f87e816bb30c2d86465ca9c0dc1c8454125c124e6160217591e7748946196dab58d51fe62156bacf77583c00c89ba02af5b9d5fa37ce8880933d8ce1467c
7
+ data.tar.gz: 5dd3fc7e0e753550a3aeb37074e179ba4da43c2ed9f8e3fdcae38900837d13d14bb5276cac49eafd8c63fe7689bae93e6b337017396d7c587b63d378ee94d0af
@@ -0,0 +1,32 @@
1
+ module Octopress
2
+ module Helpers
3
+ module Var
4
+
5
+ def self.set_var(var, operator, value, context)
6
+ case operator
7
+ when '||='
8
+ context.scopes.last[var] = value if context.scopes.last[var].nil?
9
+ when '+='
10
+ if context.scopes.last[var].nil?
11
+ context.scopes.last[var] = value
12
+ else
13
+ context.scopes.last[var] += value
14
+ end
15
+ else
16
+ context.scopes.last[var] = value
17
+ end
18
+ context
19
+ end
20
+
21
+ def self.get_value(vars, context)
22
+ vars = vars.strip.gsub(/ or /, ' || ')
23
+ vars = vars.split(/ \|\| /).map { |v|
24
+ Liquid::Variable.new(v.strip).render(context)
25
+ }.compact
26
+
27
+ vars.empty? ? nil : vars.first
28
+ end
29
+ end
30
+ end
31
+ end
32
+
@@ -3,5 +3,6 @@ module Octopress
3
3
  autoload :Conditional, 'octopress-ink/helpers/conditional'
4
4
  autoload :ContentFor, 'octopress-ink/helpers/content_for'
5
5
  autoload :Path, 'octopress-ink/helpers/path'
6
+ autoload :Var, 'octopress-ink/helpers/var'
6
7
  end
7
8
  end
@@ -0,0 +1,34 @@
1
+ module Octopress
2
+ module Tags
3
+ class AssignTag < Liquid::Tag
4
+ SYNTAX = /([[:word:]]+)\s*(=|\+=|\|\|=)\s*(.*)\s*/o
5
+
6
+ def initialize(tag_name, markup, tokens)
7
+ @markup = markup
8
+ super
9
+ end
10
+
11
+ def render(context)
12
+ if @markup =~ Helpers::Conditional::SYNTAX
13
+ return unless Helpers::Conditional.parse(@markup, context)
14
+ @markup = $1
15
+ end
16
+
17
+ if @markup =~ SYNTAX
18
+ var = $1
19
+ operator = $2
20
+ value = $3
21
+
22
+ value = Helpers::Var.get_value(value, context)
23
+ return if value.nil?
24
+
25
+ context = Helpers::Var.set_var(var, operator, value, context)
26
+ else
27
+ raise SyntaxError.new("Syntax Error in 'assign' - Valid syntax: assign [var] = [source]")
28
+ end
29
+ ''
30
+ end
31
+ end
32
+ end
33
+ end
34
+
@@ -0,0 +1,31 @@
1
+ module Octopress
2
+ module Tags
3
+ class CaptureTag < Liquid::Block
4
+ SYNTAX = /([[:word:]]+)\s*(\+=|\|\|=)?/o
5
+
6
+ def initialize(tag_name, markup, tokens)
7
+ @markup = markup
8
+ super
9
+ end
10
+
11
+ def render(context)
12
+ if @markup =~ Helpers::Conditional::SYNTAX
13
+ return unless Helpers::Conditional.parse(@markup, context)
14
+ @markup = $1
15
+ end
16
+
17
+ if @markup =~ SYNTAX
18
+ var = $1
19
+ operator = $2
20
+ value = super.lstrip
21
+
22
+ context = Helpers::Var.set_var(var, operator, value, context)
23
+ else
24
+ raise SyntaxError.new("Syntax Error in 'capture' - Valid syntax: capture [var]")
25
+ end
26
+ ''
27
+ end
28
+ end
29
+ end
30
+ end
31
+
@@ -1,6 +1,8 @@
1
1
  module Octopress
2
2
  module Tags
3
3
  autoload :IncludeTag, 'octopress-ink/tags/include'
4
+ autoload :AssignTag, 'octopress-ink/tags/assign'
5
+ autoload :CaptureTag, 'octopress-ink/tags/capture'
4
6
  autoload :JavascriptTag, 'octopress-ink/tags/javascript'
5
7
  autoload :StylesheetTag, 'octopress-ink/tags/stylesheet'
6
8
  autoload :ContentForBlock, 'octopress-ink/tags/content_for'
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Ink
3
- VERSION = "1.0.0.alpha.20"
3
+ VERSION = "1.0.0.alpha.21"
4
4
  end
5
5
  end
data/lib/octopress-ink.rb CHANGED
@@ -25,6 +25,8 @@ module Octopress
25
25
  end
26
26
 
27
27
  Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
28
+ Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
29
+ Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
28
30
  Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
29
31
  Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
30
32
  Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForBlock)
@@ -0,0 +1,22 @@
1
+ ## Simple assign
2
+ yep → yep
3
+ yep → yep
4
+
5
+ ## Conditional assign
6
+ '' → ''
7
+ nope → nope
8
+ nope → nope
9
+ yep → yep
10
+
11
+ ## Cascading assign
12
+ nope → nope
13
+ foo → foo
14
+ '' → ''
15
+
16
+ ## Additive assign
17
+ yepyep → yepyep
18
+
19
+ ## Complex assignment
20
+ awesome → awesome
21
+ AWESOME → AWESOME
22
+
@@ -0,0 +1,19 @@
1
+
2
+ ## Simple capture
3
+ hi → hi
4
+
5
+ ## Conditional capture
6
+ '' → ''
7
+ hi → hi
8
+ '' → ''
9
+ hi → hi
10
+ hi → hi
11
+
12
+ ## Additive capture
13
+ hihi → hihi
14
+
15
+ ## Complex capture
16
+ hi → hi
17
+ um, hi → um, hi
18
+
19
+
File without changes
@@ -0,0 +1,4 @@
1
+ <meta name='generator' content='Octopress 1.0.0.alpha.21'>
2
+ Testing head tag
3
+ Testing that content_for is additive
4
+
File without changes
File without changes
File without changes
File without changes
@@ -0,0 +1,22 @@
1
+ ## Simple assign
2
+ yep → yep
3
+ yep → yep
4
+
5
+ ## Conditional assign
6
+ '' → ''
7
+ nope → nope
8
+ nope → nope
9
+ yep → yep
10
+
11
+ ## Cascading assign
12
+ nope → nope
13
+ foo → foo
14
+ '' → ''
15
+
16
+ ## Additive assign
17
+ yepyep → yepyep
18
+
19
+ ## Complex assignment
20
+ awesome → awesome
21
+ AWESOME → AWESOME
22
+
@@ -0,0 +1,19 @@
1
+
2
+ ## Simple capture
3
+ hi → hi
4
+
5
+ ## Conditional capture
6
+ '' → ''
7
+ hi → hi
8
+ '' → ''
9
+ hi → hi
10
+ hi → hi
11
+
12
+ ## Additive capture
13
+ hihi → hihi
14
+
15
+ ## Complex capture
16
+ hi → hi
17
+ um, hi → um, hi
18
+
19
+
File without changes
File without changes
@@ -0,0 +1,4 @@
1
+ <meta name='generator' content='Octopress 1.0.0.alpha.21'>
2
+ Testing head tag
3
+ Testing that content_for is additive
4
+
File without changes
File without changes
File without changes
@@ -0,0 +1,25 @@
1
+ ---
2
+ layout: nil
3
+ ---
4
+ ## Simple assign
5
+ yep → {% assign var1 = 'yep' %}{{ var1 }}
6
+ yep → {% assign var2 = 'yep' %}{{ var2 }}
7
+
8
+ ## Conditional assign
9
+ '' → '{% assign var3 = 'yep' unless true %}{{ var3 }}'
10
+ nope → {% assign var4 = 'nope' if true %}{{ var4 }}
11
+ nope → {% assign var4 ||= 'yep' %}{{ var4 }}
12
+ yep → {% assign varz ||= 'yep' %}{{ varz }}
13
+
14
+ ## Cascading assign
15
+ nope → {% assign var6 = baz || var4 %}{{ var6 }}
16
+ foo → {% assign var7 = baz || 'foo' %}{{ var7 }}
17
+ '' → '{% assign var8 = baz || foo || nil %}{{ var8 }}'
18
+
19
+ ## Additive assign
20
+ yepyep → {% assign var1 += 'yep' %}{{ var1 }}
21
+
22
+ ## Complex assignment
23
+ awesome → {% assign var9 = 'awesome' %}{{ var9 }}
24
+ AWESOME → {% assign var10 = var9 | upcase %}{{ var10 }}
25
+
@@ -0,0 +1,24 @@
1
+ ---
2
+ layout: nil
3
+ ---
4
+ {% assign some_bool = false %}
5
+ ## Simple capture
6
+ hi → {% capture var1 %}hi{% endcapture %}{{ var1 }}
7
+
8
+ ## Conditional capture
9
+ '' → '{% capture var2 unless true %}hi{% endcapture %}{{ var2 }}'
10
+ hi → {% capture var3 if true %}hi{% endcapture %}{{ var3 }}
11
+ '' → '{% capture var4 if some_bool %}hi{% endcapture %}{{ var4 }}'
12
+ hi → {% capture var3 ||= %}nooooo{% endcapture %}{{ var3 }}
13
+ hi → {% capture varz ||= %}hi{% endcapture %}{{ varz }}
14
+
15
+ ## Additive capture
16
+ hihi → {% capture var3 += if true %}hi{% endcapture %}{{ var3 }}
17
+
18
+ ## Complex capture
19
+ hi → {% capture var8 if false or page.layout %}hi{% endcapture %}{{ var8 }}
20
+ um, hi → {% capture var9 if false or page.layout %}
21
+ {% assign var10 = 'hi' %}
22
+ um, {{ var10 }}
23
+ {% endcapture %}{{ var9 }}
24
+
File without changes
File without changes
File without changes
File without changes
data/test/test.rb CHANGED
@@ -39,13 +39,13 @@ end
39
39
  build
40
40
 
41
41
  def test_tags(dir)
42
- tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts include_if}
43
- tags.each { |file| test("tag_tests/#{file}.html", dir) }
42
+ tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts include_if assign capture}
43
+ tags.each { |file| test("test_tags/#{file}.html", dir) }
44
44
  end
45
45
 
46
46
  def test_layouts(dir)
47
47
  layouts = %w{local plugin_layout theme theme_override}
48
- layouts.each { |file| test("layout_tests/#{file}.html", dir) }
48
+ layouts.each { |file| test("test_layouts/#{file}.html", dir) }
49
49
  end
50
50
 
51
51
  def test_configs(dir)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-ink
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.alpha.20
4
+ version: 1.0.0.alpha.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -111,11 +111,14 @@ files:
111
111
  - lib/octopress-ink/helpers/conditional.rb
112
112
  - lib/octopress-ink/helpers/content_for.rb
113
113
  - lib/octopress-ink/helpers/path.rb
114
+ - lib/octopress-ink/helpers/var.rb
114
115
  - lib/octopress-ink/jekyll/hooks.rb
115
116
  - lib/octopress-ink/plugin.rb
116
117
  - lib/octopress-ink/plugins.rb
117
118
  - lib/octopress-ink/plugins/stylesheets.rb
118
119
  - lib/octopress-ink/tags.rb
120
+ - lib/octopress-ink/tags/assign.rb
121
+ - lib/octopress-ink/tags/capture.rb
119
122
  - lib/octopress-ink/tags/content_for.rb
120
123
  - lib/octopress-ink/tags/footer.rb
121
124
  - lib/octopress-ink/tags/head.rb
@@ -144,22 +147,24 @@ files:
144
147
  - test/expected/favicon.ico
145
148
  - test/expected/favicon.png
146
149
  - test/expected/index.html
147
- - test/expected/layout_tests/local.html
148
- - test/expected/layout_tests/plugin_layout.html
149
- - test/expected/layout_tests/theme.html
150
- - test/expected/layout_tests/theme_override.html
151
150
  - test/expected/robots.txt
152
- - test/expected/tag_tests/content_for.html
153
- - test/expected/tag_tests/footer.html
154
- - test/expected/tag_tests/head.html
155
- - test/expected/tag_tests/include.html
156
- - test/expected/tag_tests/include_if.html
157
- - test/expected/tag_tests/include_plugin.html
158
- - test/expected/tag_tests/include_theme.html
159
- - test/expected/tag_tests/include_theme_override.html
160
- - test/expected/tag_tests/scripts.html
161
151
  - test/expected/test_config/plugin_config.html
162
152
  - test/expected/test_config/theme_config.html
153
+ - test/expected/test_layouts/local.html
154
+ - test/expected/test_layouts/plugin_layout.html
155
+ - test/expected/test_layouts/theme.html
156
+ - test/expected/test_layouts/theme_override.html
157
+ - test/expected/test_tags/assign.html
158
+ - test/expected/test_tags/capture.html
159
+ - test/expected/test_tags/content_for.html
160
+ - test/expected/test_tags/footer.html
161
+ - test/expected/test_tags/head.html
162
+ - test/expected/test_tags/include.html
163
+ - test/expected/test_tags/include_if.html
164
+ - test/expected/test_tags/include_plugin.html
165
+ - test/expected/test_tags/include_theme.html
166
+ - test/expected/test_tags/include_theme_override.html
167
+ - test/expected/test_tags/scripts.html
163
168
  - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
164
169
  - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
165
170
  - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -167,24 +172,26 @@ files:
167
172
  - test/site/favicon.ico
168
173
  - test/site/favicon.png
169
174
  - test/site/index.html
170
- - test/site/layout_tests/local.html
171
- - test/site/layout_tests/plugin_layout.html
172
- - test/site/layout_tests/theme.html
173
- - test/site/layout_tests/theme_override.html
174
175
  - test/site/robots.txt
175
176
  - test/site/stylesheets/all-5f4148b9fde2541e99deb55ebf3fe695.css
176
177
  - test/site/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
177
- - test/site/tag_tests/content_for.html
178
- - test/site/tag_tests/footer.html
179
- - test/site/tag_tests/head.html
180
- - test/site/tag_tests/include.html
181
- - test/site/tag_tests/include_if.html
182
- - test/site/tag_tests/include_plugin.html
183
- - test/site/tag_tests/include_theme.html
184
- - test/site/tag_tests/include_theme_override.html
185
- - test/site/tag_tests/scripts.html
186
178
  - test/site/test_config/plugin_config.html
187
179
  - test/site/test_config/theme_config.html
180
+ - test/site/test_layouts/local.html
181
+ - test/site/test_layouts/plugin_layout.html
182
+ - test/site/test_layouts/theme.html
183
+ - test/site/test_layouts/theme_override.html
184
+ - test/site/test_tags/assign.html
185
+ - test/site/test_tags/capture.html
186
+ - test/site/test_tags/content_for.html
187
+ - test/site/test_tags/footer.html
188
+ - test/site/test_tags/head.html
189
+ - test/site/test_tags/include.html
190
+ - test/site/test_tags/include_if.html
191
+ - test/site/test_tags/include_plugin.html
192
+ - test/site/test_tags/include_theme.html
193
+ - test/site/test_tags/include_theme_override.html
194
+ - test/site/test_tags/scripts.html
188
195
  - test/source/.gitignore
189
196
  - test/source/_custom/awesome-sauce/config.yml
190
197
  - test/source/_custom/theme/config.yml
@@ -220,24 +227,26 @@ files:
220
227
  - test/source/_plugins/test-theme/stylesheets/theme-test2.css
221
228
  - test/source/favicon.png
222
229
  - test/source/index.md
223
- - test/source/layout_tests/local.html
224
- - test/source/layout_tests/plugin_layout.html
225
- - test/source/layout_tests/theme.html
226
- - test/source/layout_tests/theme_override.html
227
230
  - test/source/stylesheets/_foo.scss
228
231
  - test/source/stylesheets/site.sass
229
232
  - test/source/stylesheets/test.css
230
- - test/source/tag_tests/content_for.html
231
- - test/source/tag_tests/footer.html
232
- - test/source/tag_tests/head.html
233
- - test/source/tag_tests/include.html
234
- - test/source/tag_tests/include_if.html
235
- - test/source/tag_tests/include_plugin.html
236
- - test/source/tag_tests/include_theme.html
237
- - test/source/tag_tests/include_theme_override.html
238
- - test/source/tag_tests/scripts.html
239
233
  - test/source/test_config/plugin_config.html
240
234
  - test/source/test_config/theme_config.html
235
+ - test/source/test_layouts/local.html
236
+ - test/source/test_layouts/plugin_layout.html
237
+ - test/source/test_layouts/theme.html
238
+ - test/source/test_layouts/theme_override.html
239
+ - test/source/test_tags/assign.html
240
+ - test/source/test_tags/capture.html
241
+ - test/source/test_tags/content_for.html
242
+ - test/source/test_tags/footer.html
243
+ - test/source/test_tags/head.html
244
+ - test/source/test_tags/include.html
245
+ - test/source/test_tags/include_if.html
246
+ - test/source/test_tags/include_plugin.html
247
+ - test/source/test_tags/include_theme.html
248
+ - test/source/test_tags/include_theme_override.html
249
+ - test/source/test_tags/scripts.html
241
250
  - test/test.rb
242
251
  homepage: https://github.com/octopress/ink
243
252
  licenses:
@@ -281,22 +290,24 @@ test_files:
281
290
  - test/expected/favicon.ico
282
291
  - test/expected/favicon.png
283
292
  - test/expected/index.html
284
- - test/expected/layout_tests/local.html
285
- - test/expected/layout_tests/plugin_layout.html
286
- - test/expected/layout_tests/theme.html
287
- - test/expected/layout_tests/theme_override.html
288
293
  - test/expected/robots.txt
289
- - test/expected/tag_tests/content_for.html
290
- - test/expected/tag_tests/footer.html
291
- - test/expected/tag_tests/head.html
292
- - test/expected/tag_tests/include.html
293
- - test/expected/tag_tests/include_if.html
294
- - test/expected/tag_tests/include_plugin.html
295
- - test/expected/tag_tests/include_theme.html
296
- - test/expected/tag_tests/include_theme_override.html
297
- - test/expected/tag_tests/scripts.html
298
294
  - test/expected/test_config/plugin_config.html
299
295
  - test/expected/test_config/theme_config.html
296
+ - test/expected/test_layouts/local.html
297
+ - test/expected/test_layouts/plugin_layout.html
298
+ - test/expected/test_layouts/theme.html
299
+ - test/expected/test_layouts/theme_override.html
300
+ - test/expected/test_tags/assign.html
301
+ - test/expected/test_tags/capture.html
302
+ - test/expected/test_tags/content_for.html
303
+ - test/expected/test_tags/footer.html
304
+ - test/expected/test_tags/head.html
305
+ - test/expected/test_tags/include.html
306
+ - test/expected/test_tags/include_if.html
307
+ - test/expected/test_tags/include_plugin.html
308
+ - test/expected/test_tags/include_theme.html
309
+ - test/expected/test_tags/include_theme_override.html
310
+ - test/expected/test_tags/scripts.html
300
311
  - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
301
312
  - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
302
313
  - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -304,24 +315,26 @@ test_files:
304
315
  - test/site/favicon.ico
305
316
  - test/site/favicon.png
306
317
  - test/site/index.html
307
- - test/site/layout_tests/local.html
308
- - test/site/layout_tests/plugin_layout.html
309
- - test/site/layout_tests/theme.html
310
- - test/site/layout_tests/theme_override.html
311
318
  - test/site/robots.txt
312
319
  - test/site/stylesheets/all-5f4148b9fde2541e99deb55ebf3fe695.css
313
320
  - test/site/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
314
- - test/site/tag_tests/content_for.html
315
- - test/site/tag_tests/footer.html
316
- - test/site/tag_tests/head.html
317
- - test/site/tag_tests/include.html
318
- - test/site/tag_tests/include_if.html
319
- - test/site/tag_tests/include_plugin.html
320
- - test/site/tag_tests/include_theme.html
321
- - test/site/tag_tests/include_theme_override.html
322
- - test/site/tag_tests/scripts.html
323
321
  - test/site/test_config/plugin_config.html
324
322
  - test/site/test_config/theme_config.html
323
+ - test/site/test_layouts/local.html
324
+ - test/site/test_layouts/plugin_layout.html
325
+ - test/site/test_layouts/theme.html
326
+ - test/site/test_layouts/theme_override.html
327
+ - test/site/test_tags/assign.html
328
+ - test/site/test_tags/capture.html
329
+ - test/site/test_tags/content_for.html
330
+ - test/site/test_tags/footer.html
331
+ - test/site/test_tags/head.html
332
+ - test/site/test_tags/include.html
333
+ - test/site/test_tags/include_if.html
334
+ - test/site/test_tags/include_plugin.html
335
+ - test/site/test_tags/include_theme.html
336
+ - test/site/test_tags/include_theme_override.html
337
+ - test/site/test_tags/scripts.html
325
338
  - test/source/.gitignore
326
339
  - test/source/_custom/awesome-sauce/config.yml
327
340
  - test/source/_custom/theme/config.yml
@@ -357,22 +370,24 @@ test_files:
357
370
  - test/source/_plugins/test-theme/stylesheets/theme-test2.css
358
371
  - test/source/favicon.png
359
372
  - test/source/index.md
360
- - test/source/layout_tests/local.html
361
- - test/source/layout_tests/plugin_layout.html
362
- - test/source/layout_tests/theme.html
363
- - test/source/layout_tests/theme_override.html
364
373
  - test/source/stylesheets/_foo.scss
365
374
  - test/source/stylesheets/site.sass
366
375
  - test/source/stylesheets/test.css
367
- - test/source/tag_tests/content_for.html
368
- - test/source/tag_tests/footer.html
369
- - test/source/tag_tests/head.html
370
- - test/source/tag_tests/include.html
371
- - test/source/tag_tests/include_if.html
372
- - test/source/tag_tests/include_plugin.html
373
- - test/source/tag_tests/include_theme.html
374
- - test/source/tag_tests/include_theme_override.html
375
- - test/source/tag_tests/scripts.html
376
376
  - test/source/test_config/plugin_config.html
377
377
  - test/source/test_config/theme_config.html
378
+ - test/source/test_layouts/local.html
379
+ - test/source/test_layouts/plugin_layout.html
380
+ - test/source/test_layouts/theme.html
381
+ - test/source/test_layouts/theme_override.html
382
+ - test/source/test_tags/assign.html
383
+ - test/source/test_tags/capture.html
384
+ - test/source/test_tags/content_for.html
385
+ - test/source/test_tags/footer.html
386
+ - test/source/test_tags/head.html
387
+ - test/source/test_tags/include.html
388
+ - test/source/test_tags/include_if.html
389
+ - test/source/test_tags/include_plugin.html
390
+ - test/source/test_tags/include_theme.html
391
+ - test/source/test_tags/include_theme_override.html
392
+ - test/source/test_tags/scripts.html
378
393
  - test/test.rb
@@ -1,4 +0,0 @@
1
- <meta name='generator' content='Octopress 1.0.0.alpha.19'>
2
- Testing head tag
3
- Testing that content_for is additive
4
-
@@ -1,4 +0,0 @@
1
- <meta name='generator' content='Octopress 1.0.0.alpha.19'>
2
- Testing head tag
3
- Testing that content_for is additive
4
-