jekyll 2.0.0.rc1 → 2.0.0

data/lib/jekyll/entry_filter.rb

@@ -65,9 +65,7 @@ module Jekyll
       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)
+        File.fnmatch?(item, entry) || entry.start_with?(item)
       end
     end
   end

data/lib/jekyll/filters.rb

@@ -190,6 +190,40 @@ module Jekyll
       input.select { |object| object[key] == value }
     end
 
+    # Sort an array of objects
+    #
+    # input - the object array
+    # key - key within each object to filter by
+    # nils ('first' | 'last') - nils appear before or after non-nil values
+    #
+    # Returns the filtered array of objects
+    def sort(input, key = nil, nils = "first")
+      if key.nil?
+        input.sort
+      else
+        case
+        when nils == "first"
+          order = - 1
+        when nils == "last"
+          order = + 1
+        else
+          Jekyll.logger.error "Invalid nils order:",
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
+          exit(1)
+        end
+
+        input.sort { |a, b|
+          if !a[key].nil? && b[key].nil?
+            - order
+          elsif a[key].nil? && !b[key].nil?
+            + order
+          else
+            a[key] <=> b[key]
+          end
+        }
+      end
+    end
+
     private
     def time(input)
       case input

data/lib/jekyll/post.rb

@@ -225,6 +225,7 @@ module Jekyll
         :i_month     => date.strftime("%m").to_i.to_s,
         :categories  => (categories || []).map { |c| c.to_s }.join('/'),
         :short_month => date.strftime("%b"),
+        :short_year  => date.strftime("%y"),
         :y_day       => date.strftime("%j"),
         :output_ext  => output_ext
       }

data/lib/jekyll/site.rb

@@ -325,6 +325,7 @@ module Jekyll
           "categories"   => post_attr_hash('categories'),
           "tags"         => post_attr_hash('tags'),
           "collections"  => collections,
+          "documents"    => documents,
           "data"         => site_data
         }))
       }
@@ -395,28 +396,26 @@ module Jekyll
 
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && has_relative_page?
-        $stderr.puts # Places newline after "Generating..."
         Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
                                             " for more info."
-        $stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
       end
     end
 
+    def docs_to_write
+      documents.select(&:write?)
+    end
+
     def documents
       collections.reduce(Set.new) do |docs, (_, collection)|
-        if collection.write?
-          docs.merge(collection.docs)
-        else
-          docs
-        end
-      end
+        docs.merge(collection.docs)
+      end.to_a
     end
 
     def each_site_file
-      %w(posts pages static_files documents).each do |type|
+      %w(posts pages static_files docs_to_write).each do |type|
         send(type).each do |item|
           yield item
         end
@@ -434,7 +433,7 @@ module Jekyll
     end
 
     def has_yaml_header?(file)
-      !!(File.open(file, "rb").read(5) =~ /\A---\r?\n/)
+      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
     end
 
     def limit_posts!

data/lib/jekyll/stevenson.rb

@@ -2,17 +2,19 @@ module Jekyll
   class Stevenson
     attr_accessor :log_level
 
-    DEBUG  = 0
-    INFO   = 1
-    WARN   = 2
-    ERROR  = 3
+    LOG_LEVELS = {
+      debug: 0,
+      info:  1,
+      warn:  2,
+      error: 3
+    }
 
     # Public: Create a new instance of Stevenson, Jekyll's logger
     #
-    # level - (optional, integer) the log level
+    # level - (optional, symbol) the log level
     #
     # Returns nothing
-    def initialize(level = INFO)
+    def initialize(level = :info)
       @log_level = level
     end
 
@@ -23,7 +25,7 @@ module Jekyll
     #
     # Returns nothing
     def debug(topic, message = nil)
-      $stdout.puts(message(topic, message)) if log_level <= DEBUG
+      $stdout.puts(message(topic, message)) if should_log(:debug)
     end
 
     # Public: Print a jekyll message to stdout
@@ -33,7 +35,7 @@ module Jekyll
     #
     # Returns nothing
     def info(topic, message = nil)
-      $stdout.puts(message(topic, message)) if log_level <= INFO
+      $stdout.puts(message(topic, message)) if should_log(:info)
     end
 
     # Public: Print a jekyll message to stderr
@@ -43,7 +45,7 @@ module Jekyll
     #
     # Returns nothing
     def warn(topic, message = nil)
-      $stderr.puts(message(topic, message).yellow) if log_level <= WARN
+      $stderr.puts(message(topic, message).yellow) if should_log(:warn)
     end
 
     # Public: Print a jekyll error message to stderr
