jekyll 3.0.0.pre.beta6 → 3.0.0.pre.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451685a00389d54c63e5c8f309de1741500e57ad
-  data.tar.gz: 59f07f3ecf913afa131cc89039240fd9e5cb44f5
+  metadata.gz: db35d240087be44c4ec3b9995db45be24d86729f
+  data.tar.gz: 80b2adb83105584c92a2ac9b26eb395209fb3a50
 SHA512:
-  metadata.gz: 83ab065105a64bfb0c2f276c4d27ac6b8ba616679b8eac02fed08176943d02b2ca0b23149ab926163e229d52f0c36fdf5fd019fae7429a034390e323b5cde2b8
-  data.tar.gz: 1a235a69b2757fa129fe14afca242306512cc210390e11030f0339ca0463e45d1f19f7fe70a82fdbdee7fe6a71c66c50124f3740405c202692c3e498b399f45b
+  metadata.gz: 84435f02d83627163c2abc3eb4e59f97fdcbd2c22e636da93b219cf77834198e7d62dd53859e16508b82e1e5b0b5cdb59cb15055bcc18c0ed7b26f22ffa0aec5
+  data.tar.gz: 25215ce3c27a0fc3fb630ca19356a0d220de31185fe15297041cf5acde25660d34ad5f40858d41b0d595b5c9631a821c8d0450c43d42c6fb3428c372b9315929

data/bin/jekyll

@@ -24,6 +24,7 @@ Mercenary.program(:jekyll) do |p|
   p.option 'safe', '--safe', 'Safe mode (defaults to false)'
   p.option 'plugins', '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
   p.option 'layouts', '--layouts DIR', String, 'Layouts directory (defaults to ./_layouts)'
+  p.option 'profile', '--profile', 'Generate a Liquid rendering profile'
 
   Jekyll::Command.subclasses.each { |c| c.init_with_program(p) }
 

data/lib/jekyll.rb

@@ -66,6 +66,7 @@ module Jekyll
   autoload :Regenerator,         'jekyll/regenerator'
   autoload :RelatedPosts,        'jekyll/related_posts'
   autoload :Renderer,            'jekyll/renderer'
+  autoload :LiquidRenderer,      'jekyll/liquid_renderer'
   autoload :Site,                'jekyll/site'
   autoload :StaticFile,          'jekyll/static_file'
   autoload :Stevenson,           'jekyll/stevenson'

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

@@ -29,7 +29,7 @@ module Jekyll
           include CommonMethods
 
           def code_wrap(code)
-            "<div class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></div>"
+            "<figure class=\"highlight\"><pre>#{CGI::escapeHTML(code)}</pre></figure>"
           end
 
           def block_code(code, lang)

data/lib/jekyll/convertible.rb

@@ -108,8 +108,8 @@ module Jekyll
     # info    - the info for Liquid
     #
     # Returns the converted content
-    def render_liquid(content, payload, info, path = nil)
-      Liquid::Template.parse(content).render!(payload, info)
+    def render_liquid(content, payload, info, path)
+      site.liquid_renderer.file(path).parse(content).render(payload, info)
     rescue Tags::IncludeTagError => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
       raise e
@@ -243,7 +243,7 @@ module Jekyll
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
 
-      self.content = render_liquid(content, payload, info) if render_with_liquid?
+      self.content = render_liquid(content, payload, info, path) if render_with_liquid?
       self.content = transform
 
       # output keeps track of what will finally be written

data/lib/jekyll/frontmatter_defaults.rb

@@ -173,7 +173,7 @@ module Jekyll
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
+        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1')
       end
     end
   end

data/lib/jekyll/liquid_renderer.rb

@@ -0,0 +1,39 @@
+require 'jekyll/liquid_renderer/file'
+require 'jekyll/liquid_renderer/table'
+
+module Jekyll
+  class LiquidRenderer
+    def initialize(site)
+      @site = site
+      reset
+    end
+
+    def reset
+      @stats = {}
+    end
+
+    def file(filename)
+      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+
+      LiquidRenderer::File.new(self, filename).tap do |file|
+        @stats[filename] ||= {}
+        @stats[filename][:count] ||= 0
+        @stats[filename][:count] += 1
+      end
+    end
+
+    def increment_bytes(filename, bytes)
+      @stats[filename][:bytes] ||= 0
+      @stats[filename][:bytes] += bytes
+    end
+
+    def increment_time(filename, time)
+      @stats[filename][:time] ||= 0.0
+      @stats[filename][:time] += time
+    end
+
+    def stats_table(n = 50)
+      LiquidRenderer::Table.new(@stats).to_s(n)
+    end
+  end
+end

data/lib/jekyll/liquid_renderer/file.rb

@@ -0,0 +1,50 @@
+module Jekyll
+  class LiquidRenderer
+    class File
+      def initialize(renderer, filename)
+        @renderer = renderer
+        @filename = filename
+      end
+
+      def parse(content)
+        measure_time do
+          @template = Liquid::Template.parse(content)
+        end
+
+        self
+      end
+
+      def render(*args)
+        measure_time do
+          measure_bytes do
+            @template.render(*args)
+          end
+        end
+      end
+
+      def render!(*args)
+        measure_time do
+          measure_bytes do
+            @template.render!(*args)
+          end
+        end
+      end
+
+      private
+
+      def measure_bytes
+        str = yield
+      ensure
+        @renderer.increment_bytes(@filename, str.bytesize)
+      end
+
+      def measure_time
+        before = Time.now
+        yield
+      ensure
+        after = Time.now
+        @renderer.increment_time(@filename, after - before)
+      end
+    end
+  end
+end

data/lib/jekyll/liquid_renderer/table.rb

