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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1792939440a17c3b7b73592e7f18f14de673923c
-  data.tar.gz: 6a03bc173a8b9ea4f5fbc0c0048a9d1dc07a4da3
+  metadata.gz: de4dedafd926d2d6222ffd41be255ff2c003e0eb
+  data.tar.gz: c9fa39b81fd8226df9d1184596760e1c232f719b
 SHA512:
-  metadata.gz: 5bce98043f48a2242540a61b76b5cc8bd5ab8e4527dd451841935887a6153a8513f2ee008e8c79a26eb7dba784eae9a8eecc163b86674b92332fd3b59c4e5af0
-  data.tar.gz: b1fadbfd01da61504f1d29b37e9461b95a631ce27c576146ce0f342b88aec98b21bb02ea4eb57c4cbed5a62edd0d47413228e1591e1d8f45c1726b0e74b0a7fc
+  metadata.gz: cce34cf01f0ba29e84a53839d8e4ad8d44d44b3ca2528c942f5c06dfa58405e0207c9f9f8d068d50f3fc168255d07bb225ffa3e9168ff0ca51592e3f1f5018b3
+  data.tar.gz: 2e46aed362277f732cc98ef8bded455359cda4527a6a9c6312c80cd83aa3e302d5e9d89b04bcafe8378f28eff7cc4c25502e19ff76c2a336f3a234d84d14f965

data/lib/octopress-ink/assets/asset.rb

@@ -16,12 +16,12 @@ module Octopress
         @file
       end
 
-      def path(site)
+      def path
         if @found_file and !@no_cache
           @found_file
         else
           files = []
-          files << user_path(site)
+          files << user_path
           files << plugin_path unless @plugin.type == 'local_plugin'
           files = files.flatten.reject { |f| !exists? f }
 
@@ -32,17 +32,17 @@ module Octopress
         end
       end
 
-      def file(file, site)
+      def file(file)
         @file = file
-        path(site)
+        path
       end
 
       def destination
         File.join(@dir, @file)
       end
 
-      def copy(site)
-        site.static_files << StaticFile.new(path(site), destination)
+      def copy
+        Plugins.site.static_files << StaticFile.new(path, destination)
       end
 
       def plugin_dir
@@ -53,23 +53,23 @@ module Octopress
         File.join plugin_dir, @file
       end
 
-      def user_dir(site)
-        File.join site.source, Plugins.custom_dir(site.config), @dir
+      def user_dir
+        File.join Plugins.site.source, Plugins.custom_dir, @dir
       end
 
-      def local_plugin_path(site)
-        File.join site.source, @dir, @file
+      def local_plugin_path
+        File.join Plugins.site.source, @dir, @file
       end
 
-      def user_override_path(site)
-        File.join user_dir(site), @file
+      def user_override_path
+        File.join user_dir, @file
       end
 
-      def user_path(site)
+      def user_path
         if @plugin.type == 'local_plugin'
-          local_plugin_path(site)
+          local_plugin_path
         else
-          user_override_path(site)
+          user_override_path
         end
       end
 
@@ -82,10 +82,10 @@ module Octopress
       # Remove files from Jekyll's static_files array so it doesn't end up in the
       # compiled site directory. 
       #
-      def remove_jekyll_asset(site)
-        site.static_files.clone.each do |sf|
-          if sf.kind_of?(Jekyll::StaticFile) && sf.path == path(site).to_s
-            site.static_files.delete(sf)
+      def remove_jekyll_asset
+        Plugins.site.static_files.clone.each do |sf|
+          if sf.kind_of?(Jekyll::StaticFile) && sf.path == path.to_s
+            Plugins.site.static_files.delete(sf)
           end
         end
       end

data/lib/octopress-ink/assets/config.rb

@@ -11,15 +11,15 @@ module Octopress
         @file = path
       end
 
-      def user_dir(site)
-        File.join site['source'], Plugins.custom_dir(site), @dir
+      def user_dir
+        File.join Plugins.site.source, Plugins.custom_dir, @dir
       end
 
-      def local_plugin_path(site)
-        File.join site['source'], @dir, @file
+      def local_plugin_path
+        File.join Plugins.site.source, @dir, @file
       end
 
-      def read(site)
+      def read
         config = {}
         if @plugin.type != 'local_plugin'
           default = plugin_path
@@ -27,7 +27,7 @@ module Octopress
             config = YAML.safe_load(File.open(default))
           end
         end
