jekyll 2.0.0.alpha.1 → 2.0.0.alpha.2

data/lib/jekyll/configuration.rb

@@ -36,7 +36,7 @@ module Jekyll
       'exclude'       => [],
       'paginate_path' => '/page:num',
 
-      'markdown_ext'  => 'markdown,mkd,mkdn,md',
+      'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
       'textile_ext'   => 'textile',
 
       'port'          => '4000',
@@ -159,7 +159,7 @@ module Jekyll
       begin
         files.each do |config_file|
           new_config = read_config_file(config_file)
-          configuration = configuration.deep_merge(new_config)
+          configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
       rescue ArgumentError => err
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
@@ -229,7 +229,7 @@ module Jekyll
           config[option] = csv_to_array(config[option])
         end
       end
-      
+
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
         Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " +
           "Markdown processor. Maruku support has been deprecated and will " +

data/lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -20,7 +20,7 @@ module Jekyll
             end
           end
 
-          Kramdown::Document.new(content, @config["kramdown"].symbolize_keys).to_html
+          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config["kramdown"])).to_html
         end
 
       end

data/lib/jekyll/converters/markdown/redcarpet_parser.rb

@@ -5,6 +5,7 @@ module Jekyll
 
         module CommonMethods
           def add_code_tags(code, lang)
+            code = code.to_s
             code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
             code = code.sub(/<\/pre>/,"</code></pre>")
           end

data/lib/jekyll/convertible.rb

@@ -18,18 +18,18 @@ module Jekyll
   module Convertible
     # Returns the contents as a String.
     def to_s
-      self.content || ''
+      content || ''
     end
 
     # Whether the file is published or not, as indicated in YAML front-matter
     def published?
-      !(self.data.has_key?('published') && self.data['published'] == false)
+      !(data.has_key?('published') && data['published'] == false)
     end
 
     # Returns merged option hash for File.read of self.site (if exists)
     # and a given param
     def merged_file_read_opts(opts)
-      (self.site ? self.site.file_read_opts : {}).merge(opts)
+      (site ? site.file_read_opts : {}).merge(opts)
     end
 
     # Read the YAML frontmatter.
@@ -43,7 +43,7 @@ module Jekyll
       begin
         self.content = File.read(File.join(base, name),
                                  merged_file_read_opts(opts))
-        if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
+        if content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
           self.content = $POSTMATCH
           self.data = SafeYAML.load($1)
         end
@@ -60,10 +60,10 @@ module Jekyll
     #
     # Returns nothing.
     def transform
-      self.content = converter.convert(self.content)
+      self.content = converter.convert(content)
     rescue => e
       Jekyll.logger.error "Conversion error:", "There was an error converting" +
-        " '#{self.path}'."
+        " '#{path}'."
       raise e
     end
 
@@ -72,7 +72,7 @@ module Jekyll
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      converter.output_ext(self.ext)
+      converter.output_ext(ext)
     end
 
     # Determine which converter to use based on this convertible's
@@ -80,7 +80,7 @@ module Jekyll
     #
     # Returns the Converter instance.
     def converter
-      @converter ||= self.site.converters.find { |c| c.matches(self.ext) }
+      @converter ||= site.converters.find { |c| c.matches(ext) }
     end
 
     # Render Liquid in the content
@@ -107,7 +107,7 @@ module Jekyll
       further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
         [attribute, send(attribute)]
       }]
-      data.deep_merge(further_data)
+      Utils.deep_merge_hashes(data, further_data)
     end
 
     # Recursively render layouts
@@ -119,16 +119,16 @@ module Jekyll
     # Returns nothing
     def render_all_layouts(layouts, payload, info)
       # recursively render layouts
-      layout = layouts[self.data["layout"]]
+      layout = layouts[data["layout"]]
       used = Set.new([layout])
 
       while layout
-        payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
+        payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})
 
