jekyll 1.5.1 → 2.0.0.alpha.1

data/lib/jekyll/convertible.rb

@@ -13,6 +13,7 @@ require 'set'
 #   self.ext=
 #   self.output=
 #   self.name
+#   self.path
 module Jekyll
   module Convertible
     # Returns the contents as a String.
@@ -20,7 +21,12 @@ module Jekyll
       self.content || ''
     end
 
-    # Returns merged optin hash for File.read of self.site (if exists)
+    # Whether the file is published or not, as indicated in YAML front-matter
+    def published?
+      !(self.data.has_key?('published') && self.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)
@@ -35,11 +41,11 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read_with_options(File.join(base, name),
-                                              merged_file_read_opts(opts))
+        self.content = File.read(File.join(base, name),
+                                 merged_file_read_opts(opts))
         if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
           self.content = $POSTMATCH
-          self.data = YAML.safe_load($1)
+          self.data = SafeYAML.load($1)
         end
       rescue SyntaxError => e
         puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
@@ -144,8 +150,8 @@ module Jekyll
       info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
 
       # render and transform content (this becomes the final content of the object)
-      payload["pygments_prefix"] = converter.pygments_prefix
-      payload["pygments_suffix"] = converter.pygments_suffix
+      payload["highlighter_prefix"] = converter.highlighter_prefix
+      payload["highlighter_suffix"] = converter.highlighter_suffix
 
       self.content = self.render_liquid(self.content,
                                         payload,
@@ -170,5 +176,18 @@ module Jekyll
         f.write(self.output)
       end
     end
+
+    # Accessor for data properties by Liquid.
+    #
+    # property - The String name of the property to retrieve.
+    #
+    # Returns the String value or nil if the property isn't included.
+    def [](property)
+      if self.class::ATTRIBUTES_FOR_LIQUID.include?(property)
+        send(property)
+      else
+        data[property]
+      end
+    end
   end
 end

data/lib/jekyll/core_ext.rb

@@ -53,38 +53,3 @@ class Hash
     dup.symbolize_keys!
   end
 end
-
-# Thanks, ActiveSupport!
-class Date
-  # Converts datetime to an appropriate format for use in XML
-  def xmlschema
-    strftime("%Y-%m-%dT%H:%M:%S%Z")
-  end if RUBY_VERSION < '1.9'
-end
-
-module Enumerable
-  # Returns true if path matches against any glob pattern.
-  # Look for more detail about glob pattern in method File::fnmatch.
-  def glob_include?(e)
-    any? { |exp| File.fnmatch?(exp, e) }
-  end
-end
-
-# Ruby 1.8's File.read don't support option.
-# read_with_options ignore optional parameter for 1.8,
-# and act as alias for 1.9 or later.
-class File
-  if RUBY_VERSION < '1.9'
-    def self.read_with_options(path, opts = {})
-      self.read(path)
-    end
-
-    def self.realpath(filename)
-      Pathname.new(filename).realpath.to_s
-    end
-  else
-    def self.read_with_options(path, opts = {})
-      self.read(path, opts)
-    end
-  end
-end

data/lib/jekyll/deprecator.rb

@@ -9,8 +9,8 @@ module Jekyll
       arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
       arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
                           the '--watch' switch."
-      arg_is_present? args, "--pygments", "The 'pygments' setting can only be set in \
-                          your config files."
+      arg_is_present? args, "--pygments", "The 'pygments'settings has been removed in \
+                          favour of 'highlighter'."
       arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
                           config files."
       arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."

data/lib/jekyll/entry_filter.rb

@@ -1,35 +1,71 @@
-class EntryFilter
-  attr_reader :site
-  def initialize(site)
-    @site = site
-  end
+module Jekyll
+  class EntryFilter
+    attr_reader :site
+
+    def initialize(site, base_directory = nil)
+      @site = site
+      @base_directory = derive_base_directory(@site, base_directory.to_s.dup)
+    end
 
-  def filter(entries)
-    entries.reject do |e|
-      unless included?(e)
-        special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+    def base_directory
+      @base_directory.to_s
+    end
+
+    def derive_base_directory(site, base_dir)
+      if base_dir.start_with?(site.source)
+        base_dir[site.source] = ""
       end
+      base_dir
     end
-  end
 
-  def included?(entry)
-    site.include.glob_include?(entry)
-  end
+    def relative_to_source(entry)
+      File.join(base_directory, entry)
+    end
 
-  def special?(entry)
-    ['.', '_', '#'].include?(entry[0..0])
-  end
+    def filter(entries)
+      entries.reject do |e|
+        unless included?(e)
+          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+        end
+      end
+    end
 
-  def backup?(entry)
-    entry[-1..-1] == '~'
-  end
+    def included?(entry)
+      glob_include?(site.include, entry)
+    end
 
-  def excluded?(entry)
-    site.exclude.glob_include?(entry)
-  end
+    def special?(entry)
+      ['.', '_', '#'].include?(entry[0..0])
+    end
 
-  def symlink?(entry)
-    File.symlink?(entry) && site.safe
-  end
+    def backup?(entry)
+      entry[-1..-1] == '~'
+    end
 
+    def excluded?(entry)
+      excluded = glob_include?(site.exclude, relative_to_source(entry))
+      Jekyll.logger.debug "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
+      excluded
+    end
+
+    def symlink?(entry)
+      File.symlink?(entry) && site.safe
+    end
+
+    def ensure_leading_slash(path)
+      path[0..0] == "/" ? path : "/#{path}"
+    end
+
+    # Returns true if path matches against any glob pattern.
+    # Look for more detail about glob pattern in method File::fnmatch.
+    def glob_include?(enum, e)
+      entry = ensure_leading_slash(e)
+      enum.any? do |exp|
+        item = ensure_leading_slash(exp)
+        Jekyll.logger.debug "glob_include?(#{entry})"
+        Jekyll.logger.debug "    ==> File.fnmatch?(#{item}, #{entry}) == #{File.fnmatch?(item, entry)}"
+        File.fnmatch?(item, entry)
+      end
+    end
+  end
 end

data/lib/jekyll/excerpt.rb

@@ -1,9 +1,17 @@
+require 'jekyll/convertible'
+require 'forwardable'
+
 module Jekyll
   class Excerpt
     include Convertible
+    extend Forwardable
 
     attr_accessor :post
     attr_accessor :content, :output, :ext
+    
+    def_delegator :@post, :site, :site
+    def_delegator :@post, :name, :name
+    def_delegator :@post, :ext,  :ext
 
     # Initialize this Post instance.
     #
@@ -17,12 +25,6 @@ module Jekyll
       self.content = extract_excerpt(post.content)
     end
 
-    %w[site name ext].each do |meth|
-      define_method(meth) do
-        post.send(meth)
-      end
-    end
-
     def to_liquid
       post.to_liquid(Post::EXCERPT_ATTRIBUTES_FOR_LIQUID)
     end

data/lib/jekyll/filters.rb

@@ -100,7 +100,7 @@ module Jekyll
     def cgi_escape(input)
       CGI::escape(input)
     end
-    
+
     # URI escape a string.
     #
     # input - The String to escape.
@@ -124,7 +124,7 @@ module Jekyll
       input.split.length
     end
 
-    # Join an array of things into a string by separating with commes and the
+    # Join an array of things into a string by separating with commas and the
     # word "and" for the last one.
     #
     # array - The Array of Strings to join.
@@ -158,6 +158,38 @@ module Jekyll
       input.to_json
     end
 
+    # Group an array of items by a property
+    #
+    # input - the inputted Enumerable
+    # property - the property
+    #
+    # Returns an array of Hashes, each looking something like this:
+    #  {"name"  => "larry"
+    #   "items" => [...] } # all the items where `property` == "larry"
+    def group_by(input, property)
+      if groupable?(input)
+        input.group_by do |item|
+          item_property(item, property).to_s
+        end.inject([]) do |memo, i|
+          memo << {"name" => i.first, "items" => i.last}
+        end
+      else
+        input
+      end
+    end
+
+    # Filter an array of objects
+    #
+    # input - the object array
+    # key - key within each object to filter by
+    # value - desired value
+    #
+    # Returns the filtered array of objects
+    def where(input, key, value)
+      return input unless input.is_a?(Array)
+      input.select { |object| object[key] == value }
+    end
+
     private
     def time(input)
       case input
@@ -170,5 +202,17 @@ module Jekyll
         exit(1)
       end
     end
+
+    def groupable?(element)
+      element.respond_to?(:group_by)
+    end
+
+    def item_property(item, property)
+      if item.respond_to?(:data)
+        item.data[property.to_s]
+      else
+        item[property.to_s]
+      end
+    end
   end
 end

data/lib/jekyll/layout_reader.rb

@@ -0,0 +1,40 @@
+module Jekyll
+  class LayoutReader
+    attr_reader :site
+    def initialize(site)
+      @site = site
+      @layouts = {}
+    end
+
+    def read
+      layout_entries.each do |f|
+        @layouts[layout_name(f)] = Layout.new(site, layout_directory, f)
+      end
+
+      @layouts
+    end
+
+    private
+
+    def layout_entries
+      entries = []
+      within(layout_directory) do
+        entries = EntryFilter.new(site).filter(Dir['**/*.*'])
+      end
+      entries
+    end
+
+    def layout_name(file)
+      file.split(".")[0..-2].join(".")
+    end
+
+    def within(directory)
+      return unless File.exists?(directory)
+      Dir.chdir(directory) { yield }
+    end
+
+    def layout_directory
+      File.join(site.source, site.config['layouts'])
+    end
+  end
+end

data/lib/jekyll/mime.types

@@ -1,12 +1,13 @@
-# These are the same MIME types that GitHub Pages uses as of 17 Mar 2013.
+-# These are the same MIME types that GitHub Pages uses as of 26 January 2014
 
 text/html                             html htm shtml
 text/css                              css
-text/xml                              xml rss xsl
+text/xml                              xml rss xsl xsd
 image/gif                             gif
 image/jpeg                            jpeg jpg
 application/x-javascript              js
 application/atom+xml                  atom
+application/json                      json geojson topojson
 
 text/mathml                           mml
 text/plain                            txt
@@ -17,16 +18,22 @@ text/cache-manifest                   manifest appcache
 text/coffeescript                     coffee
 text/plain                            pde
 text/plain                            md markdown
+text/vcard                            vcf vcard
 
 image/png                             png
 image/svg+xml                         svg
+image/svg+xml                         svgz
 image/tiff                            tif tiff
 image/vnd.wap.wbmp                    wbmp
 image/x-icon                          ico
 image/x-jng                           jng
 image/x-ms-bmp                        bmp
 
-application/json                      json
+application/vnd.ms-fontobject         eot
+application/x-font-ttf                ttf
+application/x-font-woff               woff
+font/opentype                         otf
+
 application/java-archive              jar ear
 application/mac-binhex40              hqx
 application/msword                    doc
@@ -34,18 +41,19 @@ application/pdf                       pdf
 application/postscript                ps eps ai
 application/rdf+xml                   rdf
 application/rtf                       rtf
-text/vcard                            vcf vcard
 application/vnd.apple.pkpass          pkpass
 application/vnd.ms-excel              xls
 application/vnd.ms-powerpoint         ppt
 application/vnd.wap.wmlc              wmlc
 application/xhtml+xml                 xhtml
-application/x-chrome-extension        crx
 application/x-cocoa                   cco
-application/x-font-ttf                ttf
+application/x-chrome-extension        crx
 application/x-java-archive-diff       jardiff
 application/x-java-jnlp-file          jnlp
 application/x-makeself                run
+application/x-ms-application          application
+application/x-ms-manifest             manifest
+application/x-ms-vsto                 vsto
 application/x-ns-proxy-autoconfig     pac
 application/x-perl                    pl pm
 application/x-pilot                   prc pdb
@@ -63,8 +71,8 @@ application/zip                       zip
 
 application/octet-stream              bin exe dll
 application/octet-stream              deb
+application/octet-stream              deploy
 application/octet-stream              dmg
-application/octet-stream              eot
 application/octet-stream              iso img
 application/octet-stream              msi msp msm
 
@@ -74,12 +82,14 @@ audio/x-realaudio                     ra
 audio/ogg                             ogg
 
 video/3gpp                            3gpp 3gp
+video/m4v                             m4v
+video/mp4                             mp4
 video/mpeg                            mpeg mpg
+video/ogg                             ogg ogv
 video/quicktime                       mov
+video/webm                            webm
 video/x-flv                           flv
 video/x-mng                           mng
 video/x-ms-asf                        asx asf
 video/x-ms-wmv                        wmv
 video/x-msvideo                       avi
-video/ogg                             ogv
-video/webm                            webm

data/lib/jekyll/page.rb

@@ -9,9 +9,11 @@ module Jekyll
 
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w[
-      url
       content
+      dir
+      name
       path
+      url
     ]
 
     # Initialize a new Page.
@@ -124,7 +126,7 @@ module Jekyll
 
     # The path to the page source file, relative to the site source
     def relative_path
-      File.join(@dir, @name)
+      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?))
     end
 
     # Obtain destination path.
@@ -133,8 +135,8 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = Jekyll.sanitized_path(dest, url)
-      path = File.join(path, "index.html") if url =~ /\/$/
+      path = File.join(dest, self.url)
+      path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end