jekyll 1.0.2 → 1.0.3

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

@@ -5,12 +5,9 @@ module Jekyll
         def initialize(config)
           require 'maruku'
           @config = config
-          if @config['maruku']['use_divs']
-            load_divs_library
-          end
-          if @config['maruku']['use_tex']
-            load_blahtext_library
-          end
+          @errors = []
+          load_divs_library if @config['maruku']['use_divs']
+          load_blahtext_library if @config['maruku']['use_tex']
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install maruku'
@@ -38,8 +35,15 @@ module Jekyll
           MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
         end
 
+        def print_errors_and_fail
+          print @errors.join
+          raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup."
+        end
+
         def convert(content)
-          Maruku.new(content).to_html
+          converted = Maruku.new(content, :error_stream => @errors).to_html
+          print_errors_and_fail unless @errors.empty?
+          converted
         end
       end
     end

data/lib/jekyll/convertible.rb

@@ -35,7 +35,7 @@ module Jekyll
           self.data = YAML.safe_load($1)
         end
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"        
+        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
       rescue Exception => e
         puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
@@ -76,11 +76,8 @@ module Jekyll
     def render_liquid(content, payload, info)
       Liquid::Template.parse(content).render!(payload, info)
     rescue Exception => e
-      Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
-      e.backtrace.each do |backtrace|
-        puts backtrace
-      end
-      abort("Build Failed")
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
+      raise e
     end
 
     # Recursively render layouts
@@ -99,7 +96,7 @@ module Jekyll
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
         self.output = self.render_liquid(layout.content,
-                                         payload.merge({:file => self.data["layout"]}),
+                                         payload.merge({:file => layout.name}),
                                          info)
 
         if layout = layouts[layout.data["layout"]]

data/lib/jekyll/deprecator.rb

@@ -18,14 +18,14 @@ module Jekyll
 
     def self.no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
