octopress-ink 1.0.0.alpha.31 → 1.0.0.alpha.32

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

@@ -1,7 +1,10 @@
 module Octopress
-  module Tags
-    class LineCommentTag < Liquid::Tag
-      def render(context); end
+  module Ink
+    module Tags
+      class LineCommentTag < Liquid::Tag
+        def render(context); end
+      end
     end
   end
 end
+

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

@@ -1,69 +1,71 @@
 module Octopress
-  module Tags
-    class RenderTag < Liquid::Tag
-      SYNTAX = /(\S+)(.+)?/
+  module Ink
+    module Tags
+      class RenderTag < Liquid::Tag
+        SYNTAX = /(\S+)(.+)?/
 
-      def initialize(tag_name, markup, tokens)
-        super
-        @og_markup = @markup = markup
-        if markup =~ /^(\s*raw\s)?(.+?)(\sraw\s*)?$/
-          @markup = $2
-          @raw = true unless $1.nil? and $3.nil?
+        def initialize(tag_name, markup, tokens)
+          super
+          @og_markup = @markup = markup
+          if markup =~ /^(\s*raw\s)?(.+?)(\sraw\s*)?$/
+            @markup = $2
+            @raw = true unless $1.nil? and $3.nil?
+          end
         end
-      end
 
-      def render(context)
-        return unless markup = Helpers::Conditional.parse(@markup, context)
-        if markup =~ Helpers::Var::HAS_FILTERS
-          markup = $1
-          filters = $2
-        end
-        markup = Helpers::Var.evaluate_ternary(markup, context)
-        markup = Helpers::Path.parse(markup, context)
+        def render(context)
+          return unless markup = Helpers::Conditional.parse(@markup, context)
+          if markup =~ Helpers::Var::HAS_FILTERS
+            markup = $1
+            filters = $2
+          end
+          markup = Helpers::Var.evaluate_ternary(markup, context)
+          markup = Helpers::Path.parse(markup, context)
 
-        content = read(markup, context)
+          content = read(markup, context)
 
-        if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
-          local_vars = YAML.safe_load($1.strip)
-          content = $2.strip
-        end
+          if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
+            local_vars = YAML.safe_load($1.strip)
+            content = $2.strip
+          end
 
-        return content if @raw
+          return content if @raw
 
-        include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
+          include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
 
-        partial = Liquid::Template.parse(content)
-        content = context.stack {
-          context['include'] = include_tag.parse_params(context)
-          context['page'] = context['page'].deep_merge(local_vars) if local_vars
-          partial.render!(context)
-        }.strip
+          partial = Liquid::Template.parse(content)
+          content = context.stack {
+            context['include'] = include_tag.parse_params(context)
+            context['page'] = context['page'].deep_merge(local_vars) if local_vars
+            partial.render!(context)
+          }.strip
 
-        content = parse_convertible(content, context)
+          content = parse_convertible(content, context)
 
-        unless content.nil? || filters.nil?
-          content = Helpers::Var.render_filters(content, filters, context)
-        end
+          unless content.nil? || filters.nil?
+            content = Helpers::Var.render_filters(content, filters, context)
+          end
 
-        content
-      end
+          content
+        end
 
-      def read(markup, context)
-        path = markup.match(SYNTAX)[1]
-        @path = Helpers::Path.expand(path, context)
-        begin
-          Pathname.new(@path).read
-        rescue
-          raise IOError.new "Render failed: {% #{@tag_name} #{@og_markup}%}. The file '#{path}' could not be found at #{@path}."
+        def read(markup, context)
+          path = markup.match(SYNTAX)[1]
+          @path = Helpers::Path.expand(path, context)
+          begin
+            Pathname.new(@path).read
+          rescue
+            raise IOError.new "Render failed: {% #{@tag_name} #{@og_markup}%}. The file '#{path}' could not be found at #{@path}."
+          end
         end
+        
+        def parse_convertible(content, context)
+          page = Jekyll::ConvertiblePage.new(context.registers[:site], @path, content)
+          page.render({})
+          page.output.strip
+        end
+        
       end
-      
-      def parse_convertible(content, context)
-        page = Jekyll::ConvertiblePage.new(context.registers[:site], @path, content)
-        page.render({})
-        page.output.strip
-      end
-      
     end
   end
 end

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

@@ -1,16 +1,19 @@
 module Octopress
