jekyll 3.0.0.pre.beta10 → 3.0.0.pre.rc1

data/lib/jekyll/tags/post_url.rb

@@ -14,7 +14,7 @@ module Jekyll
       end
 
       def ==(other)
-        other.name.match(@name_regex)
+        other.basename.match(@name_regex)
       end
 
       def deprecated_equality(other)
@@ -32,11 +32,11 @@ module Jekyll
       #
       # Returns the post slug with the subdirectory (relative to _posts)
       def post_slug(other)
-        path = other.name.split("/")[0...-1].join("/")
+        path = other.basename.split("/")[0...-1].join("/")
         if path.nil? || path == ""
-          other.slug
+          other.data['slug']
         else
-          path + '/' + other.slug
+          path + '/' + other.data['slug']
         end
       end
     end

data/lib/jekyll/utils.rb

@@ -8,6 +8,13 @@ module Jekyll
     SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
+    # Non-destructive version of deep_merge_hashes! See that method.
+    #
+    # Returns the merged hashes.
+    def deep_merge_hashes(master_hash, other_hash)
+      deep_merge_hashes!(master_hash.dup, other_hash)
+    end
+
     # Merges a master hash with another hash, recursively.
     #
     # master_hash - the "parent" hash whose values will be overridden
@@ -17,16 +24,14 @@ module Jekyll
     # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
     #
     # Thanks to whoever made it.
-    def deep_merge_hashes(master_hash, other_hash)
-      target = master_hash.dup
-
-      other_hash.each_key do |key|
-        if other_hash[key].is_a? Hash and target[key].is_a? Hash
-          target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
+    def deep_merge_hashes!(target, overwrite)
+      overwrite.each_key do |key|
+        if overwrite[key].is_a? Hash and target[key].is_a? Hash
+          target[key] = Utils.deep_merge_hashes(target[key], overwrite[key])
           next
         end
 
-        target[key] = other_hash[key]
+        target[key] = overwrite[key]
       end
 
       target

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0.pre.beta10'
+  VERSION = '3.0.0.pre.rc1'
 end

data/lib/site_template/_includes/footer.html

@@ -16,30 +16,13 @@
         <ul class="social-media-list">
           {% if site.github_username %}
           <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon icon--github">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 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">{{ site.github_username }}</span>
-            </a>
+            {% include icon-github.html username=site.github_username %}
           </li>
           {% endif %}
 
           {% if site.twitter_username %}
           <li>
-            <a href="https://twitter.com/{{ site.twitter_username }}">
-              <span class="icon icon--twitter">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
-                  c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 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">{{ site.twitter_username }}</span>
-            </a>
+            {% include icon-twitter.html username=site.twitter_username %}
           </li>
           {% endif %}
         </ul>

data/lib/site_template/_includes/icon-github.html

@@ -0,0 +1 @@
+<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>

data/lib/site_template/_includes/icon-github.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 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>

data/lib/site_template/_includes/icon-twitter.html

@@ -0,0 +1 @@
+<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>

data/lib/site_template/_includes/icon-twitter.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16"><path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 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>

data/lib/site_template/_sass/_layout.scss