-        self.output = self.render_liquid(layout.content,
+        self.output = render_liquid(layout.content,
                                          payload,
                                          info,
-                                         File.join(self.site.config['layouts'], layout.name))
+                                         File.join(site.config['layouts'], layout.name))
 
         if layout = layouts[layout.data["layout"]]
           if used.include?(layout)
@@ -147,21 +147,19 @@ module Jekyll
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
+      info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } }
 
       # render and transform content (this becomes the final content of the object)
       payload["highlighter_prefix"] = converter.highlighter_prefix
       payload["highlighter_suffix"] = converter.highlighter_suffix
 
-      self.content = self.render_liquid(self.content,
-                                        payload,
-                                        info)
-      self.transform
+      self.content = render_liquid(content, payload, info)
+      transform
 
       # output keeps track of what will finally be written
-      self.output = self.content
+      self.output = content
 
-      self.render_all_layouts(layouts, payload, info)
+      render_all_layouts(layouts, payload, info)
     end
 
     # Write the generated page file to the destination directory.
@@ -173,7 +171,7 @@ module Jekyll
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
       File.open(path, 'wb') do |f|
-        f.write(self.output)
+        f.write(output)
       end
     end
 

data/lib/jekyll/draft.rb

@@ -18,6 +18,11 @@ module Jekyll
       File.join(source, dir, '_drafts')
     end
 
+    # The path to the draft source file, relative to the site source
+    def relative_path
+      File.join(@dir, '_drafts', @name)
+    end
+
     # Extract information from the post filename.
     #
     # name - The String filename of the post file.

data/lib/jekyll/excerpt.rb

@@ -8,7 +8,7 @@ module Jekyll
 
     attr_accessor :post
     attr_accessor :content, :output, :ext
-    
+
     def_delegator :@post, :site, :site
     def_delegator :@post, :name, :name
     def_delegator :@post, :ext,  :ext
@@ -39,7 +39,7 @@ module Jekyll
     end
 
     # 'Path' of the excerpt.
-    # 
+    #
     # Returns the path for the post this excerpt belongs to with #excerpt appended
     def path
       File.join(post.path, "#excerpt")
@@ -47,9 +47,9 @@ module Jekyll
 
     # Check if excerpt includes a string
     #
-    # Returns true if the string passed in 
+    # Returns true if the string passed in
     def include?(something)
-      (self.output && self.output.include?(something)) || self.content.include?(something)
+      (output && output.include?(something)) || content.include?(something)
     end
 
     # The UID for this post (useful in feeds).
@@ -61,7 +61,7 @@ module Jekyll
     end
 
     def to_s
-      self.output || self.content
+      output || content
     end
 
     # Returns the shorthand String identifier of this Post.

data/lib/jekyll/layout.rb

@@ -29,8 +29,8 @@ module Jekyll
 
       self.data = {}
 
-      self.process(name)
-      self.read_yaml(base, name)
+      process(name)
+      read_yaml(base, name)
     end
 
     # Extract information from the layout filename.

data/lib/jekyll/layout_reader.rb

@@ -14,6 +14,10 @@ module Jekyll
       @layouts
     end
 
+    def layout_directory
+      @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
+    end
+
     private
 
     def layout_entries
@@ -33,8 +37,17 @@ module Jekyll
       Dir.chdir(directory) { yield }
     end
 
-    def layout_directory
-      File.join(site.source, site.config['layouts'])
+    def layout_directory_inside_source
+      Jekyll.sanitized_path(site.source, site.config['layouts'])
+    end
+
+    def layout_directory_in_cwd
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
+      if File.directory?(dir)
+        dir
+      else
+        nil
+      end
     end
   end
 end

data/lib/jekyll/page.rb

@@ -28,8 +28,8 @@ module Jekyll
       @dir  = dir
       @name = name
 
-      self.process(name)
-      self.read_yaml(File.join(base, dir), name)
+      process(name)
+      read_yaml(File.join(base, dir), name)
     end
 
     # The generated directory into which the page will be placed
@@ -46,11 +46,11 @@ module Jekyll
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      return nil if self.data.nil? || self.data['permalink'].nil?
+      return nil if data.nil? || data['permalink'].nil?
       if site.config['relative_permalinks']