-        override = user_path(site)
+        override = user_path
         if exists? override
           config = config.deep_merge YAML.safe_load(File.open(override))
         end

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

@@ -2,7 +2,7 @@ module Octopress
   module Assets
     class Javascript < Asset
       def tag
-        "<script src='/#{File.join(@dir, @file)}'></script>"
+        "<script src='#{Filters.expand_url(File.join(@dir, @file))}'></script>"
       end
     end
   end

data/lib/octopress-ink/assets/layout.rb

@@ -2,18 +2,18 @@ module Octopress
   module Assets
     class Layout < Asset
 
-      def register(site)
+      def register
         name = "#{@plugin.namespace}:#{@file}"
         name = name.split(".")[0..-2].join(".")
 
-        file = user_path(site)
-        dir = user_dir(site)
+        file = user_path
+        dir = user_dir
         if !exists?(file)
           file = plugin_path 
           dir = plugin_dir
         end
 
-        site.layouts[name] = Jekyll::Layout.new(site, dir, @file)
+        Plugins.site.layouts[name] = Jekyll::Layout.new(Plugins.site, dir, @file)
       end
     end
   end

data/lib/octopress-ink/assets/root.rb

@@ -16,9 +16,9 @@ module Octopress
         file_check
       end
 
-      def copy(site)
-        unless exists? local_plugin_path(site)
-          site.static_files << StaticFile.new(plugin_path, destination)
+      def copy
+        unless exists? local_plugin_path
+          Plugins.site.static_files << StaticFile.new(plugin_path, destination)
         end
       end
 

data/lib/octopress-ink/assets/sass.rb

@@ -13,39 +13,39 @@ module Octopress
       end
 
       def tag
-        "<link href='/#{File.join(@dir, @file)}' media='#{media}' rel='stylesheet' type='text/css'>"
+        "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
 
       # TODO: choose user path before local path.
-      def user_load_path(site)
-        File.join(site.source, Plugins.custom_dir(site.config), @dir, File.dirname(@file)).sub /\/\.$/, ''
+      def user_load_path
+        File.join(Plugins.site.source, Plugins.custom_dir, @dir, File.dirname(@file)).sub /\/\.$/, ''
       end
 
       def theme_load_path
         File.expand_path(File.join(@root, @type))
       end
 
-      def compile(site)
+      def compile
         unless @compiled
-          options = Plugins.sass_options(site)
+          options = Plugins.sass_options
           if @plugin.type == 'local_plugin'
-            @compiled = Plugins.compile_sass_file(path(site).to_s, options)
+            @compiled = Plugins.compile_sass_file(path.to_s, options)
           else
             # If the plugin isn't a local plugin, add source paths to allow overrieds on @imports.
             #
-            options[:load_paths] = [user_load_path(site), theme_load_path]
-            @compiled = Plugins.compile_sass(path(site).read, options)
+            options[:load_paths] = [user_load_path, theme_load_path]
+            @compiled = Plugins.compile_sass(path.read, options)
           end
         end
         @compiled
       end
 
-      def user_override_path(site)
+      def user_override_path
         # Allow Sass overrides to use either syntax
         if @file =~ /s[ac]ss$/
-          [File.join(user_dir(site), @file), File.join(user_dir(site), alt_syntax_file)]
+          [File.join(user_dir, @file), File.join(user_dir, alt_syntax_file)]
         else
-          File.join user_dir(site), @file
+          File.join user_dir, @file
         end
       end
 
@@ -53,8 +53,8 @@ module Octopress
         File.join(@dir, @file.sub(/s.ss/, 'css'))
       end
 
-      def copy(site)
-        site.static_files << StaticFileContent.new(compile(site), destination)
+      def copy
+        Plugins.site.static_files << StaticFileContent.new(compile, destination)
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Octopress
       end
 
       def tag
-        "<link href='/#{File.join(@dir, @file)}' media='#{media}' rel='stylesheet' type='text/css'>"
+        "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
     end
   end

data/lib/octopress-ink/filters.rb

