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

data/lib/octopress-ink/plugins.rb

@@ -1,7 +1,9 @@
 module Octopress
   module Plugins
+
     @plugins = []
     @local_plugins = []
+    @site = nil
 
     def self.theme
       @theme
@@ -23,18 +25,23 @@ module Octopress
       [@theme].concat(@plugins).concat(@local_plugins).compact
     end
 
-    def self.config(site)
+    def self.site
+      @site
+    end
+
+    def self.config(site=nil)
+      @site ||= site
       if @config
         @config
       else
         @config            = {}
         @config['plugins'] = {}
-        @config['theme']   = @theme.configs(site)
+        @config['theme']   = @theme.nil? ? {} : @theme.configs
 
 
         plugins.each do |p| 
           unless p == @theme
-            @config['plugins'][p.name] = p.configs(site)
+            @config['plugins'][p.name] = p.configs
           end
         end
 
@@ -42,9 +49,9 @@ module Octopress
       end
     end
 
-    def self.include(name, file, site)
+    def self.include(name, file)
       p = plugin(name)
-      p.include(file, site)
+      p.include(file)
     end
 
     def self.register_plugin(plugin, name, type='plugin')
@@ -60,13 +67,14 @@ module Octopress
       end
     end
 
-    def self.register_layouts(site)
+    def self.register_layouts
       plugins.each do |p|
-        p.layouts.clone.each { |layout| layout.register(site) }
+        p.layouts.clone.each { |layout| layout.register }
       end
     end
 
-    def self.custom_dir(config)
+    def self.custom_dir
+      config = @site.config
       if config['octopress'] and config['octopress']['custom']
         config['octopress']['custom']
       else
@@ -88,8 +96,8 @@ module Octopress
       File.join('javascripts', "#{print}.js")
     end
 
-    def self.write_files(site, source, dest)
-      site.static_files << StaticFileContent.new(source, dest)
+    def self.write_files(source, dest)
+      @site.static_files << StaticFileContent.new(source, dest)
     end
 
     def self.compile_sass_file(path, options)
@@ -100,38 +108,39 @@ module Octopress
       ::Sass.compile(contents, options)
     end
 
-    def self.sass_config(site, item, default)
-      if site.config['octopress'] && site.config['octopress']['sass'] && site.config['octopress']['sass'][item]
-        site.config['octopress']['sass'][item]
+    def self.sass_config(item, default)
+      config = @site.config
+      if config['octopress'] && config['octopress']['sass'] && config['octopress']['sass'][item]
+        config['octopress']['sass'][item]
       else
         default
       end
     end
     
-    def self.sass_options(site)
+    def self.sass_options
       options = {
-        style:        sass_config(site, 'output_style', 'compressed').to_sym,
-        trace:        sass_config(site, 'trace', false),
-        line_numbers: sass_config(site, 'line_numbers', false)
+        style:        sass_config('output_style', 'compressed').to_sym,
+        trace:        sass_config('trace', false),
+        line_numbers: sass_config('line_numbers', false)
       }
     end
 
-    def self.write_combined_stylesheet(site)
-      css = combine_stylesheets(site)
+    def self.write_combined_stylesheet
+      css = combine_stylesheets
       css.keys.each do |media|
-        options = sass_options(site)
+        options = sass_options
         options[:line_numbers] = false
         contents = compile_sass(css[media][:contents], options)
-        write_files(site, contents, combined_stylesheet_path(media)) 
+        write_files(contents, combined_stylesheet_path(media)) 
       end
     end
 
-    def self.write_combined_javascript(site)
-      js = combine_javascripts(site)
-      write_files(site, js, combined_javascript_path) unless js == ''
+    def self.write_combined_javascript
+      js = combine_javascripts
+      write_files(js, combined_javascript_path) unless js == ''
     end
 
-    def self.combine_stylesheets(site)
+    def self.combine_stylesheets
       unless @combined_stylesheets
         css = {}
         paths = {}
@@ -150,11 +159,11 @@ module Octopress
             
             # Add Sass files
             if file.respond_to? :compile
-              css[file.media][:contents].concat file.compile(site)
+              css[file.media][:contents].concat file.compile
             else
-              css[file.media][:contents].concat file.path(site).read.strip
+              css[file.media][:contents].concat file.path.read.strip
             end
-            css[file.media][:paths] << file.path(site)
+            css[file.media][:paths] << file.path
             plugin_header = ''
           end
         end