-        File.join(@dir, self.data['permalink'])
+        File.join(@dir, data['permalink'])
       else
-        self.data['permalink']
+        data['permalink']
       end
     end
 
@@ -58,7 +58,7 @@ module Jekyll
     #
     # Returns the template String.
     def template
-      if self.site.permalink_style == :pretty
+      if site.permalink_style == :pretty
         if index? && html?
           "/:path/"
         elsif html?
@@ -87,8 +87,8 @@ module Jekyll
     def url_placeholders
       {
         :path       => @dir,
-        :basename   => self.basename,
-        :output_ext => self.output_ext
+        :basename   => basename,
+        :output_ext => output_ext
       }
     end
 
@@ -99,7 +99,7 @@ module Jekyll
     # Returns nothing.
     def process(name)
       self.ext = File.extname(name)
-      self.basename = name[0 .. -self.ext.length-1]
+      self.basename = name[0 .. -ext.length - 1]
     end
 
     # Add any necessary layouts to this post
@@ -109,10 +109,10 @@ module Jekyll
     #
     # Returns nothing.
     def render(layouts, site_payload)
-      payload = {
-        "page" => self.to_liquid,
+      payload = Utils.deep_merge_hashes({
+        "page" => to_liquid,
         'paginator' => pager.to_liquid
-      }.deep_merge(site_payload)
+      }, site_payload)
 
       do_layout(payload, layouts)
     end
@@ -121,7 +121,7 @@ module Jekyll
     #
     # Returns the path to the source file
     def path