@@ -53,7 +55,7 @@ module Jekyll
     #
     # Returns nothing
     def error(topic, message = nil)
-      $stderr.puts(message(topic, message).red) if log_level <= ERROR
+      $stderr.puts(message(topic, message).red) if should_log(:error)
     end
 
     # Public: Print a Jekyll error message to stderr and immediately abort the process
@@ -85,5 +87,16 @@ module Jekyll
     def formatted_topic(topic)
       "#{topic} ".rjust(20)
     end
+
+    # Public: Determine whether the current log level warrants logging at the
+    #         proposed level.
+    #
+    # level_of_message - the log level of the message (symbol)
+    #
+    # Returns true if the log level of the message is greater than or equal to
+    #   this logger's log level.
+    def should_log(level_of_message)
+      LOG_LEVELS.fetch(log_level) <= LOG_LEVELS.fetch(level_of_message)
+    end
   end
 end

data/lib/jekyll/tags/highlight.rb

@@ -5,10 +5,7 @@ module Jekyll
 
       # The regular expression syntax checker. Start with the language specifier.
       # Follow that by zero or more space separated options that take one of two
-      # forms:
-      #
-      # 1. name
-      # 2. name=value
+      # forms: name or name=value
       SYNTAX = /^([a-zA-Z0-9.+#-]+)((\s+\w+(=\w+)?)*)$/
 
       def initialize(tag_name, markup, tokens)
@@ -19,16 +16,10 @@ module Jekyll
           if defined?($2) && $2 != ''
             $2.split.each do |opt|
               key, value = opt.split('=')
-              if value.nil?
-                if key == 'linenos'
-                  value = 'inline'
-                else
-                  value = true
-                end
-              end
-              @options[key] = value
+              @options[key.to_sym] = value || true
             end
           end
+          @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true
         else
           raise SyntaxError.new <<-eos
 Syntax Error in tag 'highlight' while parsing the following markup:
@@ -41,20 +32,25 @@ eos
       end
 
       def render(context)
+        prefix = context["highlighter_prefix"] || ""
+        suffix = context["highlighter_suffix"] || ""
         code = super.to_s.strip
-        case context.registers[:site].highlighter
+
+        output = case context.registers[:site].highlighter
         when 'pygments'
-          render_pygments(context, code)
+          render_pygments(code)
         when 'rouge'
-          render_rouge(context, code)
+          render_rouge(code)
         else
-          render_codehighlighter(context, code)
-        end.strip
+          render_codehighlighter(code)
+        end
+
+        rendered_output = add_code_tag(output)
+        prefix + rendered_output + suffix
       end
 
-      def render_pygments(context, code)
+      def render_pygments(code)
         require 'pygments'
-
         @options[:encoding] = 'utf-8'
 
         highlighted_code = Pygments.highlight(code, :lexer => @lang, :options => @options)
@@ -70,44 +66,24 @@ eos
           raise ArgumentError.new("Pygments.rb returned an unacceptable value when attempting to highlight some code.")
         end
 
-        output = add_code_tags(highlighted_code, @lang)
-
-        output = context["highlighter_prefix"] + output if context["highlighter_prefix"]
-        output << context["highlighter_suffix"] if context["highlighter_suffix"]
-
-        return output
+        highlighted_code
       end
 
-      def render_rouge(context, code)
+      def render_rouge(code)
         require 'rouge'
-
-        linenos = @options.keys.include?('linenos')
+        formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
-        formatter = Rouge::Formatters::HTML.new(line_numbers: linenos, wrap: false)
-
-        pre = "<pre>#{formatter.format(lexer.lex(code))}</pre>"
-
-        output = context["highlighter_prefix"] || ""
-        output << "<div class=\"highlight\">"
-        output << add_code_tags(pre, @lang)
-        output << "</div>"
-        output << context["highlighter_suffix"] if context["highlighter_suffix"]
-
-        return output
+        code = formatter.format(lexer.lex(code))
+        "<div class=\"highlight\"><pre>#{code}</pre></div>"
       end
 
-      def render_codehighlighter(context, code)
-        #The div is required because RDiscount blows ass
-        <<-HTML
-  <div>
-    <pre><code class='#{@lang.to_s.gsub("+", "-")}'>#{h(code).strip}</code></pre>
-  </div>
-        HTML
+      def render_codehighlighter(code)
+        "<div class=\"highlight\"><pre>#{h(code).strip}</pre></div>"
       end
 
-      def add_code_tags(code, lang)
+      def add_code_tag(code)
         # Add nested <code> tags to code blocks
-        code = code.sub(/<pre>\n*/,'<pre><code class="' + lang.to_s.gsub("+", "-") + '">')
+        code = code.sub(/<pre>\n*/,'<pre><code class="' + @lang.to_s.gsub("+", "-") + '">')
         code = code.sub(/\n*<\/pre>/,"</code></pre>")
         code.strip
       end

data/lib/jekyll/utils.rb

@@ -48,17 +48,21 @@ module Jekyll
         array || []
       end
 
+      def transform_keys(hash)
+        result = {}
+        hash.each_key do |key|
+          result[yield(key)] = hash[key]
+        end
+        result
+      end
+
       # Apply #to_sym to all keys in the hash
       #
       # hash - the hash to which to apply this transformation
       #
       # Returns a new hash with symbolized keys
       def symbolize_hash_keys(hash)
-        target = hash.dup
-        target.keys.each do |key|
-          target[(key.to_sym rescue key) || key] = target.delete(key)
-        end
-        target
+        transform_keys(hash) { |key| key.to_sym rescue key }
       end
 
       # Apply #to_s to all keys in the Hash
@@ -67,11 +71,7 @@ module Jekyll
       #
       # Returns a new hash with stringified keys
       def stringify_hash_keys(hash)
-        target = hash.dup
-        target.keys.each do |key|
-          target[(key.to_s rescue key) || key] = target.delete(key)
-        end
-        target
+        transform_keys(hash) { |key| key.to_s rescue key }
       end
 
     end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0'
 end

data/lib/site_template/_config.yml

@@ -1,5 +1,10 @@
+# Site settings
 name: Dat site title tho
-markdown: redcarpet
-highlighter: pygments
-description: "Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
-url: "http://yourdomain.com"
+title: Your awesome title
+email: your-email@domain.com
+description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+baseurl: "http://yourdomain.com"
+
+# Build settings
+markdown: kramdown
+permalinks: pretty

data/lib/site_template/_includes/footer.html

@@ -2,19 +2,19 @@
 
   <div class="wrap">
 
-    <h2 class="footer-heading">Bart Simpson</h2>
+    <h2 class="footer-heading">{{ site.name }}</h2>
 
     <div class="footer-col-1 column">
       <ul>
-        <li>Chief Flatulence Officer</li>
-        <li><a href="mailto:bsimpson@flatulencehub.com">bsimpson@flatulencehub.com</a></li>
+        <li>{{ site.title }}</li>
+        <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
       </ul>
     </div>
 
     <div class="footer-col-2 column">
       <ul>
         <li>
-          <a href="https://github.com/yourusername">
+          <a href="https://github.com/{{ site.username }}">
             <span class="icon github">
               <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -29,11 +29,11 @@
                 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
               </svg>
             </span>
-            <span class="username">bartrulez</span>
+            <span class="username">{{ site.username }}</span>
           </a>
         </li>
         <li>
-          <a href="https://twitter.com/yourusername">
+          <a href="https://twitter.com/{{ site.username }}">
             <span class="icon twitter">
               <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -46,16 +46,16 @@
                 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
               </svg>
             </span>
-            <span class="username">bartrulez</span>
+            <span class="username">{{ site.username }}</span>
           </a>
         </li>
       </ul>
     </div>
 
     <div class="footer-col-3 column">
-      <p class="text">Any additional text you want to have here is totally cool for you to haz, yo.</p>
+      <p class="text">{{ site.description }}</p>
     </div>
 
   </div>
 
-</footer>
+</footer>

data/lib/site_template/_includes/head.html

@@ -4,9 +4,9 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
     <meta name="viewport" content="width=device-width">
     <meta name="description" content="{{ site.description }}">
-    <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html','' }}">
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
 
     <!-- Custom CSS -->
-    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
 
-</head>
+</head>

data/lib/site_template/_includes/header.html

@@ -2,7 +2,7 @@
 
   <div class="wrap">
 
-    <a class="site-title" href="/">{{ site.name }}</a>
+    <a class="site-title" href="{{ site.baseurl }}">{{ site.name }}</a>
 
     <nav class="site-nav">
       <a href="#" class="menu-icon">
@@ -17,11 +17,12 @@
         </svg>
       </a>
       <div class="trigger">
-        <a class="page-link" href="/about">About</a>
-        <a class="page-link" href="/projects">Projects</a>
+        {% for page in site.pages %}
+          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+        {% endfor %}
       </div>
     </nav>
 
   </div>
 
-</header>
+</header>