-  module Tags
-    class ReturnTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        @markup = markup.strip
-        super
-      end
+  module Ink
+    module Tags
+      class ReturnTag < Liquid::Tag
+        def initialize(tag_name, markup, tokens)
+          @markup = markup.strip
+          super
+        end
 
-      def render(context)
-        return unless markup = Helpers::Conditional.parse(@markup, context)
+        def render(context)
+          return unless markup = Helpers::Conditional.parse(@markup, context)
 
-        Helpers::Var.get_value(markup, context)
+          Helpers::Var.get_value(markup, context)
+        end
       end
     end
   end
 end
+

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

@@ -1,8 +1,10 @@
 module Octopress
-  module Tags
-    class StylesheetTag < Liquid::Tag
-      def render(context)
-        Plugins.stylesheet_tags
+  module Ink
+    module Tags
+      class StylesheetTag < Liquid::Tag
+        def render(context)
+          Plugins.stylesheet_tags
+        end
       end
     end
   end

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

@@ -1,77 +1,79 @@
 # Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
 #
 module Octopress
-  module Tags
-    class WrapTag < Liquid::Block
+  module Ink
+    module Tags
+      class WrapTag < Liquid::Block
 
-      def initialize(tag_name, markup, tokens)
-        super
-        @og_markup = @markup = markup
-        @tag_name = tag_name
-      end
-
-      def render(context)
-        return unless markup = Helpers::Conditional.parse(@markup, context)
-
-        if markup =~ Helpers::Var::HAS_FILTERS
-          markup = $1
-          filters = $2
+        def initialize(tag_name, markup, tokens)
+          super
+          @og_markup = @markup = markup
+          @tag_name = tag_name
         end
 
-        type = if markup =~ /^\s*yield\s(.+)/
-          markup = $1
-          'yield'
-        elsif markup =~ /^\s*render\s(.+)/
-          markup = $1
-          'render'
-        elsif markup =~ /^\s*include\s(.+)/
-          markup = $1
-          'include'
-        else
-          raise IOError.new "Wrap Failed: {% wrap #{@og_markup}%} - Which type of wrap: inlcude, yield, render? - Correct syntax: {% wrap type path or var [filters] [conditions] %}"
-        end
+        def render(context)
+          return unless markup = Helpers::Conditional.parse(@markup, context)
 
-        case type
-        when 'yield'
-          content = Tags::YieldTag.new('yield', markup, []).render(context)
-        when 'render'
-          begin
-            content = Tags::RenderTag.new('render', markup, []).render(context)
-          rescue => error
-            error_msg error
+          if markup =~ Helpers::Var::HAS_FILTERS
+            markup = $1
+            filters = $2
           end
-        when 'include'
-          begin
-            content = Tags::IncludeTag.new('include', markup, []).render(context)
-          rescue => error
-            error_msg error
+
+          type = if markup =~ /^\s*yield\s(.+)/
+            markup = $1
+            'yield'
+          elsif markup =~ /^\s*render\s(.+)/
+            markup = $1
+            'render'
+          elsif markup =~ /^\s*include\s(.+)/
+            markup = $1
+            'include'
+          else
+            raise IOError.new "Wrap Failed: {% wrap #{@og_markup}%} - Which type of wrap: inlcude, yield, render? - Correct syntax: {% wrap type path or var [filters] [conditions] %}"
           end
-        end
 
-        # just in case yield had a value
-        old_yield = context.scopes.first['yield']
-        context.scopes.first['yield'] = content
-        
-        content = super.strip
-        context.scopes.first['yield'] = old_yield
+          case type
+          when 'yield'
+            content = Tags::YieldTag.new('yield', markup, []).render(context)
+          when 'render'
+            begin
+              content = Tags::RenderTag.new('render', markup, []).render(context)
+            rescue => error
+              error_msg error
+            end
+          when 'include'
+            begin
+              content = Tags::IncludeTag.new('include', markup, []).render(context)
+            rescue => error
+              error_msg error
+            end
+          end
 
-        unless content.nil? || filters.nil?
-          content = Helpers::Var.render_filters(content, filters, context)
-        end
+          # just in case yield had a value
+          old_yield = context.scopes.first['yield']
+          context.scopes.first['yield'] = content
+          
+          content = super.strip
+          context.scopes.first['yield'] = old_yield
 