-      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+      data.fetch('path', relative_path.sub(/\A\//, ''))
     end
 
     # The path to the page source file, relative to the site source
@@ -135,14 +135,14 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = File.join(dest, self.url)
-      path = File.join(path, "index.html") if self.url =~ /\/$/
+      path = Jekyll.sanitized_path(dest, url)
+      path = File.join(path, "index.html") if url =~ /\/$/
       path
     end
 
     # Returns the object as a debug String.
     def inspect
-      "#<Jekyll:Page @name=#{self.name.inspect}>"
+      "#<Jekyll:Page @name=#{name.inspect}>"
     end
 
     # Returns the Boolean of whether this Page is HTML or not.
@@ -156,7 +156,7 @@ module Jekyll
     end
 
     def uses_relative_permalinks
-      permalink && @dir != "" && site.config['relative_permalinks']
+      permalink && !@dir.empty? && site.config['relative_permalinks']
     end
   end
 end

data/lib/jekyll/post.rb

@@ -49,30 +49,30 @@ module Jekyll
     def initialize(site, source, dir, name)
       @site = site
       @dir = dir
-      @base = self.containing_dir(source, dir)
+      @base = containing_dir(source, dir)
       @name = name
 
       self.categories = dir.downcase.split('/').reject { |x| x.empty? }
-      self.process(name)
-      self.read_yaml(@base, name)
+      process(name)
+      read_yaml(@base, name)
 
-      if self.data.has_key?('date')
-        self.date = Time.parse(self.data["date"].to_s)
+      if data.has_key?('date')
+        self.date = Time.parse(data["date"].to_s)
       end
 
-      self.populate_categories
-      self.populate_tags
+      populate_categories
+      populate_tags
     end
 
     def populate_categories
-      if self.categories.empty?
-        self.categories = self.data.pluralized_array('category', 'categories').map {|c| c.to_s.downcase}
+      if categories.empty?
+        self.categories = Utils.pluralized_array_from_hash(data, 'category', 'categories').map {|c| c.to_s.downcase}
       end
-      self.categories.flatten!
+      categories.flatten!
     end
 
     def populate_tags
-      self.tags = self.data.pluralized_array("tag", "tags").flatten
+      self.tags = Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
     end
 
     # Get the full path to the directory containing the post files
@@ -88,7 +88,7 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name)
       super(base, name)
-      self.extracted_excerpt = self.extract_excerpt
+      self.extracted_excerpt = extract_excerpt
     end
 
     # The post excerpt. This is either a custom excerpt
@@ -96,19 +96,19 @@ module Jekyll
     #
     # Returns excerpt string.
     def excerpt
-      self.data.fetch('excerpt', self.extracted_excerpt.to_s)
+      data.fetch('excerpt', extracted_excerpt.to_s)
     end
 
     # Public: the Post title, from the YAML Front-Matter or from the slug
     #
     # Returns the post title
     def title
-      self.data.fetch("title", self.titleized_slug)
+      data.fetch("title", titleized_slug)
     end
 
     # Turns the post slug into a suitable title
     def titleized_slug
-      self.slug.split('-').select {|w| w.capitalize! || w }.join(' ')
+      slug.split('-').select {|w| w.capitalize! || w }.join(' ')
     end
 
     # Public: the path to the post relative to the site source,
@@ -118,7 +118,7 @@ module Jekyll
     #
     # Returns the path to the file relative to the site source
     def path
-      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+      data.fetch('path', relative_path.sub(/\A\//, ''))
     end
 
     # The path to the post source file, relative to the site source
@@ -172,11 +172,11 @@ module Jekyll
     #
     # Returns the String permalink.
     def permalink
-      self.data && self.data['permalink']
+      data && data['permalink']
     end
 
     def template
-      case self.site.permalink_style
+      case site.permalink_style
       when :pretty
         "/:categories/:year/:month/:day/:title/"
       when :none
@@ -186,7 +186,7 @@ module Jekyll
       when :ordinal
         "/:categories/:year/:y_day/:title.html"
       else
-        self.site.permalink_style.to_s
+        site.permalink_style.to_s
       end
     end
 
@@ -214,7 +214,7 @@ module Jekyll
         :categories  => (categories || []).map { |c| URI.escape(c.to_s) }.join('/'),
         :short_month => date.strftime("%b"),
         :y_day       => date.strftime("%j"),
-        :output_ext  => self.output_ext
+        :output_ext  => output_ext
       }
     end
 
@@ -223,7 +223,7 @@ module Jekyll
     #
     # Returns the String UID.
     def id
-      File.join(self.dir, self.slug)
+      File.join(dir, slug)
     end
 
     # Calculate related posts.
@@ -241,16 +241,16 @@ module Jekyll
     # Returns nothing.
     def render(layouts, site_payload)
       # construct payload
-      payload = {
+      payload = Utils.deep_merge_hashes({
         "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => self.to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
-      }.deep_merge(site_payload)
+        "page" => to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
+      }, site_payload)
 
       if generate_excerpt?
-        self.extracted_excerpt.do_layout(payload, {})
+        extracted_excerpt.do_layout(payload, {})
       end
 
-      do_layout(payload.merge({"page" => self.to_liquid}), layouts)
+      do_layout(payload.merge({"page" => to_liquid}), layouts)
     end
 
     # Obtain destination path.
@@ -260,29 +260,29 @@ module Jekyll
     # Returns destination file path String.
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
-      path = File.join(dest, CGI.unescape(self.url))
+      path = Jekyll.sanitized_path(dest, CGI.unescape(url))
       path = File.join(path, "index.html") if path[/\.html$/].nil?
       path
     end
 
     # Returns the shorthand String identifier of this Post.
     def inspect
-      "<Post: #{self.id}>"
+      "<Post: #{id}>"
     end
 
     def next
-      pos = self.site.posts.index {|post| post.equal?(self) }
-      if pos && pos < self.site.posts.length-1
-        self.site.posts[pos+1]
+      pos = site.posts.index {|post| post.equal?(self) }
+      if pos && pos < site.posts.length - 1
+        site.posts[pos + 1]
       else
         nil
       end
     end
 
     def previous
-      pos = self.site.posts.index {|post| post.equal?(self) }
+      pos = site.posts.index {|post| post.equal?(self) }
       if pos && pos > 0
-        self.site.posts[pos-1]
+        site.posts[pos - 1]
       else
         nil
       end