octopress-ink 1.0.0.rc.11 → 1.0.0.rc.13

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

@@ -1,24 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-module Octopress
-  module Ink
-    module Tags
-      class ContentForTag < Liquid::Block
-
-        def initialize(tag_name, markup, tokens)
-          super
-          @tag_name = tag_name
-          @markup   = markup
-        end
-
-        def render(context)
-          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)
-          ''
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,24 +0,0 @@
-module Octopress
-  module Ink
-    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
-end
-

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

@@ -1,53 +0,0 @@
-module Octopress
-  module Ink
-    module Tags
-      class IncludeTag < Liquid::Tag
-        PLUGIN_SYNTAX = /(.+?):(\S+)/
-
-        def initialize(tag_name, markup, tokens)
-          super
-          @og_markup = @markup = markup
-        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)
-
-          include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
-
-          # If markup references a plugin e.g. plugin-name:include-file.html
-          if markup.strip =~ PLUGIN_SYNTAX
-            plugin = $1
-            path = $2
-            begin
-              content = Plugins.include(plugin, path).read
-            rescue => error
-              raise IOError.new "Include failed: {% #{@tag_name} #{@og_markup}%}. The plugin '#{plugin}' does not have an include named '#{path}'."
-            end
-            partial = Liquid::Template.parse(content)
-            content = context.stack {
-              context['include'] = include_tag.parse_params(context)
-              partial.render!(context)
-            }.strip
-            
-          # Otherwise, use Jekyll's default include tag
-          else
-            content = include_tag.render(context).strip
-          end
-
-          unless content.nil? || filters.nil?
-            content = Helpers::Var.render_filters(content, filters, context)
-          end
-
-          content
-        end
-      end
-    end
-  end
-end
-

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

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

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

@@ -1,85 +0,0 @@
-module Octopress
-  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?
-          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)
-
-          content = read(markup, context)
-
-          if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
-            local_vars = SafeYAML.load($1.strip)
-            content = $2.strip
-          end
-
-          raw_content = {}
-
-          content = content.gsub /{%\s*raw\s*%}(.+?){% endraw %}/m do
-            data = $1
-            key = Digest::MD5.hexdigest(data)
-            raw_content[key] = "{% raw %}#{data}{% endraw %}"
-            key
-          end
-
-          return content if @raw
-
-          include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
-
-          partial = Liquid::Template.parse(content)
-          content = context.stack {
-            context['include'] = include_tag.parse_params(context)
-            if local_vars
-              context['page'] = Jekyll::Utils.deep_merge_hashes(context['page'], local_vars)
-            end
-            partial.render!(context)
-          }.strip
-
-          raw_content.each { |k, v| content.sub!(k, v) }
-
-          content = parse_convertible(content, context).strip
-
-          unless content.nil? || filters.nil?
-            content = Helpers::Var.render_filters(content, filters, context)
-          end
-
-          content
-        end
-
-        def read(markup, context)
-          path = markup.match(SYNTAX)[1]
-          @path = Helpers::Path.expand(path, context)
-          begin
-            File.open(@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::ConvertiblePartial.new(context.registers[:site], @path, content)
-          page.render({})
-          page.output.strip
-        end
-        
-      end
-    end
-  end
-end
-

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

@@ -1,19 +0,0 @@
-module Octopress
-  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)
-
-          Helpers::Var.get_value(markup, context)
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,81 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-#
-module Octopress
-  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
-          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
-
-          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
-
-          # 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
-
-          unless content.nil? || filters.nil?
-            content = Helpers::Var.render_filters(content, filters, context)
-          end
-
-          content
-        end
-
-        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
-end
-

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

@@ -1,36 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-#
-module Octopress
-  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
-
-          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
-
-        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
-
-          content
-        end
-      end
-    end
-  end
-end
-

data/lib/octopress-ink/utils.rb