@@ -0,0 +1,115 @@
+module Octopress
+  module Filters
+    
+
+    # Returns the site's config root or '/' if the config isn't set
+    #
+    def root
+      root_url = Plugins.site.config['root']
+      root_url.nil? ? '/' : File.join('/', root_url)
+    end
+
+    # Prepends input with a url fragment
+    #
+    # input - An absolute url, e.g. /images/awesome.gif
+    # url   - The fragment to prepend the input, e.g. /blog
+    #
+    # Returns the modified url, e.g /blog
+    #
+    def expand_url(input, url=nil)
+      url ||= root
+      if input =~ /^#{url}/
+        input
+      else
+        File.join(url, input)
+      end
+    end
+
+    # Prepend all absolute urls with a url fragment
+    #
+    # input - The content of a page or post
+    # url   - The fragment to prepend absolute urls
+    #
+    # Returns input with modified urls
+    #
+    def expand_urls(input, url=nil)
+      url ||= root
+      input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]*)/ do
+        $1 + expand_url($3, url)
+      end
+    end
+
+    # Prepend all urls with the full site url
+    #
+    # input - The content of a page or post
+    #
+    # Returns input with all urls expanded to include the full site url
+    # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
+    #
+    def full_urls(input)
+      url = Plugins.site.config['url']
+      if url.nil?
+        expand_urls(input)
+      else
+        File.join url, expand_urls(input)
+      end
+    end
+    
+    # Prepend a url with the full site url
+    #
+    # input - a url
+    #
+    # Returns input with all urls expanded to include the full site url
+    # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
+    #
+    def full_url(input)
+      url = Plugins.site.config['url']
+      if url.nil?
+        expand_url(input)
+      else
+        File.join url, expand_url(input)
+      end
+    end
+
+    # Truncate a string at the <!--more--> marker
+    # input - The content of a post or page
+    #
+    # Returns only the content preceeding the marker
+    #
+    def excerpt(input)
+      if input.index(/<!--\s*more\s*-->/i)
+        input.split(/<!--\s*more\s*-->/i)[0]
+      else
+        input
+      end
+    end
+
+    # Checks for excerpt markers (helpful for template conditionals)
+    #
+    # input - The content of a page or post
+    #
+    # Returns true/false if the excerpt marker is found
+    #
+    def has_excerpt(input)
+      input =~ /<!--\s*more\s*-->/i ? true : false
+    end
+
+    # Returns a title cased string based on John Gruber's title case http://daringfireball.net/2008/08/title_case_update
+    def titlecase(input)
+      input.titlecase
+    end
+
+    # Formats a string for use as a css classname, removing illegal characters
+    def classify(input)
+      input.gsub(/ /,'-').gsub(/[^\w-]/,'').downcase
+    end
+
+    # Replaces newlines with space characters
+    def join_space(input)
+      input.gsub(/^\s+/,'').gsub(/\s+/, ' ')
+    end
+
+    module_function :root, :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :titlecase, :classify
+    public :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :titlecase, :classify
+  end
+end

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

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

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

@@ -1,7 +1,7 @@
 module Octopress
   module Helpers
     module Conditional
-      SYNTAX = /(.*)(if|unless)\s*(.+)/
+      SYNTAX = /(.*)\s(if|unless)\s(.+)/
 
       def self.parse(markup, context)
         if markup =~ SYNTAX

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

@@ -21,7 +21,7 @@ module Octopress
 
       def self.append_to_block(context, block, content)
         converter = context.environments.first['converter']
-        content = converter.convert(content).lstrip
+        content = converter.convert(content).sub(/\n$/,'')
         get_block(context, block) << content
       end
     end

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

@@ -1,10 +1,10 @@
 module Octopress
   module Helpers
     module Path
-      FILE = /(\S+)(\s.*)/
+      FILE = /(\S+)(\s?)(.*)/
       def self.parse(markup, context)
         if markup =~ FILE
-          (context[$1].nil? ? $1 : context[$1]) + $2
+          (context[$1].nil? ? $1 : context[$1]) + ' ' + ($3 || '')
         else
           markup
         end

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

