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

data/lib/octopress-ink/plugins/stylesheets.rb

@@ -2,51 +2,53 @@
 # the Plugins module.
 #
 module Octopress
-  class StylesheetsPlugin < Octopress::Plugin
-    def add_files
+  module Ink
+    class StylesheetsPlugin < Octopress::Ink::Plugin
+      def add_files
 
-      add_stylesheets local_stylesheets
+        add_stylesheets local_stylesheets
 
-      remove_jekyll_assets @sass
+        remove_jekyll_assets @sass
 
-      if Plugins.concat_css
-        remove_jekyll_assets @stylesheets
+        if Plugins.concat_css
+          remove_jekyll_assets @stylesheets
+        end
       end
-    end
 
-    def add_stylesheets(files)
-      files = [files] unless files.is_a? Array
-      files.each do |file|
-        # accept ['file', 'media_type']
-        if file.is_a? Array
-          if file.first =~ /\.css/
-            add_stylesheet file.first, file.last
-          else
-            add_sass file.first, file.last
-          end
-        # accept 'file'
-        else
-          if file =~ /\.css/
-            add_stylesheet file
+      def add_stylesheets(files)
+        files = [files] unless files.is_a? Array
+        files.each do |file|
+          # accept ['file', 'media_type']
+          if file.is_a? Array
+            if file.first =~ /\.css/
+              add_stylesheet file.first, file.last
+            else
+              add_sass file.first, file.last
+            end
+          # accept 'file'
           else
-            add_sass file
+            if file =~ /\.css/
+              add_stylesheet file
+            else
+              add_sass file
+            end
           end
         end
+        files
       end
-      files
-    end
 
-    def local_stylesheets
-      config = Plugins.site.config
-      source = Plugins.site.source
-      if config['octopress'] && config['octopress']['stylesheets']
-        config['octopress']['stylesheets'] || []
-      else
-        dir = File.join(source, 'stylesheets/')
-        css = Dir.glob(File.join(dir, '**/*.css'))
-        sass = Dir.glob(File.join(dir, '**/*.s[ca]ss')).reject { |f| File.basename(f) =~ /^_.*?s[ac]ss/ }
-        files = css.concat sass
-        files.map { |f| f.split(dir).last }
+      def local_stylesheets
+        config = Plugins.site.config
+        source = Plugins.site.source
+        if config['octopress'] && config['octopress']['stylesheets']
+          config['octopress']['stylesheets'] || []
+        else
+          dir = File.join(source, 'stylesheets/')
+          css = Dir.glob(File.join(dir, '**/*.css'))
+          sass = Dir.glob(File.join(dir, '**/*.s[ca]ss')).reject { |f| File.basename(f) =~ /^_.*?s[ac]ss/ }
+          files = css.concat sass
+          files.map { |f| f.split(dir).last }
+        end
       end
     end
   end

data/lib/octopress-ink/tags.rb

@@ -1,18 +1,20 @@
 module Octopress
-  module Tags
-    autoload :IncludeTag,           'octopress-ink/tags/include'
-    autoload :AssignTag,            'octopress-ink/tags/assign'
-    autoload :ReturnTag,            'octopress-ink/tags/return'
-    autoload :FilterTag,            'octopress-ink/tags/filter'
-    autoload :RenderTag,            'octopress-ink/tags/render'
-    autoload :CaptureTag,           'octopress-ink/tags/capture'
-    autoload :JavascriptTag,        'octopress-ink/tags/javascript'
-    autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'
-    autoload :ContentForTag,        'octopress-ink/tags/content_for'
-    autoload :YieldTag,             'octopress-ink/tags/yield'
-    autoload :WrapTag,              'octopress-ink/tags/wrap'
-    autoload :AbortTag,             'octopress-ink/tags/abort'
-    autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
+  module Ink
+    module Tags
+      autoload :IncludeTag,           'octopress-ink/tags/include'
+      autoload :AssignTag,            'octopress-ink/tags/assign'
+      autoload :ReturnTag,            'octopress-ink/tags/return'
+      autoload :FilterTag,            'octopress-ink/tags/filter'
+      autoload :RenderTag,            'octopress-ink/tags/render'
+      autoload :CaptureTag,           'octopress-ink/tags/capture'
+      autoload :JavascriptTag,        'octopress-ink/tags/javascript'
+      autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'
+      autoload :ContentForTag,        'octopress-ink/tags/content_for'
+      autoload :YieldTag,             'octopress-ink/tags/yield'
+      autoload :WrapTag,              'octopress-ink/tags/wrap'
+      autoload :AbortTag,             'octopress-ink/tags/abort'
+      autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
+    end
   end
 end
 

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