@@ -1,42 +0,0 @@
-module Octopress
-  module Utils
-
-    # Smart capitalization for titles
-    #
-    def self.titlecase(input)
-      small_words = %w(a an and as at but by en for if in of on or the to v v. via vs vs.)
-
-      x = input.split(" ").map do |word|
-        # note: word could contain non-word characters!
-        # downcase all small_words, capitalize the rest
-        small_words.include?(word.gsub(/\W/, "").downcase) ? word.downcase! : smart_capitalize!(word)
-        word
-      end
-      # capitalize first and last words
-      smart_capitalize!(x.first)
-      smart_capitalize!(x.last)
-      # small words are capitalized after colon, period, exclamation mark, question mark
-      x.join(" ").gsub(/(:|\.|!|\?)\s?(\W*#{small_words.join("|")}\W*)\s/) { "#{$1} #{smart_capitalize($2)} " }
-    end
-
-    def self.titlecase!(input)
-      input.replace(titlecase(input))
-    end
-
-    def self.smart_capitalize(input)
-      target = input.dup
-      # ignore any leading crazy characters and capitalize the first real character
-      if target =~ /^['"\(\[']*([a-z])/
-        i = input.index($1)
-        x = target[i,target.length]
-        # word with capitals and periods mid-word are left alone
-        target[i,1] = target[i,1].upcase unless x =~ /[A-Z]/ or x =~ /\.\w+/
-      end
-      target
-    end
-    
-    def self.smart_capitalize!(input)
-      input.replace(smart_capitalize(input))
-    end
-  end
-end

data/test/combine_css_false/stylesheets/theme/main.css

@@ -1,2 +0,0 @@
-body {
-  background: black; }

data/test/copy_test/_copy/stylesheets/disable-this.css

@@ -1 +0,0 @@
-.do-not-exist { background: black; }

data/test/copy_test/_copy/stylesheets/main.scss

@@ -1,5 +0,0 @@
----
-import: colors
----
-@import '{{ page.import }}';
-body { background: $bg; }

data/test/expected/index.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Your New Jekyll Site</title>
-    <meta name="viewport" content="width=device-width">
-  </head>
-  <body class=" ">
-    <div class='local-override'>
-one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five
-
-
-  title: Another Test Post
-title text: Another Test Post
-title html: Another Test&nbsp;Post
-title url: /2014/02/02/test-post-2.html
-linkpost: false
-
-date: 2014-02-02 00:00:00 -0600
-date_xml: 2014-02-02T00:00:00-06:00
-date_html: <time class='entry-date' datetime='2014-02-02T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>2</span><span class='date-suffix'>nd</span>, <span class='date-year'>2014</span></time>
-
-content: <p>some random post
-<a href="/food">relative link</a></p>
-
-  title: Test Post
-title text: Test Post →
-title html: Test&nbsp;Post&nbsp;<span class='post-marker post-marker-after'>→</span>
-title url: http://timecube.com
-linkpost: true
-
-date: 2014-02-01 00:00:00 -0600
-date_xml: 2014-02-01T00:00:00-06:00
-date_html: <time class='entry-date' datetime='2014-02-01T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>1</span><span class='date-suffix'>st</span>, <span class='date-year'>2014</span></time>
-
-content: <p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
-
-
-
-  title: Another Test Post
-title text: Another Test Post
-title html: Another Test&nbsp;Post
-title url: /2014/02/02/test-post-2.html
-linkpost: false
-
-date: 2014-02-02 00:00:00 -0600
-date_xml: 2014-02-02T00:00:00-06:00
-date_html: <time class='entry-date' datetime='2014-02-02T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>2</span><span class='date-suffix'>nd</span>, <span class='date-year'>2014</span></time>
-
-content: <p>some random post
-<a href="/food">relative link</a></p>
-
-
-
-  title: Test Post
-title text: Test Post →
-title html: Test&nbsp;Post&nbsp;<span class='post-marker post-marker-after'>→</span>
-title url: http://timecube.com
-linkpost: true
-
-date: 2014-02-01 00:00:00 -0600
-date_xml: 2014-02-01T00:00:00-06:00
-date_html: <time class='entry-date' datetime='2014-02-01T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>1</span><span class='date-suffix'>st</span>, <span class='date-year'>2014</span></time>
-
-content: <p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
-
-</div>
-
-  </body>
-</html>