jekyll 1.1.2 → 1.2.0

data/lib/jekyll/site.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Jekyll
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
@@ -15,20 +13,14 @@ module Jekyll
     def initialize(config)
       self.config          = config.clone
 
-      self.safe            = config['safe']
+      %w[safe lsi pygments baseurl exclude include future show_drafts limit_posts keep_files].each do |opt|
+        self.send("#{opt}=", config[opt])
+      end
+
       self.source          = File.expand_path(config['source'])
       self.dest            = File.expand_path(config['destination'])
       self.plugins         = plugins_path
-      self.lsi             = config['lsi']
-      self.pygments        = config['pygments']
-      self.baseurl         = config['baseurl']
       self.permalink_style = config['permalink'].to_sym
-      self.exclude         = config['exclude']
-      self.include         = config['include']
-      self.future          = config['future']
-      self.show_drafts     = config['show_drafts']
-      self.limit_posts     = config['limit_posts']
-      self.keep_files      = config['keep_files']
 
       self.reset
       self.setup
@@ -228,43 +220,7 @@ module Jekyll
     #
     # Returns nothing.
     def cleanup
-      # all files and directories in destination, including hidden ones
-      dest_files = Set.new
-      Dir.glob(File.join(self.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
-        if self.keep_files.length > 0
-          dest_files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex
-        else
-          dest_files << file unless file =~ /\/\.{1,2}$/
-        end
-      end
-
-      # files to be written
-      files = Set.new
-      each_site_file { |item| files << item.destination(self.dest) }
-
-      # adding files' parent directories
-      dirs = Set.new
-      files.each { |file| dirs << File.dirname(file) }
-      files.merge(dirs)
-
-      # files that are replaced by dirs should be deleted
-      files_to_delete = Set.new
-      dirs.each { |dir| files_to_delete << dir if File.file?(dir) }
-
-      obsolete_files = dest_files - files + files_to_delete
-      FileUtils.rm_rf(obsolete_files.to_a)
-    end
-
-    # Private: creates a regular expression from the keep_files array
-    #
-    # Examples
-    #   ['.git','.svn'] creates the following regex: /\/(\.git|\/.svn)/
-    #
-    # Returns the regular expression
-    def keep_file_regex
-      or_list = self.keep_files.join("|")
-      pattern = "\/(#{or_list.gsub(".", "\.")})"
-      Regexp.new pattern
+      site_cleaner.cleanup!
     end
 
     # Write static files, pages, and posts.
@@ -310,7 +266,8 @@ module Jekyll
     #   "tags"       - The Hash of tag values and Posts.
     #                  See Site#post_attr_hash for type info.
     def site_payload
-      {"site" => self.config.merge({
+      {"jekyll" => { "version" => Jekyll::VERSION },
+       "site" => self.config.merge({
           "time"       => self.time,
           "posts"      => self.posts.sort { |a, b| b <=> a },
           "pages"      => self.pages,
@@ -422,5 +379,9 @@ module Jekyll
       limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
       self.posts = self.posts[-limit, limit]
     end
+
+    def site_cleaner
+      @site_cleaner ||= Cleaner.new(self)
+    end
   end
 end

data/lib/jekyll/stevenson.rb

@@ -74,7 +74,7 @@ module Jekyll
     #
     # Returns the formatted message
     def message(topic, message)
-      formatted_topic(topic) + message.gsub(/\s+/, ' ')
+      formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
     end
 
     # Public: Format the topic

data/lib/jekyll/tags/include.rb

@@ -51,6 +51,20 @@ eos
       def render(context)
         includes_dir = File.join(context.registers[:site].source, '_includes')
 
+        if error = validate_file(includes_dir)
+          return error
+        end
+
+        source = File.read(File.join(includes_dir, @file))
+        partial = Liquid::Template.parse(source)
+
+        context.stack do
+          context['include'] = parse_params(context) if @params
+          partial.render(context)
+        end
+      end
+
+      def validate_file(includes_dir)
         if File.symlink?(includes_dir)
           return "Includes directory '#{includes_dir}' cannot be a symlink"
         end
@@ -59,19 +73,11 @@ eos
           return "Include file '#{@file}' contains invalid characters or sequences"
         end
 
-        Dir.chdir(includes_dir) do
-          choices = Dir['**/*'].reject { |x| File.symlink?(x) }
-          if choices.include?(@file)
-            source = File.read(@file)
-            partial = Liquid::Template.parse(source)
-
-            context.stack do
-              context['include'] = parse_params(context) if @params
-              partial.render(context)
-            end
-          else
-            "Included file '#{@file}' not found in _includes directory"
-          end
+        file = File.join(includes_dir, @file)
+        if !File.exists?(file)
+          return "Included file #{@file} not found in _includes directory"
+        elsif File.symlink?(file)
+          return "The included file '_includes/#{@file}' should not be a symlink"
         end
       end
     end

data/lib/jekyll/url.rb

@@ -0,0 +1,67 @@
+# Public: Methods that generate a URL for a resource such as a Post or a Page.
+#
+# Examples
+#
+#   URL.new({
+#     :template => /:categories/:title.html",
+#     :placeholders => {:categories => "ruby", :title => "something"}
+#   }).to_s
+#
+module Jekyll
+  class URL
+
+    # options - One of :permalink or :template must be supplied.
+    #           :template     - The String used as template for URL generation,
+    #                           for example "/:path/:basename:output_ext", where
+    #                           a placeholder is prefixed with a colon.
+    #           :placeholders - A hash containing the placeholders which will be
+    #                           replaced when used inside the template. E.g.
+    #                           { "year" => Time.now.strftime("%Y") } would replace
+    #                           the placeholder ":year" with the current year.
+    #           :permalink    - If supplied, no URL will be generated from the
+    #                           template. Instead, the given permalink will be
+    #                           used as URL.
+    def initialize(options)
+      @template = options[:template]
+      @placeholders = options[:placeholders] || {}
+      @permalink = options[:permalink]
+
+      if (@template || @permalink).nil?
+        raise ArgumentError, "One of :template or :permalink must be supplied."
+      end
+    end
+
+    # The generated relative URL of the resource
+    #
+    # Returns the String URL
+    def to_s
+      sanitize_url(@permalink || generate_url)
+    end
+
+    # Internal: Generate the URL by replacing all placeholders with their
+    # respective values
+    #
+    # Returns the _unsanitizied_ String URL
+    def generate_url
+      @placeholders.inject(@template) do |result, token|
+        result.gsub(/:#{token.first}/, token.last)
+      end
+    end
+
+    # Returns a sanitized String URL
+    def sanitize_url(in_url)
+      # Remove all double slashes
+      url = in_url.gsub(/\/\//, "/")
+
+      # Remove every URL segment that consists solely of dots
+      url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+
+      # Append a trailing slash to the URL if the unsanitized URL had one
+      url += "/" if in_url =~ /\/$/
+
+      # Always add a leading slash
+      url.gsub!(/\A([^\/])/, '/\1')
+      url
+    end
+  end
+end

data/lib/site_template/_layouts/default.html

@@ -15,32 +15,30 @@
     </head>
     <body>
 
-        <div class="container">
-          <div class="site">
-            <div class="header">
-              <h1 class="title"><a href="/">{{ site.name }}</a></h1>
-              <a class="extra" href="/">home</a>
-            </div>
+        <div class="site">
+          <div class="header">
+            <h1 class="title"><a href="/">{{ site.name }}</a></h1>
+            <a class="extra" href="/">home</a>
+          </div>
 
-                {{ content }}
+          {{ content }}
 
-            <div class="footer">
-              <div class="contact">
-                <p>
-                  Your Name<br />
-                  What You Are<br />
-                  your@email.com
-                </p>
-              </div>
-              <div class="contact">
-                <p>
-                  <a href="http://github.com/yourusername/">github.com/yourusername</a><br />
-                  <a href="http://twitter.com/yourusername/">twitter.com/yourusername</a><br />
-                </p>
-              </div>
+          <div class="footer">
+            <div class="contact">
+              <p>
+                Your Name<br />
+                What You Are<br />
+                you@example.com
+              </p>
+            </div>
+            <div class="contact">
+              <p>
+                <a href="https://github.com/yourusername">github.com/yourusername</a><br />
+                <a href="https://twitter.com/yourusername">twitter.com/yourusername</a><br />
+              </p>
             </div>
           </div>
-        </div> <!-- /container -->
+        </div>
 
     </body>
 </html>

data/site/_config.yml

@@ -1,4 +1,6 @@
 pygments: true
 relative_permalinks: false
 gauges_id: 503c5af6613f5d0f19000027
-permalink: /news/:year/:month/:day/:title
+permalink: /news/:year/:month/:day/:title/
+excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
+repository: https://github.com/mojombo/jekyll

data/site/_includes/docs_contents.html

@@ -2,95 +2,95 @@
   <aside>
     <h4>Getting Started</h4>
     <ul>
-      <li class="{% if page.title == "Welcome" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/home">Welcome</a>
+      <li class="{% if page.title == 'Welcome' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/home/">Welcome</a>
       </li>
-      <li class="{% if page.title == "Quick-start guide" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/quickstart">Quick-start guide</a>
+      <li class="{% if page.title == 'Quick-start guide' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/quickstart/">Quick-start guide</a>
       </li>
-      <li class="{% if page.title == "Installation" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/installation">Installation</a>
+      <li class="{% if page.title == 'Installation' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/installation/">Installation</a>
       </li>
-      <li class="{% if page.title == "Basic Usage" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/usage">Basic Usage</a>
+      <li class="{% if page.title == 'Basic Usage' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/usage/">Basic Usage</a>
       </li>
-      <li class="{% if page.title == "Directory structure" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/structure">Directory structure</a>
+      <li class="{% if page.title == 'Directory structure' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/structure/">Directory structure</a>
       </li>
-      <li class="{% if page.title == "Configuration" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/configuration">Configuration</a>
+      <li class="{% if page.title == 'Configuration' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/configuration/">Configuration</a>
       </li>
     </ul>
     <h4>Your Content</h4>
     <ul>
-      <li class="{% if page.title == "Front-matter" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/frontmatter">Front-matter</a>
+      <li class="{% if page.title == 'Front-matter' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/frontmatter/">Front-matter</a>
       </li>
-      <li class="{% if page.title == "Writing posts" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/posts">Writing posts</a>
+      <li class="{% if page.title == 'Writing posts' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/posts/">Writing posts</a>
       </li>
-      <li class="{% if page.title == "Working with drafts" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/drafts">Working with drafts</a>
+      <li class="{% if page.title == 'Working with drafts' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/drafts/">Working with drafts</a>
       </li>
-      <li class="{% if page.title == "Creating pages" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pages">Creating pages</a>
+      <li class="{% if page.title == 'Creating pages' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/pages/">Creating pages</a>
       </li>
-      <li class="{% if page.title == "Variables" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/variables">Variables</a>
+      <li class="{% if page.title == 'Variables' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/variables/">Variables</a>
       </li>
-      <li class="{% if page.title == "Blog migrations" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/migrations">Blog migrations</a>
+      <li class="{% if page.title == 'Blog migrations' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/migrations/">Blog migrations</a>
       </li>
     </ul>
     <h4>Customization</h4>
     <ul>
-      <li class="{% if page.title == "Templates" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/templates">Templates</a>
+      <li class="{% if page.title == 'Templates' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/templates/">Templates</a>
       </li>
-      <li class="{% if page.title == "Permalinks" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/permalinks">Permalinks</a>
+      <li class="{% if page.title == 'Permalinks' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/permalinks/">Permalinks</a>
       </li>
-      <li class="{% if page.title == "Pagination" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/pagination">Pagination</a>
+      <li class="{% if page.title == 'Pagination' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/pagination/">Pagination</a>
       </li>
-      <li class="{% if page.title == "Plugins" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/plugins">Plugins</a>
+      <li class="{% if page.title == 'Plugins' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/plugins/">Plugins</a>
       </li>
-      <li class="{% if page.title == "Extras" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/extras">Extras</a>
+      <li class="{% if page.title == 'Extras' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/extras/">Extras</a>
       </li>
     </ul>
     <h4>Deployment</h4>
     <ul>
-      <li class="{% if page.title == "GitHub Pages" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/github-pages">GitHub Pages</a>
+      <li class="{% if page.title == 'GitHub Pages' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/github-pages/">GitHub Pages</a>
       </li>
-      <li class="{% if page.title == "Deployment methods" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/deployment-methods">Other methods</a>
+      <li class="{% if page.title == 'Deployment methods' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/deployment-methods/">Other methods</a>
       </li>
     </ul>
     <h4>Miscellaneous</h4>
     <ul>
-      <li class="{% if page.title == "Troubleshooting" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/troubleshooting">Troubleshooting</a>
+      <li class="{% if page.title == 'Troubleshooting' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/troubleshooting/">Troubleshooting</a>
       </li>
-      <li class="{% if page.title == "Sites using Jekyll" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/sites">Sites using Jekyll</a>
+      <li class="{% if page.title == 'Sites using Jekyll' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/sites/">Sites using Jekyll</a>
       </li>
-      <li class="{% if page.title == "Resources" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/resources">Resources</a>
+      <li class="{% if page.title == 'Resources' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/resources/">Resources</a>
       </li>
-      <li class="{% if page.title == "Upgrading" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/upgrading">Upgrading</a>
+      <li class="{% if page.title == 'Upgrading' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/upgrading/">Upgrading</a>
       </li>
     </ul>
     <h4>Meta</h4>
     <ul>
-      <li class="{% if page.title == "Contributing" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/contributing">Contributing</a>
+      <li class="{% if page.title == 'Contributing' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/contributing/">Contributing</a>
       </li>
-      <li class="{% if page.title == "History" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/history">History</a>
+      <li class="{% if page.title == 'History' %}current{% endif %}">
+        <a href="{{ site.url }}/docs/history/">History</a>
       </li>
     </ul>
   </aside>

data/site/_includes/docs_contents_mobile.html

@@ -2,41 +2,41 @@
   <select onchange="if (this.value) window.location.href=this.value">
     <option value="">Navigate the docs…</option>
     <optgroup label="Getting started">
-      <option value="{{ site.url }}/docs/home">Welcome</option>
-      <option value="{{ site.url }}/docs/quickstart">Quick-start guide</option>
-      <option value="{{ site.url }}/docs/installation">Installation</option>
-      <option value="{{ site.url }}/docs/usage">Basic Usage</option>
-      <option value="{{ site.url }}/docs/structure">Directory structure</option>
-      <option value="{{ site.url }}/docs/configuration">Configuration</option>
+      <option value="{{ site.url }}/docs/home/">Welcome</option>
+      <option value="{{ site.url }}/docs/quickstart/">Quick-start guide</option>
+      <option value="{{ site.url }}/docs/installation/">Installation</option>
+      <option value="{{ site.url }}/docs/usage/">Basic Usage</option>
+      <option value="{{ site.url }}/docs/structure/">Directory structure</option>
+      <option value="{{ site.url }}/docs/configuration/">Configuration</option>
     </optgroup>
     <optgroup label="Your Content">
-      <option value="{{ site.url }}/docs/frontmatter">Front-matter</option>
-      <option value="{{ site.url }}/docs/posts">Writing posts</option>
-      <option value="{{ site.url }}/docs/drafts">Working with drafts</option>
-      <option value="{{ site.url }}/docs/pages">Creating pages</option>
-      <option value="{{ site.url }}/docs/variables">Variables</option>
-      <option value="{{ site.url }}/docs/migrations">Blog migrations</option>
+      <option value="{{ site.url }}/docs/frontmatter/">Front-matter</option>
+      <option value="{{ site.url }}/docs/posts/">Writing posts</option>
+      <option value="{{ site.url }}/docs/drafts/">Working with drafts</option>
+      <option value="{{ site.url }}/docs/pages/">Creating pages</option>
+      <option value="{{ site.url }}/docs/variables/">Variables</option>
+      <option value="{{ site.url }}/docs/migrations/">Blog migrations</option>
     </optgroup>
     <optgroup label="Customization">
-      <option value="{{ site.url }}/docs/templates">Templates</option>
-      <option value="{{ site.url }}/docs/permalinks">Permalinks</option>
-      <option value="{{ site.url }}/docs/pagination">Pagination</option>
-      <option value="{{ site.url }}/docs/plugins">Plugins</option>
-      <option value="{{ site.url }}/docs/extras">Extras</option>
+      <option value="{{ site.url }}/docs/templates/">Templates</option>
+      <option value="{{ site.url }}/docs/permalinks/">Permalinks</option>
+      <option value="{{ site.url }}/docs/pagination/">Pagination</option>
+      <option value="{{ site.url }}/docs/plugins/">Plugins</option>
+      <option value="{{ site.url }}/docs/extras/">Extras</option>
     </optgroup>
     <optgroup label="Deployment">
-      <option value="{{ site.url }}/docs/github-pages">GitHub Pages</option>
-      <option value="{{ site.url }}/docs/deployment-methods">Other methods</option>
+      <option value="{{ site.url }}/docs/github-pages/">GitHub Pages</option>
+      <option value="{{ site.url }}/docs/deployment-methods/">Other methods</option>
     </optgroup>
     <optgroup label="Miscellaneous">
-      <option value="{{ site.url }}/docs/troubleshooting">Troubleshooting</option>
-      <option value="{{ site.url }}/docs/sites">Sites using Jekyll</option>
-      <option value="{{ site.url }}/docs/resources">Resources</option>
-      <option value="{{ site.url }}/docs/upgrading">Upgrading</option>
+      <option value="{{ site.url }}/docs/troubleshooting/">Troubleshooting</option>
+      <option value="{{ site.url }}/docs/sites/">Sites using Jekyll</option>
+      <option value="{{ site.url }}/docs/resources/">Resources</option>
+      <option value="{{ site.url }}/docs/upgrading/">Upgrading</option>
     </optgroup>
     <optgroup label="Meta">
-      <option value="{{ site.url }}/docs/contributing">Contributing</option>
-      <option value="{{ site.url }}/docs/history">History</option>
+      <option value="{{ site.url }}/docs/contributing/">Contributing</option>
+      <option value="{{ site.url }}/docs/history/">History</option>
     </optgroup>
   </select>
 </div>