bunto 3.0.0 → 3.2.1

data/lib/bunto/frontmatter_defaults.rb

@@ -11,37 +11,42 @@ module Bunto
     end
 
     def update_deprecated_types(set)
-      return set unless set.key?('scope') && set['scope'].key?('type')
-
-      set['scope']['type'] =
-        case set['scope']['type']
-        when 'page'
-          Deprecator.defaults_deprecate_type('page', 'pages')
-          'pages'
-        when 'post'
-          Deprecator.defaults_deprecate_type('post', 'posts')
-          'posts'
-        when 'draft'
-          Deprecator.defaults_deprecate_type('draft', 'drafts')
-          'drafts'
+      return set unless set.key?("scope") && set["scope"].key?("type")
+
+      set["scope"]["type"] =
+        case set["scope"]["type"]
+        when "page"
+          Deprecator.defaults_deprecate_type("page", "pages")
+          "pages"
+        when "post"
+          Deprecator.defaults_deprecate_type("post", "posts")
+          "posts"
+        when "draft"
+          Deprecator.defaults_deprecate_type("draft", "drafts")
+          "drafts"
         else
-          set['scope']['type']
+          set["scope"]["type"]
         end
 
       set
     end
 
     def ensure_time!(set)
-      return set unless set.key?('values') && set['values'].key?('date')
-      return set if set['values']['date'].is_a?(Time)
-      set['values']['date'] = Utils.parse_date(set['values']['date'], "An invalid date format was found in a front-matter default set: #{set}")
+      return set unless set.key?("values") && set["values"].key?("date")
+      return set if set["values"]["date"].is_a?(Time)
+      set["values"]["date"] = Utils.parse_date(
+        set["values"]["date"],
+        "An invalid date format was found in a front-matter default set: #{set}"
+      )
       set
     end
 
     # Finds a default value for a given setting, filtered by path and type
     #
-    # path - the path (relative to the source) of the page, post or :draft the default is used in
-    # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+    # path - the path (relative to the source) of the page,
+    # post or :draft the default is used in
+    # type - a symbol indicating whether a :page,
+    # a :post or a :draft calls this method
     #
     # Returns the default value or nil if none was found
     def find(path, type, setting)
@@ -49,9 +54,9 @@ module Bunto
       old_scope = nil
 
       matching_sets(path, type).each do |set|
-        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
-          value = set['values'][setting]
-          old_scope = set['scope']
+        if set["values"].key?(setting) && has_precedence?(old_scope, set["scope"])
+          value = set["values"][setting]
+          old_scope = set["scope"]
         end
       end
       value
@@ -67,11 +72,11 @@ module Bunto
       defaults = {}
       old_scope = nil
       matching_sets(path, type).each do |set|
-        if has_precedence?(old_scope, set['scope'])
-          defaults = Utils.deep_merge_hashes(defaults, set['values'])
-          old_scope = set['scope']
+        if has_precedence?(old_scope, set["scope"])
+          defaults = Utils.deep_merge_hashes(defaults, set["values"])
+          old_scope = set["scope"]
         else
-          defaults = Utils.deep_merge_hashes(set['values'], defaults)
+          defaults = Utils.deep_merge_hashes(set["values"], defaults)
         end
       end
       defaults
@@ -91,9 +96,9 @@ module Bunto
     end
 
     def applies_path?(scope, path)
-      return true if !scope.key?('path') || scope['path'].empty?
+      return true if !scope.key?("path") || scope["path"].empty?
 
-      scope_path = Pathname.new(scope['path'])
+      scope_path = Pathname.new(scope["path"])
       Pathname.new(sanitize_path(path)).ascend do |ascended_path|
         if ascended_path.to_s == scope_path.to_s
           return true
@@ -113,7 +118,7 @@ module Bunto
     # Returns true if either of the above conditions are satisfied,
     #   otherwise returns false
     def applies_type?(scope, type)
-      !scope.key?('type') || scope['type'].eql?(type.to_s)
+      !scope.key?("type") || scope["type"].eql?(type.to_s)
     end
 
     # Checks if a given set of default values is valid
@@ -122,7 +127,7 @@ module Bunto
     #
     # Returns true if the set is valid and can be used in this class
     def valid?(set)
-      set.is_a?(Hash) && set['values'].is_a?(Hash)
+      set.is_a?(Hash) && set["values"].is_a?(Hash)
     end
 
     # Determines if a new scope has precedence over an old one
