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

data/lib/octopress-ink/generators/plugin_assets.rb

@@ -1,10 +1,12 @@
 module Octopress
-  class PluginAssets < Jekyll::Generator
-    def generate(site)
-      Plugins.site = site
-      Plugins.register_layouts
-      Plugins.add_static_files
-      site = Plugins.site
+  module Ink
+    class PluginAssets < Jekyll::Generator
+      def generate(site)
+        Plugins.site = site
+        Plugins.register_layouts
+        Plugins.add_static_files
+        site = Plugins.site
+      end
     end
   end
 end

data/lib/octopress-ink/helpers.rb

@@ -1,8 +1,10 @@
 module Octopress
-  module Helpers
-    autoload :Conditional,            'octopress-ink/helpers/conditional'
-    autoload :ContentFor,             'octopress-ink/helpers/content_for'
-    autoload :Path,                   'octopress-ink/helpers/path'
-    autoload :Var,                    'octopress-ink/helpers/var'
+  module Ink
+    module Helpers
+      autoload :Conditional,            'octopress-ink/helpers/conditional'
+      autoload :ContentFor,             'octopress-ink/helpers/content_for'
+      autoload :Path,                   'octopress-ink/helpers/path'
+      autoload :Var,                    'octopress-ink/helpers/var'
+    end
   end
 end

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

@@ -1,22 +1,24 @@
 module Octopress
-  module Helpers
-    module Conditional
-      SYNTAX = /(.*)\s(if|unless)\s(.+)/
+  module Ink
+    module Helpers
+      module Conditional
+        SYNTAX = /(.*)\s(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 %}"])
+        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) != '' ? $1 : false
+          else
+            markup
           end
-          tag.render(context) != '' ? $1 : false
-        else
-          markup
         end
-      end
 
+      end
     end
   end
 end

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

@@ -1,29 +1,32 @@
 module Octopress
-  module Helpers
-    module ContentFor
-      def self.get_block_name(tag_name, markup)
-        if markup.strip == ''
-          raise IOError.new "Syntax Error: #{tag_name} requires a name, eg. {% #{tag_name} sidebar %}"
-        else
-          markup.strip
+  module Ink
+    module Helpers
+      module ContentFor
+        def self.get_block_name(tag_name, markup)
+          if markup.strip == ''
+            raise IOError.new "Syntax Error: #{tag_name} requires a name, eg. {% #{tag_name} sidebar %}"
+          else
+            markup.strip
+          end
         end
-      end
 
-      # Gets the storage space for the content block
-      def self.get_block(context, block)
-        context.environments.first['content_for'] ||= {}
-        context.environments.first['content_for'][block] ||= []
-      end
+        # Gets the storage space for the content block
+        def self.get_block(context, block)
+          context.environments.first['content_for'] ||= {}
+          context.environments.first['content_for'][block] ||= []
+        end
 
-      def self.render(context, block)
-        content = get_block(context, block).map { |b| b }.join
-      end
+        def self.render(context, block)
+          content = get_block(context, block).map { |b| b }.join
+        end
 
-      def self.append_to_block(context, block, content)
-        converter = context.environments.first['converter']
-        content = converter.convert(content).sub(/\n$/,'')
-        get_block(context, block) << content
+        def self.append_to_block(context, block, content)
+          converter = context.environments.first['converter']
+          content = converter.convert(content).sub(/\n$/,'')
+          get_block(context, block) << content
+        end
       end
     end
   end
 end
+

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

@@ -1,66 +1,69 @@
 module Octopress
-  module Helpers
-    module Path
-      FILE = /(\S+)(\s?)(.*)/
-      def self.parse(markup, context)
-        if markup =~ FILE
-          (context[$1].nil? ? $1 : context[$1]) + ' ' + ($3 || '')
-        else
-          markup
+  module Ink
+    module Helpers
+      module Path
+        FILE = /(\S+)(\s?)(.*)/
+        def self.parse(markup, context)
+          if markup =~ FILE
+            (context[$1].nil? ? $1 : context[$1]) + ' ' + ($3 || '')
+          else
+            markup
+          end
         end