@@ -0,0 +1,36 @@
+class String
+  def titlecase
+    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 = 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! : word.smart_capitalize!
+      word
+    end
+    # capitalize first and last words
+    x.first.to_s.smart_capitalize!
+    x.last.to_s.smart_capitalize!
+    # small words are capitalized after colon, period, exclamation mark, question mark
+    x.join(" ").gsub(/(:|\.|!|\?)\s?(\W*#{small_words.join("|")}\W*)\s/) { "#{$1} #{$2.smart_capitalize} " }
+  end
+
+  def titlecase!
+    replace(titlecase)
+  end
+
+  def smart_capitalize
+    # ignore any leading crazy characters and capitalize the first real character
+    if self =~ /^['"\(\[']*([a-z])/
+      i = index($1)
+      x = self[i,self.length]
+      # word with capitals and periods mid-word are left alone
+      self[i,1] = self[i,1].upcase unless x =~ /[A-Z]/ or x =~ /\.\w+/
+    end
+    self
+  end
+
+  def smart_capitalize!
+    replace(smart_capitalize)
+  end
+end

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

@@ -2,6 +2,7 @@ module Octopress
   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
@@ -22,21 +23,80 @@ module Octopress
       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|
-          Liquid::Variable.new(v.strip).render(context)
+          context[v.strip]
         }.compact
 
-        vars.empty? ? nil : vars.first
+        var = vars.first
+        if filters
+          var = Liquid::Variable.new("'#{var}'"+ filters).render(context)
+        end
+        var
       end
 
       def self.evaluate_ternary(markup, context)
         if markup =~ TERNARY
-          $1 + (Conditional.parse("if #{$2}", context) ? $3 : $4) + $5
+          $1 + (Conditional.parse(" if #{$2}", context) ? $3 : $4) + $5
         else
           markup
         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]
+            end
+          end
+        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]
+            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
     end
   end
 end

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

@@ -8,6 +8,9 @@ module Jekyll
       payload['plugins']   = config['plugins']
       payload['theme']     = config['theme']
       payload['converter'] = self.converter
+      self.site.config['octopress'] = {}
+      self.site.config['octopress']['theme'] = config['theme']
+      self.site.config['octopress']['plugins'] = config['plugins']
       do_layout_orig(payload, layouts)
     end
   end

data/lib/octopress-ink/plugin.rb

@@ -71,8 +71,8 @@ module Octopress
       end
     end
 
-    def remove_jekyll_assets(files, site)
-      files.each {|f| f.remove_jekyll_asset(site) }
+    def remove_jekyll_assets(files)
+      files.each {|f| f.remove_jekyll_asset }
     end
 
     def add_includes
@@ -123,40 +123,40 @@ module Octopress
       files.each { |f| add_file(f) }
     end
 
-    def stylesheet_paths(site)
-      get_paths(@stylesheets, site)
+    def stylesheet_paths
+      get_paths @stylesheets
     end
 
-    def javascript_paths(site)
-      get_paths(@javascripts, site)
+    def javascript_paths
+      get_paths @javascripts
     end
 
     def stylesheet_tags
-      get_tags(@stylesheets)
+      get_tags @stylesheets
     end
 
     def sass_tags
-      get_tags(@sass)
+      get_tags @sass
     end
 
     def javascript_tags
-      get_tags(@javascripts)
+      get_tags @javascripts
     end
 
-    def get_paths(files, site)
-      files.dup.map { |f| f.path(site) }
+    def get_paths(files)
+      files.dup.map { |f| f.path }
     end
 
     def get_tags(files)
       files.dup.map { |f| f.tag }
     end
 
-    def include(file, site)
-      @includes.file(file, site)
+    def include(file)
+      @includes.file file
     end
 
-    def configs(site)
-      @config ||= @configs.read(site)
+    def configs
+      @config ||= @configs.read
       @config
     end
   end

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

@@ -3,14 +3,14 @@
 #
 module Octopress
   class StylesheetsPlugin < Octopress::Plugin
-    def add_files(site)
+    def add_files
 
-      add_stylesheets(local_stylesheets(site))
+      add_stylesheets local_stylesheets
 
-      remove_jekyll_assets(@sass, site)
+      remove_jekyll_assets @sass
 
-      if Plugins.concat_css(site)
-        remove_jekyll_assets(@stylesheets, site)
+      if Plugins.concat_css
+        remove_jekyll_assets @stylesheets
       end
     end
 
@@ -36,11 +36,13 @@ module Octopress
       files
     end
 
-    def local_stylesheets(site)
-      if site.config['octopress'] && site.config['octopress']['stylesheets']
-        site.config['octopress']['stylesheets'] || []
+    def local_stylesheets
+      config = Plugins.site.config
+      source = Plugins.site.source
+      if config['octopress'] && config['octopress']['stylesheets']
+        config['octopress']['stylesheets'] || []
       else
-        dir = File.join(site.source, 'stylesheets/')
+        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