octopress-ink 1.0.0.alpha.24 → 1.0.0.alpha.25

data/test/source/test_tags/content_for.html

@@ -1,6 +1,21 @@
 ---
-layout: content_for
 ---
-{% content_for foo %}
-Testing content for
-{% endcontent_for %}
+Testing content for → {% content_for foo %}Testing content for{% endcontent_for %}{% yield foo %}
+
+Testing scripts → {% scripts %}
+Testing
+{% endscripts %}{% scripts %}
+scripts
+{% endscripts %}{% yield scripts | join_space %}
+
+Testing head tag → {% head %}
+Testing
+{% endhead %}{% head %}
+head tag
+{% endhead %}{% yield head | join_space %}
+
+Testing footer → {% footer %}
+Testing
+{% endfooter %}{% footer %}
+footer
+{% endfooter %}{% yield footer | join_space %}

data/test/source/test_tags/include.html

@@ -9,6 +9,10 @@ Testing Include → {% include foo.html %}
 ## Local var passing
 Testing Include var_test → {% include foo.html some_var="var_test" %}
 
+## Filter testing
+TESTING INCLUDE → {% include foo.html | upcase %}
+'' → '{% include foo.html | upcase unless true %}'
+
 ## Conditional Include
 '' → '{% include foo.html unless true %}'
 '' → '{% include foo.html unless some_bool %}'

data/test/source/test_tags/render.html

@@ -21,6 +21,10 @@ Testing Render → {% render file if some_bool %}
 ## Test Variables
 kittens → {% render test_render/_var.html %}
 
+## Test Filters
+KITTENS → {% render test_render/_var.html | upcase %}
+MITTENS → {% render test_render/_var.html | replace:"k","m" | upcase %}
+
 ## Ternary include
 kittens → {% render (false ? file : file2) %}
 Testing Render → {% render (some_bool ? file : file2) %}

data/test/source/test_tags/return.html