@@ -167,11 +176,11 @@ module Octopress
       @combined_stylesheets
     end
 
-    def self.combine_javascripts(site)
+    def self.combine_javascripts
       unless @combined_javascripts
         js = ''
         plugins.each do |plugin| 
-          paths = plugin.javascript_paths(site)
+          paths = plugin.javascript_paths
           @javascript_fingerprint = fingerprint(paths)
           paths.each do |file|
             js.concat Pathname.new(file).read
@@ -182,23 +191,23 @@ module Octopress
       @combined_javascripts
     end
 
-    def self.combined_stylesheet_tag(site)
+    def self.combined_stylesheet_tag
       tags = ''
-      combine_stylesheets(site).keys.each do |media|
-        tags.concat "<link href='/#{combined_stylesheet_path(media)}' media='#{media}' rel='stylesheet' type='text/css'>"
+      combine_stylesheets.keys.each do |media|
+        tags.concat "<link href='#{Filters.expand_url(combined_stylesheet_path(media))}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
       tags
     end
 
-    def self.combined_javascript_tag(site)
-      unless combine_javascripts(site) == ''
-        "<script src='/#{combined_javascript_path}'></script>"
+    def self.combined_javascript_tag
+      unless combine_javascripts == ''
+        "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
       end
     end
 
-    def self.stylesheet_tags(site)
-      if concat_css(site)
-        combined_stylesheet_tag(site)
+    def self.stylesheet_tags
+      if concat_css
+        combined_stylesheet_tag
       else
         css = []
         plugins.each do |plugin| 
@@ -209,25 +218,27 @@ module Octopress
       end
     end
 
-    def self.concat_css(site)
-      if site.config['octopress'] && !site.config['octopress']['concat_css'].nil?
-        site.config['octopress']['concat_css'] != false
+    def self.concat_css
+      config = @site.config
+      if config['octopress'] && !config['octopress']['concat_css'].nil?
+        config['octopress']['concat_css'] != false
       else
         true
       end
     end
 
-    def self.concat_js(site)
-      if site.config['octopress'] && !site.config['octopress']['concat_js'].nil?
-        site.config['octopress']['concat_js'] != false
+    def self.concat_js
+      config = @site.config
+      if config['octopress'] && !config['octopress']['concat_js'].nil?
+        config['octopress']['concat_js'] != false
       else
         true
       end
     end
 
-    def self.javascript_tags(site)
-      if concat_js(site)
-        combined_javascript_tag(site)
+    def self.javascript_tags
+      if concat_js
+        combined_javascript_tag
       else
         js = []
         plugins.each do |plugin| 
@@ -237,54 +248,54 @@ module Octopress
       end
     end
 
-    def self.copy_javascripts(site)
+    def self.copy_javascripts
       plugins.each do |plugin| 
-        copy(plugin.javascripts, site)
+        copy plugin.javascripts
       end
     end
 
-    def self.copy_stylesheets(site)
+    def self.copy_stylesheets
       stylesheets = plugins.clone.map { 
         |p| p.stylesheets.clone.concat(p.sass) 
       }.flatten
-      copy(stylesheets, site)
+      copy stylesheets
     end
 
-    def self.add_static_files(site)
+    def self.add_static_files
      
-      plugin('user stylesheets').add_files(site)
+      plugin('user stylesheets').add_files
  
       # Copy/Generate Stylesheets
       #
-      if concat_css(site)
-        write_combined_stylesheet(site)
+      if concat_css
+        write_combined_stylesheet
       else
-        copy_stylesheets(site)
+        copy_stylesheets
       end
 
       # Copy/Generate Javascripts
       #
-      if concat_js(site)
-        write_combined_javascript(site)
+      if concat_js
+        write_combined_javascript
       else
-        copy_javascripts(site)
+        copy_javascripts
       end
 
       # Copy other assets
       #
-      copy_static_files(site)
+      copy_static_files
     end
 
-    def self.copy_static_files(site)
+    def self.copy_static_files
       plugins.each do |plugin| 
-        copy(plugin.files, site)
-        copy(plugin.images, site)
-        copy(plugin.fonts, site)
+        copy plugin.files
+        copy plugin.images
+        copy plugin.fonts
       end
     end
 
-    def self.copy(files, site)
-      files.each { |f| f.copy(site) }
+    def self.copy(files)
+      files.each { |f| f.copy }
     end
   end
 end

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