@@ -12,6 +12,7 @@
 
 .site-title {
     font-size: 26px;
+    font-weight: 300;
     line-height: 56px;
     letter-spacing: -1px;
     margin-bottom: 0;

data/lib/site_template/_sass/_syntax-highlighting.scss

@@ -5,6 +5,10 @@
     background: #fff;
     @extend %vertical-rhythm;
 
+    .highlighter-rouge & {
+      background: #eef;
+    }
+
     .c     { color: #998; font-style: italic } // Comment
     .err   { color: #a61717; background-color: #e3d2d2 } // Error
     .k     { font-weight: bold } // Keyword

data/lib/site_template/about.md

@@ -6,6 +6,10 @@ permalink: /about/
 
 This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
 
-You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
+You can find the source code for the Jekyll new theme at:
+{% include icon-github.html username="jglovier" %} /
+[jekyll-new](https://github.com/jglovier/jekyll-new)
 
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
+You can find the source code for Jekyll at
+{% include icon-github.html username="jekyll" %} /
+[jekyll](https://github.com/jekyll/jekyll)

data/lib/site_template/css/main.scss

@@ -8,7 +8,7 @@
 // Our variables
 $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $base-font-size:   16px;
-$base-font-weight: 300;
+$base-font-weight: 400;
 $small-font-size:  $base-font-size * 0.875;
 $base-line-height: 1.5;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta10
+  version: 3.0.0.pre.rc1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -154,7 +154,6 @@ files:
 - lib/jekyll/convertible.rb
 - lib/jekyll/deprecator.rb
 - lib/jekyll/document.rb
-- lib/jekyll/draft.rb
 - lib/jekyll/entry_filter.rb
 - lib/jekyll/errors.rb
 - lib/jekyll/excerpt.rb
@@ -173,12 +172,10 @@ files:
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
 - lib/jekyll/plugin_manager.rb
-- lib/jekyll/post.rb
 - lib/jekyll/publisher.rb
 - lib/jekyll/reader.rb
 - lib/jekyll/readers/collection_reader.rb
 - lib/jekyll/readers/data_reader.rb
-- lib/jekyll/readers/draft_reader.rb
 - lib/jekyll/readers/layout_reader.rb
 - lib/jekyll/readers/page_reader.rb
 - lib/jekyll/readers/post_reader.rb
@@ -201,6 +198,10 @@ files:
 - lib/site_template/_includes/footer.html
 - lib/site_template/_includes/head.html
 - lib/site_template/_includes/header.html
+- lib/site_template/_includes/icon-github.html
+- lib/site_template/_includes/icon-github.svg
+- lib/site_template/_includes/icon-twitter.html
+- lib/site_template/_includes/icon-twitter.svg
 - lib/site_template/_layouts/default.html
 - lib/site_template/_layouts/page.html
 - lib/site_template/_layouts/post.html

data/lib/jekyll/draft.rb

@@ -1,40 +0,0 @@
-module Jekyll
-
-  class Draft < Post
-
-    # Valid post name regex (no date)
-    MATCHER = /^(.*)(\.[^.]+)$/
-
-    # Draft name validator. Draft filenames must be like:
-    # my-awesome-post.textile
-    #
-    # Returns true if valid, false if not.
-    def self.valid?(name)
-      name =~ MATCHER
-    end
-
-    # Get the full path to the directory containing the draft files
-    def containing_dir(dir)
-      site.in_source_dir(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.
-    #
-    # Returns nothing.
-    def process(name)
-      m, slug, ext = *name.match(MATCHER)
-      self.date = File.mtime(File.join(@base, name))
-      self.slug = slug
-      self.ext = ext
-    end
-
-  end
-
-end

data/lib/jekyll/post.rb

@@ -1,334 +0,0 @@
-module Jekyll
-  class Post
-    include Comparable
-    include Convertible
-
-    # Valid post name regex.
-    MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
-
-    EXCERPT_ATTRIBUTES_FOR_LIQUID = %w[
-      title
-      url
-      dir
-      date
-      id
-      categories
-      next
-      previous
-      tags
-      path
-    ]
-
-    # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
-      content
-      excerpt
-      excerpt_separator
-      draft?
-    ]
-
-    # Post name validator. Post filenames must be like:
-    # 2008-11-05-my-awesome-post.textile
-    #
-    # Returns true if valid, false if not.
-    def self.valid?(name)
-      name =~ MATCHER
-    end
-
-    attr_accessor :site
-    attr_accessor :data, :extracted_excerpt, :content, :output, :ext
-    attr_accessor :date, :slug, :tags, :categories
-
-    attr_reader :name
-
-    # Initialize this Post instance.
-    #
-    # site       - The Site.
-    # base       - The String path to the dir containing the post file.
-    # name       - The String filename of the post file.
-    #
-    # Returns the new Post.
-    def initialize(site, source, dir, name)
-      @site = site
-      @dir = dir
-      @base = containing_dir(dir)
-      @name = name
-
-      self.categories = dir.split('/').reject { |x| x.empty? }
-      process(name)
-      read_yaml(@base, name)
-
-      data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(relative_path, type, key)
-      end
-
-      if data.key?('date')
-        self.date = Utils.parse_date(data["date"].to_s, "Post '#{relative_path}' does not have a valid date in the YAML front matter.")
-      end
-
-      populate_categories
-      populate_tags
-
-      Jekyll::Hooks.trigger :post, :post_init, self
-    end
-
-    def published?
-      if data.key?('published') && data['published'] == false
-        false
-      else
-        true
-      end
-    end
-
-    def populate_categories
-      categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
-      self.categories = (
-        Array(categories) + categories_from_data
-      ).map { |c| c.to_s }.flatten.uniq
-    end
-
-    def populate_tags
-      self.tags = Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
-    end
-
-    # Get the full path to the directory containing the post files
-    def containing_dir(dir)
-      site.in_source_dir(dir, '_posts')
-    end
-
-    # Read the YAML frontmatter.
-    #
-    # base - The String path to the dir containing the file.
-    # name - The String filename of the file.
-    #
-    # Returns nothing.
-    def read_yaml(base, name)
-      super(base, name)
-      self.extracted_excerpt = extract_excerpt
-    end
-
-    # The post excerpt. This is either a custom excerpt
-    # set in YAML front matter or the result of extract_excerpt.
-    #
-    # Returns excerpt string.
-    def excerpt
-      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
-      data.fetch('title') { titleized_slug }
-    end
-
-    # Public: the Post excerpt_separator, from the YAML Front-Matter or site default
-    #         excerpt_separator value
-    #
-    # Returns the post excerpt_separator
-    def excerpt_separator
-      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
-    end
-
-    # Turns the post slug into a suitable title
-    def titleized_slug
-      slug.split('-').select {|w| w.capitalize! || w }.join(' ')
-    end
-
-    # Public: the path to the post relative to the site source,
-    #         from the YAML Front-Matter or from a combination of
-    #         the directory it's in, "_posts", and the name of the
-    #         post file
-    #
-    # Returns the path to the file relative to the site source
-    def path
-      data.fetch('path') { relative_path.sub(/\A\//, '') }
-    end
-
-    # The path to the post source file, relative to the site source
-    def relative_path
-      File.join(*[@dir, "_posts", @name].map(&:to_s).reject(&:empty?))
-    end
-
-    # Compares Post objects. First compares the Post date. If the dates are
-    # equal, it compares the Post slugs.
-    #
-    # other - The other Post we are comparing to.
-    #
-    # Returns -1, 0, 1
-    def <=>(other)
-      cmp = self.date <=> other.date
-      if 0 == cmp
-       cmp = self.slug <=> other.slug
-      end
-      return cmp
-    end
-
-    # Extract information from the post filename.
-    #
-    # name - The String filename of the post file.
-    #
-    # Returns nothing.
-    def process(name)
-      m, cats, date, slug, ext = *name.match(MATCHER)
-      self.date = Utils.parse_date(date, "Post '#{relative_path}' does not have a valid date in the filename.")
-      self.slug = slug
-      self.ext = ext
-    end
-
-    # The generated directory into which the post will be placed
-    # upon generation. This is derived from the permalink or, if
-    # permalink is absent, set to the default date
-    # e.g. "/2008/11/05/" if the permalink style is :date, otherwise nothing.
-    #
-    # Returns the String directory.
-    def dir
-      File.dirname(url)
-    end
-
-    # The full path and filename of the post. Defined in the YAML of the post
-    # body (optional).
-    #
-    # Returns the String permalink.
-    def permalink
-      data && data['permalink']
-    end
-
-    def template
-      case site.permalink_style
-      when :pretty
-        "/:categories/:year/:month/:day/:title/"
-      when :none
-        "/:categories/:title.html"
-      when :date
-        "/:categories/:year/:month/:day/:title.html"
-      when :ordinal
-        "/:categories/:year/:y_day/:title.html"
-      else
-        site.permalink_style.to_s
-      end
-    end
-
-    # The generated relative url of this post.
-    #
-    # Returns the String url.
-    def url
-      @url ||= URL.new({
-        :template => template,
-        :placeholders => url_placeholders,
-        :permalink => permalink
-      }).to_s
-    end
-
-    # Returns a hash of URL placeholder names (as symbols) mapping to the
-    # desired placeholder replacements. For details see "url.rb"
-    def url_placeholders
-      {
-        :year        => date.strftime("%Y"),
-        :month       => date.strftime("%m"),
-        :day         => date.strftime("%d"),
-        :hour        => date.strftime("%H"),
-        :minute      => date.strftime("%M"),
-        :second      => date.strftime("%S"),
-        :title       => slug,
-        :i_day       => date.strftime("%-d"),
-        :i_month     => date.strftime("%-m"),
-        :categories  => (categories || []).map { |c| c.to_s.downcase }.uniq.join('/'),
-        :short_month => date.strftime("%b"),
-        :short_year  => date.strftime("%y"),
-        :y_day       => date.strftime("%j"),
-        :output_ext  => output_ext
-      }
-    end
-
-    # The UID for this post (useful in feeds).
-    # e.g. /2008/11/05/my-awesome-post
-    #
-    # Returns the String UID.
-    def id
-      File.join(dir, slug)
-    end
-
-    # Calculate related posts.
-    #
-    # Returns an Array of related Posts.
-    def related_posts(posts)
-      Jekyll::RelatedPosts.new(self).build
-    end
-
-    # Add any necessary layouts to this post.
-    #
-    # layouts      - A Hash of {"name" => "layout"}.
-    # site_payload - The site payload hash.
-    #
-    # Returns nothing.
-    def render(layouts, site_payload)
-      # construct payload
-      payload = Utils.deep_merge_hashes({
-        "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => to_liquid(self.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
-      }, site_payload)
-
-      if generate_excerpt?
-        extracted_excerpt.do_layout(payload, {})
-      end
-
-      do_layout(payload.merge({"page" => to_liquid}), layouts)
-    end
-
-    # Obtain destination path.
-    #
-    # dest - The String path to the destination dir.
-    #
-    # Returns destination file path String.
-    def destination(dest)
-      # The url needs to be unescaped in order to preserve the correct filename
-      path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if self.url.end_with?("/")
-      path << output_ext unless path.end_with?(output_ext)
-      path
-    end
-
-    # Returns the shorthand String identifier of this Post.
-    def inspect
-      "<Post: #{id}>"
-    end
-
-    def next
-      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 = site.posts.index {|post| post.equal?(self) }
-      if pos && pos > 0
-        site.posts[pos - 1]
-      else
-        nil
-      end
-    end
-
-    # Returns if this Post is a Draft
-    def draft?
-      is_a?(Jekyll::Draft)
-    end
-
-    protected
-
-    def extract_excerpt
-      if generate_excerpt?
-        Jekyll::Excerpt.new(self)
-      else
-        ""
-      end
-    end
-
-    def generate_excerpt?
-      !excerpt_separator.empty?
-    end
-  end
-end