octopress-ink 1.0.0.alpha.29 → 1.0.0.alpha.30

data/lib/octopress-ink/tags/abort.rb

@@ -0,0 +1,19 @@
+module Octopress
+  module Tags
+    class AbortTag < Liquid::Tag
+      def initialize(tag_name, markup, tokens)
+        super
+        @markup = " #{markup}"
+      end
+
+      def render(context)
+        if Helpers::Conditional.parse(@markup, context)
+          env = context.environments.first
+          dest = File.join(Helpers::Path.site_dir, env['page']['url'])
+          context.environments.first['site']['pages'] = Helpers::Path.remove_page(dest)
+        end
+        ''
+      end
+    end
+  end
+end

data/lib/octopress-ink/tags/assign.rb

@@ -9,8 +9,7 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
 
         if markup =~ SYNTAX
           var      = $1

data/lib/octopress-ink/tags/capture.rb

@@ -9,14 +9,21 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
+        if markup =~ Helpers::Var::HAS_FILTERS
+          markup = $1
+          filters = $2
+        end
 
         if markup =~ SYNTAX
           var      = $1
           operator = $2
           value = super.lstrip
 
+          unless value.nil? || filters.nil?
+            value = Helpers::Var.render_filters(value, filters, context)
+          end
+
           context = Helpers::Var.set_var(var, operator, value, context)
         else
           raise SyntaxError.new("Syntax Error in 'capture' - Valid syntax: capture [var]")

data/lib/octopress-ink/tags/content_for.rb

@@ -10,8 +10,7 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
 
         @block_name ||= Helpers::ContentFor.get_block_name(@tag_name, markup)
         Helpers::ContentFor.append_to_block(context, @block_name, super)

data/lib/octopress-ink/tags/filter.rb

@@ -0,0 +1,21 @@
+module Octopress
+  module Tags
+    class FilterTag < Liquid::Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @markup = " #{markup}"
+      end
+
+      def render(context)
+        content = super.strip
+
+        return content unless markup = Helpers::Conditional.parse(@markup, context)
+        if markup =~ Helpers::Var::HAS_FILTERS and !content.nil?
+          content = Helpers::Var.render_filters(content, $2, context)
+        end
+
+        content
+      end
+    end
+  end
+end

data/lib/octopress-ink/tags/include.rb

@@ -9,12 +9,11 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup = Helpers::Conditional.parse(@markup, context)
         if markup =~ Helpers::Var::HAS_FILTERS
           markup = $1
           filters = $2
         end
-        return unless markup
         markup = Helpers::Var.evaluate_ternary(markup, context)
         markup = Helpers::Path.parse(markup, context)
 

data/lib/octopress-ink/tags/render.rb

@@ -13,12 +13,11 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup = Helpers::Conditional.parse(@markup, context)
         if markup =~ Helpers::Var::HAS_FILTERS
           markup = $1
           filters = $2
         end
-        return unless markup
         markup = Helpers::Var.evaluate_ternary(markup, context)
         markup = Helpers::Path.parse(markup, context)
 

data/lib/octopress-ink/tags/return.rb

@@ -7,8 +7,7 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
 
         Helpers::Var.get_value(markup, context)
       end

data/lib/octopress-ink/tags/wrap.rb

@@ -11,9 +11,12 @@ module Octopress
       end
 
       def render(context)
-        require 'pry-debugger'
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
+
+        if markup =~ Helpers::Var::HAS_FILTERS
+          markup = $1
+          filters = $2
+        end
 
         type = if markup =~ /^\s*yield\s(.+)/
           markup = $1
@@ -52,6 +55,10 @@ module Octopress
         content = super.strip
         context.scopes.first['yield'] = old_yield
 
+        unless content.nil? || filters.nil?
+          content = Helpers::Var.render_filters(content, filters, context)
+        end
+
         content
       end
 

data/lib/octopress-ink/tags/yield.rb

@@ -19,18 +19,13 @@ module Octopress
       end
 
       def render(context)
-        markup = Helpers::Conditional.parse(@markup, context)
-        return unless markup
+        return unless markup = Helpers::Conditional.parse(@markup, context)
         content = Helpers::ContentFor.render(context, @block_name)
 
         unless content.nil? || @filters.nil?
           content = Helpers::Var.render_filters(content, @filters, context)
         end
 
-        if @block_name == 'head' && ENV['OCTOPRESS_ENV'] != 'TEST'
-          content.insert 0, "<meta name='generator' content='Octopress #{Octopress::Ink::VERSION}'>"
-        end
-
         content
       end
     end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.29"
+    VERSION = "1.0.0.alpha.30"
   end
 end

data/test/expected/2014/02/01/test-post.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Test Post</title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <div class='local-override'><p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
+</div>
+
+  </body>
+</html>