@@ -0,0 +1,94 @@
+module Jekyll
+  class LiquidRenderer::Table
+    def initialize(stats)
+      @stats = stats
+    end
+
+    def to_s(n = 50)
+      data = data_for_table(n)
+      widths = table_widths(data)
+      generate_table(data, widths)
+    end
+
+    private
+
+    def generate_table(data, widths)
+      str = "\n"
+
+      table_head = data.shift
+      str << generate_row(table_head, widths)
+      str << generate_table_head_border(table_head, widths)
+
+      data.each do |row_data|
+        str << generate_row(row_data, widths)
+      end
+
+      str << "\n"
+      str
+    end
+
+    def generate_table_head_border(row_data, widths)
+      str = ""
+
+      row_data.each_index do |cell_index|
+        str << '-' * widths[cell_index]
+        str << '-+-' unless cell_index == row_data.length-1
+      end
+
+      str << "\n"
+      str
+    end
+
+    def generate_row(row_data, widths)
+      str = ''
+
+      row_data.each_with_index do |cell_data, cell_index|
+        if cell_index == 0
+          str << cell_data.ljust(widths[cell_index], ' ')
+        else
+          str << cell_data.rjust(widths[cell_index], ' ')
+        end
+
+        str << ' | ' unless cell_index == row_data.length-1
+      end
+
+      str << "\n"
+      str
+    end
+
+    def table_widths(data)
+      widths = []
+
+      data.each do |row|
+        row.each_with_index do |cell, index|
+          widths[index] = [ cell.length, widths[index] ].compact.max
+        end
+      end
+
+      widths
+    end
+
+    def data_for_table(n)
+      sorted = @stats.sort_by{ |filename, file_stats| -file_stats[:time] }
+      sorted = sorted.slice(0, n)
+
+      table = [[ 'Filename', 'Count', 'Bytes', 'Time' ]]
+
+      sorted.each do |filename, file_stats|
+        row = []
+        row << filename
+        row << file_stats[:count].to_s
+        row << format_bytes(file_stats[:bytes])
+        row << "%.3f" % file_stats[:time]
+        table << row
+      end
+
+      table
+    end
+
+    def format_bytes(bytes)
+      bytes /= 1024.0
+      "%.2fK" % bytes
+    end
+  end
+end

data/lib/jekyll/renderer.rb

@@ -49,7 +49,7 @@ module Jekyll
       output = document.content
 
       if document.render_with_liquid?
-        output = render_liquid(output, payload, info)
+        output = render_liquid(output, payload, info, document.path)
       end
 
       output = convert(output)
@@ -92,7 +92,7 @@ module Jekyll
     #
     # Returns the content, rendered by Liquid.
     def render_liquid(content, payload, info, path = nil)
-      Liquid::Template.parse(content).render!(payload, info)
+      site.liquid_renderer.file(path).parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || document.relative_path}"
       raise e

data/lib/jekyll/site.rb

@@ -11,7 +11,7 @@ module Jekyll
                   :gems, :plugin_manager
 
     attr_accessor :converters, :generators, :reader
-    attr_reader   :regenerator
+    attr_reader   :regenerator, :liquid_renderer
 
     # Public: Initialize a new Site.
     #
@@ -33,6 +33,8 @@ module Jekyll
       # Initialize incremental regenerator
       @regenerator = Regenerator.new(self)
 
+      @liquid_renderer = LiquidRenderer.new(self)
+
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
 
@@ -57,6 +59,13 @@ module Jekyll
       render
       cleanup
       write
+      print_stats
+    end
+
+    def print_stats
+      if @config['profile']
+        puts @liquid_renderer.stats_table
+      end
     end
 
     # Reset Site details.
@@ -70,7 +79,8 @@ module Jekyll
       self.static_files = []
       self.data = {}
       @collections = nil
-      @regenerator.clear_cache()
+      @regenerator.clear_cache
+      @liquid_renderer.reset
 
       if limit_posts < 0
         raise ArgumentError, "limit_posts must be a non-negative number"
@@ -319,7 +329,6 @@ module Jekyll
       end.to_a
     end
 
-
     def each_site_file
       %w(posts pages static_files docs_to_write).each do |type|
         send(type).each do |item|

data/lib/jekyll/tags/highlight.rb

@@ -113,7 +113,7 @@ eos
           "class=\"language-#{@lang.to_s.gsub('+', '-')}\"",
           "data-lang=\"#{@lang.to_s}\""
         ].join(" ")
-        "<div class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></div>"
+        "<figure class=\"highlight\"><pre><code #{code_attributes}>#{code.chomp}</code></pre></figure>"
       end
 
     end

data/lib/jekyll/tags/include.rb

@@ -95,7 +95,7 @@ eos
       # Render the variable if required
       def render_variable(context)
         if @file.match(VARIABLE_SYNTAX)
-          partial = Liquid::Template.parse(@file)
+          partial = context.registers[:site].liquid_renderer.file("(variable)").parse(@file)
           partial.render!(context)
         end
       end
@@ -123,7 +123,7 @@ eos
         end
 
         begin
-          partial = Liquid::Template.parse(read_file(path, context))
+          partial = site.liquid_renderer.file(path).parse(read_file(path, context))
 
           context.stack do
             context['include'] = parse_params(context) if @params

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0.pre.beta6'
+  VERSION = '3.0.0.pre.beta7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta6
+  version: 3.0.0.pre.beta7
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -165,6 +165,9 @@ files:
 - lib/jekyll/hooks.rb
 - lib/jekyll/layout.rb
 - lib/jekyll/liquid_extensions.rb
+- lib/jekyll/liquid_renderer.rb
+- lib/jekyll/liquid_renderer/file.rb
+- lib/jekyll/liquid_renderer/table.rb
 - lib/jekyll/log_adapter.rb
 - lib/jekyll/mime.types
 - lib/jekyll/page.rb