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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f2fb82a20098cdfe2f3e53ba1d8698b2c687afb
-  data.tar.gz: 70ccb3b9d8223443f105e6457b000dbdb5e8efc9
+  metadata.gz: 6d06768e2605f32b222536b3b637371edeb7c8ee
+  data.tar.gz: 10ec8710720d37bfc0dc963849f8e05ef0e25d85
 SHA512:
-  metadata.gz: 5d98ccf5704b0055c3acc922eda1bd69dc38387022cabe493bfefc553795af644747ed2cbac4c585e262f8431f94618b4ae99e01787dd1c896479dc8785c88c6
-  data.tar.gz: b2c296c4fcce0c5f40928448b72423b48b29c0b50969d5b27e4e54054566e78b0ee2ce0b18a9f2794765058f42ed1b7cf64e497a781d739e23e164dddc5674e3
+  metadata.gz: 4c7fb93d8f87cad0e5cb196e34c02733baf38672d9de4e1862ebcd8e0326fdba1eb8bb5436309992b00a7b9880cf4d5548e7ffc9dc2dad16ef3bb5656eeb1d1e
+  data.tar.gz: 6fe264b8152f0f8a12e0295e1f111d66650d561eda2a55b7ff424aa7487ebfa548fc5b80fc6f9451b51b2581c6d51292b437d2128c45886e97557da7ffaa5bd3

data/lib/octopress-ink/helpers/conditional.rb

@@ -0,0 +1,22 @@
+module Octopress
+  module Helpers
+    module Conditional
+      SYNTAX = /(.+)(if|unless)\s*(.+)/
+
+      def self.parse(markup, context)
+        if markup =~ SYNTAX
+          case $2
+          when 'if'
+            tag = Liquid::If.new('if', $3, ["true","{% endif %}"])
+          when 'unless'
+            tag = Liquid::Unless.new('unless', $3, ["true","{% endunless %}"])
+          end
+          tag.render(context) != ''
+        else
+          true
+        end
+      end
+
+    end
+  end
+end

data/lib/octopress-ink/helpers/path.rb

@@ -0,0 +1,14 @@
+module Octopress
+  module Helpers
+    module Path
+      FILE = /(\S+)(\s.+)/
+      def self.parse(markup, context)
+        if markup =~ FILE
+          (context[$1].nil? ? $1 : context[$1]) + $2
+        else
+          markup
+        end
+      end
+    end
+  end
+end

data/lib/octopress-ink/helpers.rb

@@ -0,0 +1,7 @@
+module Octopress
+  module Helpers
+    autoload :Conditional,            'octopress-ink/helpers/conditional'
+    autoload :ContentFor,             'octopress-ink/helpers/content_for'
+    autoload :Path,                   'octopress-ink/helpers/path'
+  end
+end

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

@@ -5,10 +5,17 @@ module Octopress
 
       def initialize(tag_name, markup, tokens)
         super
-        @block_name ||= Helpers::ContentFor.get_block_name(tag_name, markup)
+        @tag_name = tag_name
+        @markup   = markup
       end
 
       def render(context)
+        if @markup =~ Helpers::Conditional::SYNTAX
+          return unless Helpers::Conditional.parse(@markup, context)
+          @markup = $1
+        end
+
+        @block_name ||= Helpers::ContentFor.get_block_name(@tag_name, @markup)
         Helpers::ContentFor.append_to_block(context, @block_name, super)
         ''
       end

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

@@ -9,6 +9,11 @@ module Octopress
       end
 
       def render(context)
+        if @markup =~ Helpers::Conditional::SYNTAX
+          return unless Helpers::Conditional.parse(@markup, context)
+          @markup = Helpers::Path.parse($1, context)
+        end
+
         include_tag = Jekyll::Tags::IncludeTag.new('include', @markup, [])
 
         # If markup references a plugin e.g. plugin-name:include-file.html

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

@@ -6,10 +6,18 @@ module Octopress
       HAS_YIELD = /(.*?)({=\s*yield\s*})(.*)/im
       def initialize(tag_name, markup, tokens)
         super
-        @block_name = Helpers::ContentFor.get_block_name(tag_name, markup)
+        @markup = markup
+        @tag_name = tag_name
       end
 
       def render(context)
+        if @markup =~ Helpers::Conditional::SYNTAX
+          return unless Helpers::Conditional.parse(@markup, context)
+          @markup = $1
+        end
+
+        @block_name = Helpers::ContentFor.get_block_name(@tag_name, @markup)
+
         wrap = super.strip
         content = Helpers::ContentFor.render(context, @block_name).strip
 

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