-      end
 
-      # Allow paths to begin from the directory of the context page or
-      # have absolute paths
-      #
-      # Input: 
-      #  - file: "file.html"
-      #  - context: A Jekyll context object
-      #
-      #  Returns the full path to a file
-      #
-      def self.expand(file, context)
-        root = context.registers[:site].source
+        # Allow paths to begin from the directory of the context page or
+        # have absolute paths
+        #
+        # Input: 
+        #  - file: "file.html"
+        #  - context: A Jekyll context object
+        #
+        #  Returns the full path to a file
+        #
+        def self.expand(file, context)
+          root = context.registers[:site].source
 
-        # If local file, e.g. ./somefile
-        if file =~ /^\.\/(.+)/
-          local_dir = File.dirname context.registers[:page]['path']
-          File.join root, local_dir, $1
+          # If local file, e.g. ./somefile
+          if file =~ /^\.\/(.+)/
+            local_dir = File.dirname context.registers[:page]['path']
+            File.join root, local_dir, $1
 
-        # If absolute or relative to a user directory, e.g. /Users/Bob/somefile or ~/somefile
-        elsif file =~ /^[\/~]/
-          Pathname.new(file).expand_path
+          # If absolute or relative to a user directory, e.g. /Users/Bob/somefile or ~/somefile
+          elsif file =~ /^[\/~]/
+            Pathname.new(file).expand_path
 
-        # Otherwise, assume relative to site root
-        else
-          File.join root, file
+          # Otherwise, assume relative to site root
+          else
+            File.join root, file
+          end
         end
-      end
 
-      def self.site_dir
-        File.expand_path(Plugins.site.config['destination'])
-      end
+        def self.site_dir
+          File.expand_path(Plugins.site.config['destination'])
+        end
 
-      def self.page_destination(page)
-        page.destination(site_dir)
-      end
+        def self.page_destination(page)
+          page.destination(site_dir)
+        end
 
-      def self.find_page(page)
-        find_page_by_dest page_destination(page)
-      end
+        def self.find_page(page)
+          find_page_by_dest page_destination(page)
+        end
 
-      def self.find_page_by_dest(dest)
-        Plugins.site.pages.clone.each do |p|
-          return p if page_destination(p) == dest
+        def self.find_page_by_dest(dest)
+          Plugins.site.pages.clone.each do |p|
+            return p if page_destination(p) == dest
+          end
+          return false
         end
-        return false
-      end
 
-      def self.remove_page(dest)
-        Plugins.site.pages.reject! do |p|
-          page_destination(p) == dest
+        def self.remove_page(dest)
+          Plugins.site.pages.reject! do |p|
+            page_destination(p) == dest
+          end
         end
       end
     end
   end
 end
+

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

@@ -1,99 +1,101 @@
 module Octopress
-  module Helpers
-    module Var
-      TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+)?/
-      HAS_FILTERS = /(.*?)(\s+\|\s+.+)/
+  module Ink
+    module Helpers
+      module Var
+        TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+)?/
+        HAS_FILTERS = /(.*?)(\s+\|\s+.+)/
 
-      def self.set_var(var, operator, value, context)
-        case operator
-        when '||='
-          context.scopes.last[var] = value if context.scopes.last[var].nil?
-        when '+='
-          if context.scopes.last[var].nil?
-            context.scopes.last[var] = value
+        def self.set_var(var, operator, value, context)
+          case operator
+          when '||='
+            context.scopes.last[var] = value if context.scopes.last[var].nil?
+          when '+='
+            if context.scopes.last[var].nil?
+              context.scopes.last[var] = value
+            else
+              context.scopes.last[var] += value
+            end
           else