@@ -131,27 +136,29 @@ module Bunto
     # new_scope - the new scope hash
     #
     # Returns true if the new scope has precedence over the older
+    # rubocop: disable PredicateName
     def has_precedence?(old_scope, new_scope)
       return true if old_scope.nil?
 
-      new_path = sanitize_path(new_scope['path'])
-      old_path = sanitize_path(old_scope['path'])
+      new_path = sanitize_path(new_scope["path"])
+      old_path = sanitize_path(old_scope["path"])
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.key? 'type'
+      elsif new_scope.key?("type")
         true
       else
-        !old_scope.key? 'type'
+        !old_scope.key? "type"
       end
     end
+    # rubocop: enable PredicateName
 
     # Collects a list of sets that match the given path and type
     #
     # Returns an array of hashes
     def matching_sets(path, type)
       valid_sets.select do |set|
-        !set.key?('scope') || applies?(set['scope'], path, type)
+        !set.key?("scope") || applies?(set["scope"], path, type)
       end
     end
 
@@ -162,7 +169,7 @@ module Bunto
     #
     # Returns an array of hashes
     def valid_sets
-      sets = @site.config['defaults']
+      sets = @site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|
@@ -170,7 +177,7 @@ module Bunto
           ensure_time!(update_deprecated_types(set))
         else
           Bunto.logger.warn "Defaults:", "An invalid front-matter default set was found:"
-          Bunto.logger.warn "#{set}"
+          Bunto.logger.warn set.to_s
           nil
         end
       end.compact
@@ -181,7 +188,7 @@ module Bunto
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1')
+        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
       end
     end
   end

data/lib/bunto/hooks.rb