@@ -1,19 +1,22 @@
 module Octopress
-  module Tags
-    class AbortTag < Liquid::Tag
-      def initialize(tag_name, markup, tokens)
-        super
-        @markup = " #{markup}"
-      end
+  module Ink
+    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)
+        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
 end
+

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

@@ -1,29 +1,31 @@
 module Octopress
-  module Tags
-    class AssignTag < Liquid::Tag
-      SYNTAX = /([[:word:]]+)\s*(=|\+=|\|\|=)\s*(.*)\s*/o
+  module Ink
+    module Tags
+      class AssignTag < Liquid::Tag
+        SYNTAX = /([[:word:]]+)\s*(=|\+=|\|\|=)\s*(.*)\s*/o
 
-      def initialize(tag_name, markup, tokens)
-        @markup = markup
-        super
-      end
+        def initialize(tag_name, markup, tokens)
+          @markup = markup
+          super
+        end
 
-      def render(context)
-        return unless markup = Helpers::Conditional.parse(@markup, context)
+        def render(context)
+          return unless markup = Helpers::Conditional.parse(@markup, context)
 
-        if markup =~ SYNTAX
-          var      = $1
-          operator = $2
-          value    = $3
+          if markup =~ SYNTAX
+            var      = $1
+            operator = $2
+            value    = $3
 
-          value = Helpers::Var.get_value(value, context)
-          return if value.nil?
+            value = Helpers::Var.get_value(value, context)
+            return if value.nil?
 
-          context = Helpers::Var.set_var(var, operator, value, context)
-        else
-          raise SyntaxError.new("Syntax Error in 'assign tag': #{@markup} - Valid syntax: assign [var] = [source] | filter")
+            context = Helpers::Var.set_var(var, operator, value, context)
+          else
+            raise SyntaxError.new("Syntax Error in 'assign tag': #{@markup} - Valid syntax: assign [var] = [source] | filter")
+          end
+          ''
         end
-        ''
       end
     end
   end

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

@@ -1,34 +1,36 @@
 module Octopress
-  module Tags
-    class CaptureTag < Liquid::Block
-      SYNTAX = /([[:word:]]+)\s*(\+=|\|\|=)?/o
+  module Ink
+    module Tags
+      class CaptureTag < Liquid::Block
+        SYNTAX = /([[:word:]]+)\s*(\+=|\|\|=)?/o
 
-      def initialize(tag_name, markup, tokens)
-        @markup = markup
-        super
-      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)
+          @markup = markup
+          super
         end
 
-        if markup =~ SYNTAX
-          var      = $1
-          operator = $2
-          value = super.lstrip
-
-          unless value.nil? || filters.nil?
-            value = Helpers::Var.render_filters(value, filters, context)
+        def render(context)
+          return unless markup = Helpers::Conditional.parse(@markup, context)
+          if markup =~ Helpers::Var::HAS_FILTERS
+            markup = $1
+            filters = $2
           end
 
-          context = Helpers::Var.set_var(var, operator, value, context)
-        else
-          raise SyntaxError.new("Syntax Error in 'capture' - Valid syntax: capture [var]")
+          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]")
+          end
+          ''
         end
-        ''
       end
     end
   end

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

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

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

@@ -1,49 +1,51 @@
 module Octopress
-  module Tags
-    class IncludeTag < Liquid::Tag
-      PLUGIN_SYNTAX = /(.+?):(\S+)/
+  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
+        def initialize(tag_name, markup, tokens)
+          super
+          @og_markup = @markup = markup
         end
-        markup = Helpers::Var.evaluate_ternary(markup, context)
-        markup = Helpers::Path.parse(markup, context)
 
-        include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
+        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}'."
+          # 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
-          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
+          unless content.nil? || filters.nil?
+            content = Helpers::Var.render_filters(content, filters, context)
+          end
 
-        content
+          content
+        end
       end
     end
   end

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

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