-            context.scopes.last[var] += value
+            context.scopes.last[var] = value
           end
-        else
-          context.scopes.last[var] = value
+          context
         end
-        context
-      end
 
-      def self.get_value(vars, context)
-        vars = evaluate_ternary(vars, context)
-        vars = vars.strip.gsub(/ or /, ' || ')
-        filters = false
-        if vars =~ HAS_FILTERS
-          vars = $1
-          filters = $2
-        end
-        vars = vars.split(/ \|\| /).map { |v|
-          context[v.strip]
-        }.compact
+        def self.get_value(vars, context)
+          vars = evaluate_ternary(vars, context)
+          vars = vars.strip.gsub(/ or /, ' || ')
+          filters = false
+          if vars =~ HAS_FILTERS
+            vars = $1
+            filters = $2
+          end
+          vars = vars.split(/ \|\| /).map { |v|
+            context[v.strip]
+          }.compact
 
-        var = vars.first
-        if filters
-          var = Liquid::Variable.new("'#{var}'"+ filters).render(context)
+          var = vars.first
+          if filters
+            var = Liquid::Variable.new("'#{var}'"+ filters).render(context)
+          end
+          var
         end
-        var
-      end
 
-      def self.evaluate_ternary(markup, context)
-        if markup =~ TERNARY
-          $1 + (Conditional.parse(" if #{$2}", context) ? $3 : $4) + $5
-        else
-          markup
+        def self.evaluate_ternary(markup, context)
+          if markup =~ TERNARY
+            $1 + (Conditional.parse(" if #{$2}", context) ? $3 : $4) + $5
+          else
+            markup
+          end
         end
-      end
 