data/test/expected/test_tags/abort_false.html

@@ -0,0 +1 @@
+Woohoo 

data/test/expected/test_tags/capture.html

@@ -17,3 +17,5 @@ hi → hi
 um, hi → um, hi
         
 
+## Test filters
+foo bar baz booga → foo bar baz booga

data/test/expected/test_tags/filter.html

@@ -0,0 +1,4 @@
+omg → omg
+OMG → OMG
+BOOGIE → BOOGIE
+boogie → boogie

data/test/expected/test_tags/wrap.html

@@ -8,6 +8,7 @@
 
 ## Filter testing
 [- TESTING INCLUDE -] → [- TESTING INCLUDE -]
+[= TESTING INCLUDE =] → [= TESTING INCLUDE =]
 [- TESTING FILTERS -] → [- TESTING FILTERS -]
 
 ## Conditional wrap

data/test/plugins/awesome-sauce/config.yml

@@ -0,0 +1,2 @@
+test: config from plugin
+test_override: also config from plugin

data/test/plugins/awesome-sauce/plugin.rb

@@ -0,0 +1,16 @@
+class TestPlugin < Octopress::Plugin
+  def initialize(name, type)
+    @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
+    super
+  end
+
+  def add_assets
+    add_stylesheet 'plugin-test.css'
+    add_stylesheet 'plugin-media-test.css', 'print'
+    add_root_file 'robots.txt'
+    super
+  end
+end
+
+Octopress.register_plugin(TestPlugin, 'awesome-sauce')
+

data/test/{source/_plugins → plugins}/test-theme/config.yml

@@ -1,2 +1,5 @@
 test: config from theme
 test_override: also config from theme
+pages:
+  test:
+    url: /awesome/

data/test/plugins/test-theme/pages/pages-test.md

@@ -0,0 +1,6 @@
+---
+layout: theme:default
+url_config: pages.test.path
+---
+
+Testing pages. **strong** *emphasized* [a link](http://example.com)

data/test/plugins/test-theme/pages/sub/test.md

@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+SUB BABY

data/test/{source/_plugins/bundler.rb → plugins/test-theme/plugin.rb}

@@ -2,7 +2,7 @@ require 'octopress-ink'
 
 class TestTheme < Octopress::Plugin
   def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__), 'test-theme'))
+    @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
     super
   end
   def add_assets
@@ -13,20 +13,4 @@ class TestTheme < Octopress::Plugin
   end
 end
 
-class TestPlugin < Octopress::Plugin
-  def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__), 'awesome-sauce'))
-    super
-  end
-
-  def add_assets
-    add_stylesheet 'plugin-test.css'
-    add_stylesheet 'plugin-media-test.css', 'print'
-    add_root_file 'robots.txt'
-    super
-  end
-end
-
 Octopress.register_plugin(TestTheme, 'classic', 'theme')
-Octopress.register_plugin(TestPlugin, 'awesome-sauce')
-

data/test/site/2014/02/01/test-post.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Test Post</title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <div class='local-override'><p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
+</div>
+
+  </body>
+</html>

data/test/site/index.html

@@ -26,6 +26,8 @@
 <li>concat_css</li>
 <li>concat_js</li>
 </ul>
+
+<p>one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five</p>
 </div>
 
   </body>

data/test/site/pages-tet.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <p>Testing pages override. <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">a link</a></p>
+
+  </body>
+</html>

data/test/site/test_layouts/test_markdown.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <p><strong>strong</strong> <em>emphasized</em> <a href="http://example.com">a link</a></p>
+
+  </body>
+</html>

data/test/site/test_tags/abort_false.html

@@ -0,0 +1 @@
+Woohoo 

data/test/site/test_tags/abort_true.html

@@ -0,0 +1 @@
+

data/test/site/test_tags/capture.html

@@ -17,3 +17,5 @@ hi → hi
 um, hi → um, hi
         
 
+## Test filters
+foo bar baz booga → foo bar baz booga

data/test/site/test_tags/filter.html

@@ -0,0 +1,4 @@
+omg → omg
+OMG → OMG
+BOOGIE → BOOGIE
+boogie → boogie

data/test/site/test_tags/wrap.html

@@ -8,6 +8,7 @@
 
 ## Filter testing
 [- TESTING INCLUDE -] → [- TESTING INCLUDE -]
+[= TESTING INCLUDE =] → [= TESTING INCLUDE =]
 [- TESTING FILTERS -] → [- TESTING FILTERS -]
 
 ## Conditional wrap

data/test/source/_plugins/awesome-sauce/config.yml

@@ -1,2 +1 @@
-test: config from plugin
-test_override: also config from plugin
+test_override: config from plugin override