-        Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
+        Jekyll.logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
                             switches. Run `jekyll help' to find out more."
       end
     end
 
     def self.deprecation_message(args, deprecated_argument, message)
       if args.include?(deprecated_argument)
-        Jekyll::Logger.error "Deprecation:", message
+        Jekyll.logger.error "Deprecation:", message
       end
     end
   end

data/lib/jekyll/filters.rb

@@ -99,7 +99,17 @@ module Jekyll
     def cgi_escape(input)
       CGI::escape(input)
     end
-
+    
+    # URI escape a string.
+    #
+    # input - The String to escape.
+    #
+    # Examples
+    #
+    #   uri_escape('foo, bar \\baz?')
+    #   # => "foo,%20bar%20%5Cbaz?"
+    #
+    # Returns the escaped String.
     def uri_escape(input)
       URI.escape(input)
     end
@@ -146,7 +156,7 @@ module Jekyll
       when String
         Time.parse(input)
       else
-        Jekyll::Logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
+        Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
         exit(1)
       end
     end

data/lib/jekyll/generators/pagination.rb

@@ -92,8 +92,9 @@ module Jekyll
     # Returns the pagination path as a string
     def self.paginate_path(site_config, num_page)
       return nil if num_page.nil? || num_page <= 1
-      format = File.basename(site_config['paginate_path'])
-      format.sub(':num', num_page.to_s)
+      format = site_config['paginate_path']
+      format = format.sub(':num', num_page.to_s)
+      File.basename(format)
     end
 
     # Initialize a new Pager.

data/lib/jekyll/layout.rb

@@ -5,6 +5,9 @@ module Jekyll
     # Gets the Site object.
     attr_reader :site
 
+    # Gets the name of this layout.
+    attr_reader :name
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 

data/lib/jekyll/post.rb

@@ -244,29 +244,7 @@ module Jekyll
     #
     # Returns an Array of related Posts.
     def related_posts(posts)
-      return [] unless posts.size > 1
-
-      if self.site.lsi
-        build_index
-
-        related = self.class.lsi.find_related(self.content, 11)
-        related - [self]
-      else
-        (posts - [self])[0..9]
-      end
-    end
-
-    def build_index
-      self.class.lsi ||= begin
-        puts "Starting the classifier..."
-        lsi = Classifier::LSI.new(:auto_rebuild => false)
-        $stdout.print("  Populating LSI... "); $stdout.flush
-        self.site.posts.each { |x| $stdout.print("."); $stdout.flush; lsi.add_item(x) }
-        $stdout.print("\n  Rebuilding LSI index... ")
-        lsi.build_index
-        puts ""
-        lsi
-      end
+      Jekyll::RelatedPosts.new(self).build
     end
 
     # Add any necessary layouts to this post.

data/lib/jekyll/related_posts.rb

@@ -0,0 +1,58 @@
+module Jekyll
+  class RelatedPosts
+
+    class << self
+      attr_accessor :lsi
+    end
+
+    attr_reader :post, :site
+
+    def initialize(post)
+      @post = post
+      @site = post.site
+      require 'classifier' if site.lsi
+    end
+
+    def build
+      return [] unless self.site.posts.size > 1
+
+      if self.site.lsi
+        build_index
+        lsi_related_posts
+      else
+        most_recent_posts
+      end
+    end
+
+
+    def build_index
+      self.class.lsi ||= begin
+        lsi = Classifier::LSI.new(:auto_rebuild => false)
+        display("Populating LSI...")
+
+        self.site.posts.each do |x|
+          lsi.add_item(x)
+        end
+
+        display("Rebuilding index...")
+        lsi.build_index
+        display("")
+        lsi
+      end
+    end
+
+    def lsi_related_posts
+      self.class.lsi.find_related(post.content, 11) - [self.post]
+    end
+
+    def most_recent_posts
+      (self.site.posts - [self.post])[0..9]
+    end
+
+    def display(output)
+      $stdout.print("\n")
+      $stdout.print(Jekyll.logger.formatted_topic(output))
+      $stdout.flush
+    end
+  end
+end

data/lib/jekyll/site.rb

@@ -71,8 +71,6 @@ module Jekyll
     #
     # Returns nothing.
     def setup
-      require 'classifier' if self.lsi
-
       # Check that the destination dir isn't the source dir or a directory
       # parent to the source dir.
       if self.source =~ /^#{self.dest}/
@@ -423,12 +421,12 @@ module Jekyll
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && !@deprecated_relative_permalinks
         $stderr.puts # Places newline after "Generating..."
-        Jekyll::Logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
+        Jekyll.logger.warn "Deprecation:", "Starting in 1.1, 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."
+        $stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
         @deprecated_relative_permalinks = true
       end
     end

data/lib/jekyll/{logger.rb → stevenson.rb}

@@ -1,15 +1,29 @@
-require 'logger'
-
 module Jekyll
-  class Logger < Logger
+  class Stevenson
+    attr_accessor :log_level
+
+    DEBUG  = 0
+    INFO   = 1
+    WARN   = 2
+    ERROR = 3
+
+    # Public: Create a new instance of Stevenson, Jekyll's logger
+    #
+    # level - (optional, integer) the log level
+    #
+    # Returns nothing
+    def initialize(level = INFO)
+      @log_level = level
+    end
+
     # Public: Print a jekyll message to stdout
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
     #
     # Returns nothing
-    def self.info(topic, message)
-      $stdout.puts message(topic, message)
+    def info(topic, message)
+      $stdout.puts(message(topic, message)) if log_level <= INFO
     end
 
     # Public: Print a jekyll message to stderr
@@ -18,8 +32,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def self.warn(topic, message)
-      $stderr.puts message(topic, message).yellow
+    def warn(topic, message)
+      $stderr.puts(message(topic, message).yellow) if log_level <= WARN
     end
 
     # Public: Print a jekyll error message to stderr
@@ -28,8 +42,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def self.error(topic, message)
-      $stderr.puts message(topic, message).red
+    def error(topic, message)
+      $stderr.puts(message(topic, message).red) if log_level <= ERROR
     end
 
     # Public: Build a Jekyll topic method
@@ -38,8 +52,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns the formatted message
-    def self.message(topic, message)
-       formatted_topic(topic) + message.gsub(/\s+/, ' ')
+    def message(topic, message)
+      formatted_topic(topic) + message.gsub(/\s+/, ' ')
     end
 
     # Public: Format the topic
@@ -47,7 +61,7 @@ module Jekyll
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     #
     # Returns the formatted topic statement
-    def self.formatted_topic(topic)
+    def formatted_topic(topic)
       "#{topic} ".rjust(20)
     end
   end

data/lib/jekyll/tags/gist.rb

@@ -6,9 +6,10 @@
 
 module Jekyll
   class GistTag < Liquid::Tag
+
     def render(context)
-      if tag_contents = @markup.strip.match(/\A(\d+) ?(\S*)\Z/)
-        gist_id, filename = tag_contents[1].strip, tag_contents[2].strip
+      if tag_contents = determine_arguments(@markup.strip)
+        gist_id, filename = tag_contents[0], tag_contents[1]
         gist_script_tag(gist_id, filename)
       else
         "Error parsing gist id"
@@ -17,7 +18,16 @@ module Jekyll
 
     private
 
-    def gist_script_tag(gist_id, filename=nil)
+    def determine_arguments(input)
+      matched = if input.include?("/")
+        input.match(/\A([a-zA-Z0-9\/\-_]+) ?(\S*)\Z/)
+      else
+        input.match(/\A(\d+) ?(\S*)\Z/)
+      end
+      [matched[1].strip, matched[2].strip] if matched && matched.length >= 3
+    end
+
+    def gist_script_tag(gist_id, filename = nil)
       if filename.empty?
         "<script src=\"https://gist.github.com/#{gist_id}.js\"> </script>"
       else

data/lib/site_template/_layouts/default.html

@@ -21,7 +21,7 @@
               <h1 class="title"><a href="/">{{ site.name }}</a></h1>
               <a class="extra" href="/">home</a>
             </div>
-     
+
                 {{ content }}
 
             <div class="footer">

data/lib/site_template/_layouts/post.html

@@ -4,6 +4,6 @@ layout: default
 <h2>{{ page.title }}</h2>
 <p class="meta">{{ page.date | date_to_string }}</p>
 
-<div id="post">
+<div class="post">
 {{ content }}
 </div>

data/lib/site_template/css/main.css

@@ -133,33 +133,33 @@ ul.posts span {
 /*****************************************************************************/
 
 /* standard */
-#post pre {
+.post pre {
   border: 1px solid #ddd;
   background-color: #eef;
   padding: 0 .4em;
 }
 
-#post ul, #post ol {
+.post ul, .post ol {
   margin-left: 1.35em;
 }
 
-#post code {
+.post code {
   border: 1px solid #ddd;
   background-color: #eef;
   padding: 0 .2em;
 }
 
-#post pre code {
+.post pre code {
   border: none;
 }
 
 /* terminal */
-#post pre.terminal {
+.post pre.terminal {
   border: 1px solid #000;
   background-color: #333;
   color: #FFF;
 }
 
-#post pre.terminal code {
+.post pre.terminal code {
   background-color: #333;
-}
+}

data/site/_includes/docs_contents.html

@@ -80,6 +80,9 @@
       <li class="{% if page.title == "Upgrading" %}current{% endif %}">
         <a href="{{ site.url }}/docs/upgrading">Upgrading</a>
       </li>
+      <li class="{% if page.title == "History" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/history">History</a>
+      </li>
     </ul>
   </aside>
 </div>

data/site/css/pygments.css

@@ -18,7 +18,7 @@
 .highlight .gr { color: #c0c0c0; font-weight: bold; background-color: #c00000 } /* Generic.Error */
 .highlight .gh { color: #cd5c5c} /* Generic.Heading */
 .highlight .gi { color: #ffffff; background-color: #0000c0 } /* Generic.Inserted */
-.highlight .go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output */
+.highlight span.go { color: #add8e6; font-weight: bold; background-color: #4d4d4d } /* Generic.Output, qualified with span to prevent applying this style to the Go language, see #1153. */
 .highlight .gp { color: #ffffff} /* Generic.Prompt */
 .highlight .gs { color: #ffffff} /* Generic.Strong */
 .highlight .gu { color: #cd5c5c} /* Generic.Subheading */

data/site/css/style.css

@@ -519,7 +519,7 @@ pre, code {
   }
 }
 
-.highlight, p > pre, p > code, p > nobr > code, li > code {
+.highlight, p > pre, p > code, p > nobr > code, li > code, h5 > code, .note > code {
   background: #333;
   color: #fff;
   border-radius: 5px;
@@ -528,10 +528,17 @@ pre, code {
     0 -1px 0 rgba(0,0,0,.5);
 }
 
+.note code {
+  background-color: rgba(0,0,0,0.2);
+  margin-left: 2.5px;
+  margin-right: 2.5px;
+  font-size: 0.8em;
+}
+
 .highlight {
   padding: 10px 0;
   width: 100%;
-  overflow: scroll;
+  overflow: auto;
 }
 
 /* HTML Elements */