-      # Parses filters into arrays
-      #
-      # input - a string of one or more filters, e.g. "| upcase | replace:'a','b'" 
-      #
-      # Returns nested arrays of filters and arguments
-      #
-      def self.parse_filters(input)
-        output = []
-        if input.match(/#{Liquid::FilterSeparator}\s*(.*)/o)
-          filters = Regexp.last_match(1).scan(Liquid::Variable::FilterParser)
-          filters.each do |f|
-            if matches = f.match(/\s*(\w+)/)
-              filtername = matches[1]
-              filterargs = f.scan(/(?:#{Liquid::FilterArgumentSeparator}|#{Liquid::ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{Liquid::QuotedFragment})/o).flatten
-              output << [filtername, filterargs]
+        # Parses filters into arrays
+        #
+        # input - a string of one or more filters, e.g. "| upcase | replace:'a','b'" 
+        #
+        # Returns nested arrays of filters and arguments
+        #
+        def self.parse_filters(input)
+          output = []
+          if input.match(/#{Liquid::FilterSeparator}\s*(.*)/o)
+            filters = Regexp.last_match(1).scan(Liquid::Variable::FilterParser)
+            filters.each do |f|
+              if matches = f.match(/\s*(\w+)/)
+                filtername = matches[1]
+                filterargs = f.scan(/(?:#{Liquid::FilterArgumentSeparator}|#{Liquid::ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{Liquid::QuotedFragment})/o).flatten
+                output << [filtername, filterargs]
+              end
             end
           end
+          output
         end
-        output
-      end
 
-      # Passes input through Liquid filters
-      #
-      # content - a string to be parsed
-      # filters - a series of liquid filters e.g. "| upcase | replace:'a','b'"
-      # context - the current Liquid context object
-      #
-      # Returns a filtered string
-      #
-      def self.render_filters(content, filters, context)
-        filters = parse_filters(filters)
-        return '' if content.nil?
-        filters.inject(content) do |output, filter|
-          filterargs = []
-          keyword_args = {}
-          filter[1].to_a.each do |a|
-            if matches = a.match(/\A#{Liquid::TagAttributes}\z/o)
-              keyword_args[matches[1]] = context[matches[2]]
-            else
-              filterargs << context[a]
+        # Passes input through Liquid filters
+        #
+        # content - a string to be parsed
+        # filters - a series of liquid filters e.g. "| upcase | replace:'a','b'"
+        # context - the current Liquid context object
+        #
+        # Returns a filtered string
+        #
+        def self.render_filters(content, filters, context)
+          filters = parse_filters(filters)
+          return '' if content.nil?
+          filters.inject(content) do |output, filter|
+            filterargs = []
+            keyword_args = {}
+            filter[1].to_a.each do |a|
+              if matches = a.match(/\A#{Liquid::TagAttributes}\z/o)
+                keyword_args[matches[1]] = context[matches[2]]
+              else
+                filterargs << context[a]
+              end
+            end
+            filterargs << keyword_args unless keyword_args.empty?
+            begin
+              output = context.invoke(filter[0], output, *filterargs)
+            rescue
+              raise "Error - filter '#{filter[0]}' could not be found."
             end
-          end
-          filterargs << keyword_args unless keyword_args.empty?
-          begin
-            output = context.invoke(filter[0], output, *filterargs)
-          rescue
-            raise "Error - filter '#{filter[0]}' could not be found."
           end
         end
       end

data/lib/octopress-ink/jekyll/hooks.rb

@@ -4,12 +4,12 @@ module Jekyll
 
     def do_layout(payload, layouts)
       # The contentblock tags needs access to the converter to process it while rendering.
-      config = Octopress::Plugins.config
+      config = Octopress::Ink::Plugins.config
       payload['plugins']   = config['plugins']
       payload['theme']     = config['theme']
       payload['converter'] = self.converter
       payload['octopress'] = {}
-      payload['octopress']['version'] = Octopress.version
+      payload['octopress']['version'] = Octopress::Ink.version
       do_layout_orig(payload, layouts)
     end
   end

data/lib/octopress-ink/jekyll/page.rb

@@ -1,45 +1,48 @@
 module Octopress
-  class Page < Jekyll::Page
+  module Ink
+    class Page < Jekyll::Page
 
-    # Override the destination for a page
-    #
-    # url - Path relative to destination directory.
-    #       examples: 
-    #         - '/' for the _site/index.html page
-    #         - '/archive/' for the _site/archive/index.html page
-    #
-    def initialize(site, base, dir, name, config)
-      @plugin_config = config
-      super(site, base, dir, name)
-    end
+      # Override the destination for a page
+      #
+      # url - Path relative to destination directory.
+      #       examples: 
+      #         - '/' for the _site/index.html page
+      #         - '/archive/' for the _site/archive/index.html page
+      #
+      def initialize(site, base, dir, name, config)
+        @plugin_config = config
+        super(site, base, dir, name)
+      end
 
-    def destination(dest)
-      path = File.join(dest, self.url)
-      if self.url =~ /\/$/
-        if self.ext == '.xml'
-          path = File.join(path, "index.xml")
-        else
-          path = File.join(path, "index.html")
+      def destination(dest)
+        path = File.join(dest, self.url)
+        if self.url =~ /\/$/
+          if self.ext == '.xml'
+            path = File.join(path, "index.xml")
+          else
+            path = File.join(path, "index.html")
+          end
         end
+        path
       end
-      path
-    end
 
-    # Allow pages to read url from plugin configuration
-    #
-    def url
-      if @url
-        @url
-      else
-        begin
-          if path_config = self.data['url_config']
-            config = @plugin_config
-            path_config.split('.').each { |key| config = config[key] }
-            @url = config if config.is_a? String
-          end
-        rescue; end
-        super
+      # Allow pages to read url from plugin configuration
+      #
+      def url
+        if @url
+          @url
+        else
+          begin
+            if path_config = self.data['url_config']
+              config = @plugin_config
+              path_config.split('.').each { |key| config = config[key] }
+              @url = config if config.is_a? String
+            end
+          rescue; end
+          super
+        end
       end
     end
   end
 end
+