@@ -9,6 +9,11 @@ module Octopress
       end
 
       def render(context)
+        if @markup =~ Helpers::Conditional::SYNTAX
+          return unless Helpers::Conditional.parse(@markup, context)
+          @markup = $1
+        end
+
         content = Helpers::ContentFor.render(context, @block_name)
         if @block_name == 'head'
           content.insert 0, "<meta name='generator' content='Octopress #{Octopress::Ink::VERSION}'>\n"

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -6,11 +6,11 @@ require 'octopress-ink/version'
 require 'octopress-ink/generators/plugin_assets'
 require 'octopress-ink/jekyll/hooks'
 require 'octopress-ink/version'
-require 'octopress-ink/helpers/content_for'
 
 module Octopress
   CUSTOM_DIR = "_custom"
 
+  autoload :Helpers,              'octopress-ink/helpers'
   autoload :Assets,               'octopress-ink/assets'
   autoload :StaticFile,           'octopress-ink/assets/static_file'
   autoload :StaticFileContent,    'octopress-ink/assets/static_file_content'

data/test/_config.yml

@@ -3,3 +3,4 @@ markdown: redcarpet
 pygments: true
 source: source
 destination: site
+include_test: foo.html

data/test/expected/tag_tests/include_if.html

@@ -0,0 +1,6 @@
+Testing Include var_test
+
+
+
+Testing Include var_test
+

data/test/site/tag_tests/include_if.html

@@ -0,0 +1,6 @@
+Testing Include var_test
+
+
+
+Testing Include var_test
+

data/test/source/tag_tests/include_if.html

@@ -0,0 +1,6 @@
+---
+---
+{% include foo.html some_var="var_test" if site.name == 'Your New Jekyll Site' %}
+{% include site.include_test some_var="var_test" if site.name != 'Your New Jekyll Site' %}
+{% include site.include_test some_var="var_test" unless site.name == 'Your New Jekyll Site' %}
+{% include site.include_test some_var="var_test" unless site.name == 'Your Stupid Website' %}

data/test/test.rb

@@ -39,7 +39,7 @@ end
 build
 
 def test_tags(dir)
-  tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts}
+  tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts include_if}
   tags.each { |file| test("tag_tests/#{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.19
+  version: 1.0.0.alpha.20
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -107,7 +107,10 @@ files:
 - lib/octopress-ink/assets/static_file_content.rb
 - lib/octopress-ink/assets/stylesheet.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/jekyll/hooks.rb
 - lib/octopress-ink/plugin.rb
 - lib/octopress-ink/plugins.rb
@@ -150,6 +153,7 @@ files:
 - test/expected/tag_tests/footer.html
 - test/expected/tag_tests/head.html
 - test/expected/tag_tests/include.html
+- test/expected/tag_tests/include_if.html
 - test/expected/tag_tests/include_plugin.html
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
@@ -174,6 +178,7 @@ files:
 - test/site/tag_tests/footer.html
 - test/site/tag_tests/head.html
 - test/site/tag_tests/include.html
+- test/site/tag_tests/include_if.html
 - test/site/tag_tests/include_plugin.html
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
@@ -226,6 +231,7 @@ files:
 - test/source/tag_tests/footer.html
 - test/source/tag_tests/head.html
 - test/source/tag_tests/include.html
+- test/source/tag_tests/include_if.html
 - test/source/tag_tests/include_plugin.html
 - test/source/tag_tests/include_theme.html
 - test/source/tag_tests/include_theme_override.html
@@ -284,6 +290,7 @@ test_files:
 - test/expected/tag_tests/footer.html
 - test/expected/tag_tests/head.html
 - test/expected/tag_tests/include.html
+- test/expected/tag_tests/include_if.html
 - test/expected/tag_tests/include_plugin.html
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
@@ -308,6 +315,7 @@ test_files:
 - test/site/tag_tests/footer.html
 - test/site/tag_tests/head.html
 - test/site/tag_tests/include.html
+- test/site/tag_tests/include_if.html
 - test/site/tag_tests/include_plugin.html
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
@@ -360,6 +368,7 @@ test_files:
 - test/source/tag_tests/footer.html
 - test/source/tag_tests/head.html
 - test/source/tag_tests/include.html
+- test/source/tag_tests/include_if.html
 - test/source/tag_tests/include_plugin.html
 - test/source/tag_tests/include_theme.html
 - test/source/tag_tests/include_theme_override.html