@@ -22,7 +22,7 @@ module Octopress
 
           context = Helpers::Var.set_var(var, operator, value, context)
         else
-          raise SyntaxError.new("Syntax Error in 'assign' - Valid syntax: assign [var] = [source]")
+          raise SyntaxError.new("Syntax Error in 'assign tag': #{@markup} - Valid syntax: assign [var] = [source] | filter")
         end
         ''
       end

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

@@ -10,6 +10,10 @@ module Octopress
 
       def render(context)
         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)
@@ -21,20 +25,26 @@ module Octopress
           plugin = $1
           path = $2
           begin
-            content = Plugins.include(plugin, path, context.registers[:site]).read
+            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)
-          context.stack {
+          content = context.stack {
             context['include'] = include_tag.parse_params(context)
             partial.render!(context)
           }.strip
           
         # Otherwise, use Jekyll's default include tag
         else
-          include_tag.render(context).strip
+          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

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

@@ -1,12 +1,8 @@
 module Octopress
   module Tags
     class JavascriptTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        super
-      end
       def render(context)
-        site = context.registers[:site]
-        Plugins.javascript_tags(site)
+        Plugins.javascript_tags
       end
     end
   end

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

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

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

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     class RenderTag < Liquid::Tag
-      SYNTAX = /(\S+)(.+)/
+      SYNTAX = /(\S+)(.+)?/
 
       def initialize(tag_name, markup, tokens)
         super
@@ -14,6 +14,10 @@ module Octopress
 
       def render(context)
         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)
@@ -36,8 +40,13 @@ module Octopress
           partial.render!(context)
         }.strip
 
-        parse_convertible(content, context)
-        
+        content = parse_convertible(content, context)
+
+        unless content.nil? || filters.nil?
+          content = Helpers::Var.render_filters(content, filters, context)
+        end
+
+        content
       end
 
       def read(markup, context)

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

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

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

@@ -1,12 +1,8 @@
 module Octopress
   module Tags
     class StylesheetTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        super
-      end
       def render(context)
-        site = context.registers[:site]
-        Plugins.stylesheet_tags(site)
+        Plugins.stylesheet_tags
       end
     end
   end

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

@@ -16,16 +16,16 @@ module Octopress
 
         case @tag_name
         when 'wrap_yield'
-          content = content_for(markup, context)
+          content = Tags::YieldTag.new('yield', markup, []).render(context)
         when 'wrap_render'
           begin
-            content = include_tag = Octopress::Tags::RenderTag.new('render', markup, []).render(context)
+            content = Tags::RenderTag.new('render', markup, []).render(context)
           rescue => error
             error_msg error
           end
         when 'wrap'
           begin
-            content = include_tag = Octopress::Tags::IncludeTag.new('include', markup, []).render(context)
+            content = Tags::IncludeTag.new('include', markup, []).render(context)
           rescue => error
             error_msg error
           end

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

@@ -3,19 +3,30 @@
 module Octopress
   module Tags
     class YieldTag < Liquid::Tag
+
       def initialize(tag_name, markup, tokens)
         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)
         markup = Helpers::Conditional.parse(@markup, context)
         return unless markup
-
         content = Helpers::ContentFor.render(context, @block_name)
-        if @block_name == 'head'
-          content.insert 0, "<meta name='generator' content='Octopress #{Octopress::Ink::VERSION}'>\n"
+
+        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/tags.rb

@@ -13,6 +13,7 @@ module Octopress
     autoload :YieldTag,             'octopress-ink/tags/yield'
     autoload :ScriptsBlock,         'octopress-ink/tags/scripts'
     autoload :WrapTag,              'octopress-ink/tags/wrap'
+    autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
   end
 end
 

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -6,11 +6,13 @@ require 'octopress-ink/version'
 require 'octopress-ink/generators/plugin_assets'
 require 'octopress-ink/jekyll/hooks'
 require 'octopress-ink/version'
+require 'octopress-ink/helpers/titlecase'
 
 module Octopress
   CUSTOM_DIR = "_custom"
 
   autoload :Helpers,              'octopress-ink/helpers'
+  autoload :Filters,              'octopress-ink/filters'
   autoload :Assets,               'octopress-ink/assets'
   autoload :StaticFile,           'octopress-ink/assets/static_file'
   autoload :StaticFileContent,    'octopress-ink/assets/static_file_content'
@@ -24,6 +26,8 @@ module Octopress
   end
 end
 
+Liquid::Template.register_filter Octopress::Filters
+
 Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
 Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
 Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