@@ -26,5 +26,5 @@ yep → {% for person in page.people %}{% return 'yep' if person.name == 'Bill'
 
 ## Returns with filters
 2013-07-21T18:59:00-05:00 → {% return post.date or page.date | datetime | date_to_xmlschema %}
-2013-07-21T18:59:00-05:00 → {% return (post ? post.date : page.date) | datetime | date_to_xmlschema %}
+2013-07-21T18:59:00-05:00 → {% return (false ? post.date : page.date) | datetime | date_to_xmlschema %}
 

data/test/source/test_tags/wrap.html

@@ -9,6 +9,10 @@ layout: nil
 ## Local var passing
 [- Testing Include var_test -] → {% wrap foo.html some_var="var_test" %}[- {=yield} -]{% endwrap %}
 
+## Filter testing
+[- TESTING INCLUDE -] → {% wrap foo.html | upcase %}[- {=yield} -]{% endwrap %}
+[- TESTING FILTERS -] → {% wrap foo.html | replace:"Include","Filters" | upcase | %}[- {=yield} -]{% endwrap %}
+
 ## Conditional wrap
 '' → '{% wrap foo.html unless true %}[- {=yield} -]{% endwrap %}'
 '' → '{% wrap foo.html unless some_bool %}[- {=yield} -]{% endwrap %}'
@@ -22,3 +26,6 @@ layout: nil
 ## Wrap render
 [- Testing Render -] → {% wrap_render test_render/_f.html %}[- {=yield} -]{% endwrap_render %}
 
+## Wrap yield
+{% content_for test %}Testing wrap yield{% endcontent_for %}
+[- Testing wrap yield -] → {% wrap_yield test %}[- {= yield } -]{% endwrap_yield %}

data/test/test.rb

@@ -1,4 +1,5 @@
 require 'colorator'
+ENV['OCTOPRESS_ENV'] = 'TEST'
 
 @has_failed = false
 @failures = {}
@@ -39,7 +40,7 @@ end
 build
 
 def test_tags(dir)
-  tags = %w{content_for footer head include scripts assign capture wrap render}
+  tags = %w{content_for include assign capture wrap render}
   tags.each { |file| test("test_tags/#{file}.html", dir) }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.24
+  version: 1.0.0.alpha.25
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -106,11 +106,13 @@ files:
 - lib/octopress-ink/assets/static_file.rb
 - lib/octopress-ink/assets/static_file_content.rb
 - lib/octopress-ink/assets/stylesheet.rb
+- lib/octopress-ink/filters.rb
 - lib/octopress-ink/generators/plugin_assets.rb
 - lib/octopress-ink/helpers.rb
 - lib/octopress-ink/helpers/conditional.rb
 - lib/octopress-ink/helpers/content_for.rb
 - lib/octopress-ink/helpers/path.rb
+- lib/octopress-ink/helpers/titlecase.rb
 - lib/octopress-ink/helpers/var.rb
 - lib/octopress-ink/jekyll/hooks.rb
 - lib/octopress-ink/plugin.rb
@@ -124,6 +126,7 @@ files:
 - lib/octopress-ink/tags/head.rb
 - lib/octopress-ink/tags/include.rb
 - lib/octopress-ink/tags/javascript.rb
+- lib/octopress-ink/tags/line_comment.rb
 - lib/octopress-ink/tags/render.rb
 - lib/octopress-ink/tags/return.rb
 - lib/octopress-ink/tags/scripts.rb
@@ -159,11 +162,8 @@ files:
 - test/expected/test_tags/assign.html
 - test/expected/test_tags/capture.html
 - test/expected/test_tags/content_for.html
-- test/expected/test_tags/footer.html
-- test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
 - test/expected/test_tags/render.html
-- test/expected/test_tags/scripts.html
 - test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
@@ -184,12 +184,9 @@ files:
 - test/site/test_tags/assign.html
 - test/site/test_tags/capture.html
 - test/site/test_tags/content_for.html
-- test/site/test_tags/footer.html
-- test/site/test_tags/head.html
 - test/site/test_tags/include.html
 - test/site/test_tags/render.html
 - test/site/test_tags/return.html
-- test/site/test_tags/scripts.html
 - test/site/test_tags/wrap.html
 - test/source/.gitignore
 - test/source/_custom/awesome-sauce/config.yml
@@ -199,7 +196,6 @@ files:
 - test/source/_custom/theme/stylesheets/_colors.sass
 - test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
-- test/source/_layouts/content_for.html
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -241,12 +237,9 @@ files:
 - test/source/test_tags/assign.html
 - test/source/test_tags/capture.html
 - test/source/test_tags/content_for.html
-- test/source/test_tags/footer.html
-- test/source/test_tags/head.html
 - test/source/test_tags/include.html
 - test/source/test_tags/render.html
 - test/source/test_tags/return.html
-- test/source/test_tags/scripts.html
 - test/source/test_tags/wrap.html
 - test/test.rb
 homepage: https://github.com/octopress/ink
@@ -301,11 +294,8 @@ test_files:
 - test/expected/test_tags/assign.html
 - test/expected/test_tags/capture.html
 - test/expected/test_tags/content_for.html
-- test/expected/test_tags/footer.html
-- test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
 - test/expected/test_tags/render.html
-- test/expected/test_tags/scripts.html
 - test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
@@ -326,12 +316,9 @@ test_files:
 - test/site/test_tags/assign.html
 - test/site/test_tags/capture.html
 - test/site/test_tags/content_for.html
-- test/site/test_tags/footer.html
-- test/site/test_tags/head.html
 - test/site/test_tags/include.html
 - test/site/test_tags/render.html
 - test/site/test_tags/return.html
-- test/site/test_tags/scripts.html
 - test/site/test_tags/wrap.html
 - test/source/.gitignore
 - test/source/_custom/awesome-sauce/config.yml
@@ -341,7 +328,6 @@ test_files:
 - test/source/_custom/theme/stylesheets/_colors.sass
 - test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
-- test/source/_layouts/content_for.html
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -383,11 +369,8 @@ test_files:
 - test/source/test_tags/assign.html
 - test/source/test_tags/capture.html
 - test/source/test_tags/content_for.html
-- test/source/test_tags/footer.html
-- test/source/test_tags/head.html
 - test/source/test_tags/include.html
 - test/source/test_tags/render.html
 - test/source/test_tags/return.html
-- test/source/test_tags/scripts.html
 - test/source/test_tags/wrap.html
 - test/test.rb

data/test/expected/test_tags/footer.html

@@ -1,3 +0,0 @@
-
-<footer>This should go in the footer</footer>
-

data/test/expected/test_tags/head.html

@@ -1,4 +0,0 @@
-<meta name='generator' content='Octopress 1.0.0.alpha.24'>
-Testing head tag
-Testing that content_for is additive
-

data/test/expected/test_tags/scripts.html

@@ -1,4 +0,0 @@
-
-
-Testing scripts
-

data/test/site/test_tags/footer.html

@@ -1,3 +0,0 @@
-
-<footer>This should go in the footer</footer>
-

data/test/site/test_tags/head.html

@@ -1,4 +0,0 @@
-<meta name='generator' content='Octopress 1.0.0.alpha.23'>
-Testing head tag
-Testing that content_for is additive
-

data/test/site/test_tags/scripts.html

@@ -1,4 +0,0 @@
-
-
-Testing scripts
-

data/test/source/_layouts/content_for.html

@@ -1,3 +0,0 @@
-{% yield foo %}
-{% wrap_yield footer %}<footer>{= yield }</footer>{% endwrap_yield %}
-{% yield scripts %}

data/test/source/test_tags/footer.html

@@ -1,6 +0,0 @@
----
-layout: content_for
----
-{% footer %}
-This should go in the footer
-{% endfooter %}

data/test/source/test_tags/head.html

@@ -1,10 +0,0 @@
----
-layout: head
----
-{% head %}
-Testing head tag
-{% endhead %}
-
-{% head %}
-Testing that content_for is additive
-{% endhead %}

data/test/source/test_tags/scripts.html

@@ -1,6 +0,0 @@
----
-layout: content_for
----
-{% scripts %}
-Testing scripts
-{% endscripts %}