-        content
-      end
+          unless content.nil? || filters.nil?
+            content = Helpers::Var.render_filters(content, filters, context)
+          end
 
-      def error_msg(error)
-        error.message
-        message = "Wrap failed: {% #{@tag_name} #{@og_markup}%}."
-        message << $1 if error.message =~ /%}\.(.+)/
-        raise IOError.new message
-      end
+          content
+        end
 
-      def content_for(markup, context)
-        @block_name = Helpers::ContentFor.get_block_name(@tag_name, markup)
-        Helpers::ContentFor.render(context, @block_name).strip
+        def error_msg(error)
+          error.message
+          message = "Wrap failed: {% #{@tag_name} #{@og_markup}%}."
+          message << $1 if error.message =~ /%}\.(.+)/
+          raise IOError.new message
+        end
+
+        def content_for(markup, context)
+          @block_name = Helpers::ContentFor.get_block_name(@tag_name, markup)
+          Helpers::ContentFor.render(context, @block_name).strip
+        end
       end
     end
   end

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

@@ -1,33 +1,36 @@
 # Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
 #
 module Octopress
-  module Tags
-    class YieldTag < Liquid::Tag
+  module Ink
+    module Tags
+      class YieldTag < Liquid::Tag
 
-      def initialize(tag_name, markup, tokens)
-        if markup.strip == ''
-          raise IOError.new "Yield failed: {% #{tag_name} #{markup}%}. Please provide a block name to yield. - Syntax: {% yield block_name %}"
-        end
+        def initialize(tag_name, markup, tokens)
+          if markup.strip == ''
+            raise IOError.new "Yield failed: {% #{tag_name} #{markup}%}. Please provide a block name to yield. - Syntax: {% yield block_name %}"
+          end
 
-        super
-        @markup = markup
-        if markup =~ Helpers::Var::HAS_FILTERS
-          markup = $1
-          @filters = $2
+          super
+          @markup = markup
+          if markup =~ Helpers::Var::HAS_FILTERS
+            markup = $1
+            @filters = $2
+          end
+          @block_name = Helpers::ContentFor.get_block_name(tag_name, markup)
         end
-        @block_name = Helpers::ContentFor.get_block_name(tag_name, markup)
-      end
 
-      def render(context)
-        return unless markup = Helpers::Conditional.parse(@markup, context)
-        content = Helpers::ContentFor.render(context, @block_name)
+        def render(context)
+          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
+          unless content.nil? || @filters.nil?
+            content = Helpers::Var.render_filters(content, @filters, context)
+          end
 
-        content
+          content
+        end
       end
     end
   end
 end
+

data/lib/octopress-ink/version.rb

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

data/octopress-ink.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jekyll", "~> 1.3.0"
+  spec.add_runtime_dependency "jekyll", "~> 1.4.3"
   spec.add_runtime_dependency "sass", "~> 3.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/test/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in jekyll-markdown-block.gemspec
-group :jekyll_plugins do
+gem "octopress", "~> 3.0.0.alpha5"
+
+group :octopress do
   gem "octopress-ink", path: "../"
 end
 

data/test/_config.yml

@@ -6,3 +6,5 @@ destination: site
 include_test: foo.html
 render_test: kittens
 timezone: America/Chicago
+#gems:
+  #- 'octopress-codefence'

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

@@ -1,6 +1,7 @@
-class TestPlugin < Octopress::Plugin
+class TestPlugin < Octopress::Ink::Plugin
   def initialize(name, type)
     @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
+    @description = "Test some plugins y'all"
     super
   end
 
@@ -12,5 +13,5 @@ class TestPlugin < Octopress::Plugin
   end
 end
 
-Octopress.register_plugin(TestPlugin, 'awesome-sauce')
+Octopress::Ink.register_plugin(TestPlugin, 'awesome-sauce')
 

data/test/plugins/test-theme/plugin.rb

@@ -1,8 +1,9 @@
 require 'octopress-ink'
 
-class TestTheme < Octopress::Plugin
+class TestTheme < Octopress::Ink::Plugin
   def initialize(name, type)
     @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
+    @description = "Test theme y'all"
     super
   end
   def add_assets
@@ -13,4 +14,4 @@ class TestTheme < Octopress::Plugin
   end
 end
 
-Octopress.register_plugin(TestTheme, 'classic', 'theme')
+Octopress::Ink.register_plugin(TestTheme, 'classic', 'theme')