@@ -4,38 +4,38 @@ module Bunto
 
     # compatibility layer for octopress-hooks users
     PRIORITY_MAP = {
-      :low => 10,
+      :low    => 10,
       :normal => 20,
-      :high => 30
+      :high   => 30
     }.freeze
 
     # initial empty hooks
     @registry = {
-      :site => {
-        :after_init => [],
+      :site      => {
+        :after_init  => [],
         :after_reset => [],
-        :post_read => [],
-        :pre_render => [],
+        :post_read   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
-      :pages => {
-        :post_init => [],
-        :pre_render => [],
+      :pages     => {
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
-      :posts => {
-        :post_init => [],
-        :pre_render => [],
+      :posts     => {
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
       :documents => {
-        :post_init => [],
-        :pre_render => [],
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       }
     }
 
@@ -61,10 +61,10 @@ module Bunto
     # register a single hook to be called later, internal API
     def self.register_one(owner, event, priority, &block)
       @registry[owner] ||={
-        :post_init => [],
-        :pre_render => [],
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       }
 
       unless @registry[owner][event]

data/lib/bunto/layout.rb

@@ -11,6 +11,9 @@ module Bunto
     # Gets the path to this layout.
     attr_reader :path
 
+    # Gets the path to this layout relative to its base
+    attr_reader :relative_path
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 
@@ -37,6 +40,7 @@ module Bunto
         @base_dir = site.source
         @path = site.in_source_dir(base, name)
       end
+      @relative_path = @path.sub(@base_dir, "")
 
       self.data = {}
 
@@ -52,13 +56,5 @@ module Bunto
     def process(name)
       self.ext = File.extname(name)
     end
-
-    # The path to the layout, relative to the site source.
-    #
-    # Returns a String path which represents the relative path
-    #   from the site source to this layout
-    def relative_path
-      @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(@base_dir)).to_s
-    end
   end
 end

data/lib/bunto/liquid_renderer.rb

@@ -1,10 +1,11 @@
-require 'bunto/liquid_renderer/file'
-require 'bunto/liquid_renderer/table'
+require "bunto/liquid_renderer/file"
+require "bunto/liquid_renderer/table"
 
 module Bunto
   class LiquidRenderer
     def initialize(site)
       @site = site
+      Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
       reset
     end
 
@@ -13,7 +14,10 @@ module Bunto
     end
 
     def file(filename)
-      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+      filename = @site.in_source_dir(filename).sub(
+        %r!\A#{Regexp.escape(@site.source)}/!,
+        ""
+      )
 
       LiquidRenderer::File.new(self, filename).tap do
         @stats[filename] ||= {}
@@ -35,5 +39,12 @@ module Bunto
     def stats_table(n = 50)
       LiquidRenderer::Table.new(@stats).to_s(n)
     end
+
+    def self.format_error(e, path)
+      if e.is_a? Tags::IncludeTagError
+        return "#{e.message} in #{e.path}, included in #{path}"
+      end
+      "#{e.message} in #{path}"
+    end
   end
 end

data/lib/bunto/liquid_renderer/file.rb

@@ -8,7 +8,7 @@ module Bunto
 
       def parse(content)
         measure_time do
-          @template = Liquid::Template.parse(content, line_numbers: true)
+          @template = Liquid::Template.parse(content, :line_numbers => true)
         end
 
         self
@@ -30,6 +30,10 @@ module Bunto
         end
       end
 
+      def warnings
+        @template.warnings
+      end
+
       private
 
       def measure_bytes

data/lib/bunto/liquid_renderer/table.rb

@@ -31,8 +31,8 @@ module Bunto
       str = ""
 
       row_data.each_index do |cell_index|
-        str << '-' * widths[cell_index]
-        str << '-+-' unless cell_index == row_data.length-1
+        str << "-" * widths[cell_index]
+        str << "-+-" unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -40,16 +40,16 @@ module Bunto
     end
 
     def generate_row(row_data, widths)
-      str = ''
+      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 << if cell_index.zero?
+                 cell_data.ljust(widths[cell_index], " ")
+               else
+                 cell_data.rjust(widths[cell_index], " ")
+               end
 
-        str << ' | ' unless cell_index == row_data.length-1
+        str << " | " unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -79,7 +79,7 @@ module Bunto
         row << filename
         row << file_stats[:count].to_s
         row << format_bytes(file_stats[:bytes])
-        row << "%.3f" % file_stats[:time]
+        row << format("%.3f", file_stats[:time])
         table << row
       end
 
@@ -88,7 +88,7 @@ module Bunto
 
     def format_bytes(bytes)
       bytes /= 1024.0
-      "%.2fK" % bytes
+      format("%.2fK", bytes)
     end
   end
 end

data/lib/bunto/log_adapter.rb

@@ -7,7 +7,7 @@ module Bunto
       :info  => ::Logger::INFO,
       :warn  => ::Logger::WARN,
       :error => ::Logger::ERROR
-    }
+    }.freeze
 
     # Public: Create a new instance of a log writer
     #
@@ -98,7 +98,7 @@ module Bunto
     #
     # Returns the formatted message
     def message(topic, message)
-      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      msg = formatted_topic(topic) + message.to_s.gsub(%r!\s+!, " ")
       messages << msg
       msg
     end

data/lib/bunto/page.rb

@@ -9,7 +9,7 @@ module Bunto
 
     alias_method :extname, :ext
 
-    FORWARD_SLASH = '/'.freeze
+    FORWARD_SLASH = "/".freeze
 
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
@@ -18,16 +18,16 @@ module Bunto
       name
       path
       url
-    )
+    ).freeze
 
     # A set of extensions that are considered HTML or HTML-like so we
     # should not alter them,  this includes .xhtml through XHTM5.
 
-    HTML_EXTENSIONS = %W(
+    HTML_EXTENSIONS = %w(
       .html
       .xhtml
       .htm
-    )
+    ).freeze
 
     # Initialize a new Page.
     #
@@ -71,7 +71,7 @@ module Bunto
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      data.nil? ? nil : data['permalink']
+      data.nil? ? nil : data["permalink"]
     end
 
     # The template of the permalink.
@@ -92,9 +92,9 @@ module Bunto
     # Returns the String url.
     def url
       @url ||= URL.new({
-        :template => template,
+        :template     => template,
         :placeholders => url_placeholders,
-        :permalink => permalink
+        :permalink    => permalink
       }).to_s
     end
 
@@ -135,12 +135,12 @@ module Bunto
     #
     # Returns the path to the source file
     def path
-      data.fetch('path') { relative_path.sub(/\A\//, '') }
+      data.fetch("path") { relative_path }
     end
 
     # The path to the page source file, relative to the site source
     def relative_path
-      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?))
+      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A\/!, "")
     end
 
     # Obtain destination path.
@@ -167,7 +167,7 @@ module Bunto
 
     # Returns the Boolean of whether this Page is an index file or not.
     def index?
-      basename == 'index'
+      basename == "index"
     end
 
     def trigger_hooks(hook_name, *args)