@@ -39,6 +43,7 @@ Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
 Liquid::Template.register_tag('wrap_yield', Octopress::Tags::WrapTag)
 Liquid::Template.register_tag('wrap_render', Octopress::Tags::WrapTag)
 Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
+Liquid::Template.register_tag('_', Octopress::Tags::LineCommentTag)
 
 Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')
 

data/test/expected/test_tags/assign.html

@@ -19,4 +19,5 @@ yepyep → yepyep
 ## Complex assignment
 awesome → awesome
 AWESOME → AWESOME
+whatever-man → whatever-man
 

data/test/expected/test_tags/content_for.html

@@ -1,4 +1,7 @@
-Testing content for
+Testing content for → Testing content for
 
+Testing scripts → Testing scripts
 
+Testing head tag → Testing head tag
 
+Testing footer → Testing footer

data/test/expected/test_tags/include.html

@@ -6,6 +6,10 @@ Testing Include → Testing Include
 ## Local var passing
 Testing Include var_test → Testing Include var_test
 
+## Filter testing
+TESTING INCLUDE → TESTING INCLUDE
+'' → ''
+
 ## Conditional Include
 '' → ''
 '' → ''

data/test/expected/test_tags/render.html

@@ -18,6 +18,10 @@ Testing Render → Testing Render
 ## Test Variables
 kittens → kittens
 
+## Test Filters
+KITTENS → KITTENS
+MITTENS → MITTENS
+
 ## Ternary include
 kittens → kittens
 Testing Render → Testing Render

data/test/expected/test_tags/wrap.html

@@ -6,6 +6,10 @@
 ## Local var passing
 [- Testing Include var_test -] → [- Testing Include var_test -]
 
+## Filter testing
+[- TESTING INCLUDE -] → [- TESTING INCLUDE -]
+[- TESTING FILTERS -] → [- TESTING FILTERS -]
+
 ## Conditional wrap
 '' → ''
 '' → ''
@@ -19,3 +23,6 @@
 ## Wrap render
 [- Testing Render -] → [- Testing Render -]
 
+## Wrap yield
+
+[- Testing wrap yield -] → [- Testing wrap yield -]

data/test/site/test_tags/assign.html

@@ -19,4 +19,5 @@ yepyep → yepyep
 ## Complex assignment
 awesome → awesome
 AWESOME → AWESOME
+whatever-man → whatever-man
 

data/test/site/test_tags/content_for.html

@@ -1,4 +1,7 @@
-Testing content for
+Testing content for → Testing content for
 
+Testing scripts → Testing scripts
 
+Testing head tag → Testing head tag
 
+Testing footer → Testing footer

data/test/site/test_tags/include.html

@@ -6,6 +6,10 @@ Testing Include → Testing Include
 ## Local var passing
 Testing Include var_test → Testing Include var_test
 
+## Filter testing
+TESTING INCLUDE → TESTING INCLUDE
+'' → ''
+
 ## Conditional Include
 '' → ''
 '' → ''

data/test/site/test_tags/render.html

@@ -18,6 +18,10 @@ Testing Render → Testing Render
 ## Test Variables
 kittens → kittens
 
+## Test Filters
+KITTENS → KITTENS
+MITTENS → MITTENS
+
 ## Ternary include
 kittens → kittens
 Testing Render → Testing Render

data/test/site/test_tags/wrap.html

@@ -6,6 +6,10 @@
 ## Local var passing
 [- Testing Include var_test -] → [- Testing Include var_test -]
 
+## Filter testing
+[- TESTING INCLUDE -] → [- TESTING INCLUDE -]
+[- TESTING FILTERS -] → [- TESTING FILTERS -]
+
 ## Conditional wrap
 '' → ''
 '' → ''
@@ -19,3 +23,6 @@
 ## Wrap render
 [- Testing Render -] → [- Testing Render -]
 
+## Wrap yield
+
+[- Testing wrap yield -] → [- Testing wrap yield -]

data/test/source/test_tags/assign.html

@@ -22,4 +22,5 @@ yepyep → {% assign var1 += 'yep' %}{{ var1 }}
 ## Complex assignment
 awesome → {% assign var9 = (page.layout == 'nil' ? 'awesome' : 'lame' ) %}{{ var9 }}
 AWESOME → {% assign var10 = var9 | upcase %}{{ var10 }}
+whatever-man → {% assign var11 = 'whatever man' || nil | classify %}{{ var11 }}