bunto 2.0.0.pre → 3.0.0

data/lib/bunto/converter.rb

@@ -8,7 +8,9 @@ module Bunto
     #
     # Returns the String prefix.
     def self.highlighter_prefix(highlighter_prefix = nil)
-      @highlighter_prefix = highlighter_prefix if highlighter_prefix
+      if !defined?(@highlighter_prefix) || !highlighter_prefix.nil?
+        @highlighter_prefix = highlighter_prefix
+      end
       @highlighter_prefix
     end
 
@@ -20,7 +22,9 @@ module Bunto
     #
     # Returns the String suffix.
     def self.highlighter_suffix(highlighter_suffix = nil)
-      @highlighter_suffix = highlighter_suffix if highlighter_suffix
+      if !defined?(@highlighter_suffix) || !highlighter_suffix.nil?
+        @highlighter_suffix = highlighter_suffix
+      end
       @highlighter_suffix
     end
 

data/lib/bunto/converters/markdown.rb

@@ -6,7 +6,7 @@ module Bunto
       safe true
 
       def setup
-        return if @setup
+        return if @setup ||= false
         unless (@parser = get_processor)
           Bunto.logger.error "Invalid Markdown processor given:", @config["markdown"]
           Bunto.logger.info  "", "Custom processors are not loaded in safe mode" if @config["safe"]

data/lib/bunto/converters/markdown/kramdown_parser.rb

@@ -18,6 +18,7 @@ module Bunto
           Bunto::External.require_with_graceful_fail "kramdown"
           @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
+          @highlighter = nil
           setup
         end
 

data/lib/bunto/convertible.rb

@@ -39,9 +39,9 @@ module Bunto
       filename = File.join(base, name)
 
       begin
-        self.content = File.read(site.in_source_dir(base, name),
+        self.content = File.read(@path || site.in_source_dir(base, name),
                                  Utils.merged_file_read_opts(site, opts))
-        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+        if content =~ Document::YAML_FRONT_MATTER_REGEXP
           self.content = $POSTMATCH
           self.data = SafeYAML.load(Regexp.last_match(1))
         end
@@ -215,9 +215,9 @@ module Bunto
         payload["layout"]  = Utils.deep_merge_hashes(payload["layout"] || {}, layout.data)
 
         self.output = render_liquid(layout.content,
-                                         payload,
-                                         info,
-                                         File.join(site.config['layouts_dir'], layout.name))
+                                    payload,
+                                    info,
+                                    layout.relative_path)
 
         # Add layout to dependency tree
         site.regenerator.add_dependency(

data/lib/bunto/deprecator.rb

@@ -22,7 +22,7 @@ module Bunto
 
     def no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w(--help --version).include?(args.first)
-        deprecation_message "Bunto now uses subcommands instead of just switches. Run `bunto --help` to find out more."
+        deprecation_message "Bunto now uses subcommands instead of just switches. Run `bunto help` to find out more."
         abort
       end
     end

data/lib/bunto/document.rb

@@ -68,7 +68,11 @@ module Bunto
     end
 
     def date
-      data['date'] ||= site.time
+      data['date'] ||= (draft? ? source_file_mtime : site.time)
+    end
+
+    def source_file_mtime
+      @source_file_mtime ||= File.mtime(path)
     end
 
     # Returns whether the document is a draft. This is only the case if
@@ -217,8 +221,11 @@ module Bunto
     def destination(base_directory)
       dest = site.in_dest_dir(base_directory)
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if url.end_with?("/")
-      path << output_ext unless path.end_with? output_ext
+      if url.end_with? "/"
+        path = File.join(path, "index.html")
+      else
+        path << output_ext unless path.end_with? output_ext
+      end
       path
     end
 
@@ -256,7 +263,7 @@ module Bunto
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
+          defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
           merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
 
           self.content = File.read(path, Utils.merged_file_read_opts(site, opts))

data/lib/bunto/drops/document_drop.rb

@@ -20,6 +20,13 @@ module Bunto
         fallback_data['excerpt'].to_s
       end
 
+      def <=>(other)
+        return nil unless other.is_a? DocumentDrop
+        cmp = self['date'] <=> other['date']
+        cmp = self['path'] <=> other['path'] if cmp.nil? || cmp == 0
+        cmp
+      end
+
       private
       def_delegator :@obj, :data, :fallback_data
     end

data/lib/bunto/entry_filter.rb

@@ -1,6 +1,6 @@
 module Bunto
   class EntryFilter
-    SPECIAL_LEADING_CHARACTERS = ['.', '_', '#'].freeze
+    SPECIAL_LEADING_CHARACTERS = ['.', '_', '#', '~'].freeze
 
     attr_reader :site
 
@@ -52,7 +52,11 @@ module Bunto
     end
 
     def symlink?(entry)
-      File.symlink?(entry) && site.safe
+      site.safe && File.symlink?(entry) && symlink_outside_site_source?(entry)
+    end
+
+    def symlink_outside_site_source?(entry)
+      ! File.realpath(entry).start_with?(File.realpath(@site.source))
     end
 
     def ensure_leading_slash(path)

data/lib/bunto/errors.rb

@@ -6,5 +6,9 @@ module Bunto
     InvalidPermalinkError       = Class.new(FatalException)
     InvalidYAMLFrontMatterError = Class.new(FatalException)
     MissingDependencyException  = Class.new(FatalException)
+
+    InvalidDateError = Class.new(FatalException)
+    InvalidPostNameError = Class.new(FatalException)
+    PostURLError = Class.new(FatalException)
   end
 end

data/lib/bunto/external.rb

@@ -48,7 +48,7 @@ In order to use Bunto as currently configured, you'll need to install this gem.
 
 The full error message from Ruby is: '#{e.message}'
 
-If you run into trouble, you can find helpful resources at https://bunto.github.io/help/!
+If you run into trouble, you can find helpful resources at http://bunto.github.io/help/!
             MSG
             raise Bunto::Errors::MissingDependencyException.new(name)
           end

data/lib/bunto/filters.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'json'
 require 'date'
+require 'liquid'
 
 module Bunto
   module Filters
@@ -15,11 +16,11 @@ module Bunto
       converter.convert(input)
     end
 
-    # Convert a Markdown string into HTML output.
+    # Convert quotes into smart quotes.
     #
-    # input - The Markdown String to convert.
+    # input - The String to convert.
     #
-    # Returns the HTML formatted String.
+    # Returns the smart-quotified String.
     def smartify(input)
       site = @context.registers[:site]
       converter = site.find_converter_instance(Bunto::Converters::SmartyPants)
@@ -117,7 +118,7 @@ module Bunto
     #
     # Returns the escaped String.
     def xml_escape(input)
-      CGI.escapeHTML(input.to_s)
+      input.to_s.encode(:xml => :attr).gsub(/\A"|"\Z/, "")
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters
@@ -205,7 +206,7 @@ module Bunto
         input.group_by do |item|
           item_property(item, property).to_s
         end.inject([]) do |memo, i|
-          memo << { "name" => i.first, "items" => i.last }
+          memo << { "name" => i.first, "items" => i.last, "size" => i.last.size }
         end
       else
         input
@@ -222,7 +223,27 @@ module Bunto
     def where(input, property, value)
       return input unless input.is_a?(Enumerable)
       input = input.values if input.is_a?(Hash)
-      input.select { |object| item_property(object, property).to_s == value.to_s }
+      input.select { |object| Array(item_property(object, property)).map(&:to_s).include?(value.to_s) }
+    end
+
+    # Filters an array of objects against an expression
+    #
+    # input - the object array
+    # variable - the variable to assign each item to in the expression
+    # expression - a Liquid comparison expression passed in as a string
+    #
+    # Returns the filtered array of objects
+    def where_exp(input, variable, expression)
+      return input unless input.is_a?(Enumerable)
+      input = input.values if input.is_a?(Hash) # FIXME
+
+      condition = parse_condition(expression)
+      @context.stack do
+        input.select do |object|
+          @context[variable] = object
+          condition.evaluate(@context)
+        end
+      end
     end
 
     # Sort an array of objects
@@ -308,14 +329,14 @@ module Bunto
     #
     # Returns a String representation of the object.
     def inspect(input)
-      CGI.escapeHTML(input.inspect)
+      xml_escape(input.inspect)
     end
 
     private
     def time(input)
       case input
       when Time
-        input
+        input.clone
       when Date
         input.to_time
       when String
@@ -363,5 +384,25 @@ module Bunto
         end
       end
     end
+
+    # Parse a string to a Liquid Condition
+    def parse_condition(exp)
+      parser = Liquid::Parser.new(exp)
+      left_expr = parser.expression
+      operator = parser.consume?(:comparison)
+      condition =
+        if operator
+          Liquid::Condition.new(left_expr, operator, parser.expression)
+        else
+          Liquid::Condition.new(left_expr)
+        end
+      parser.consume(:end_of_string)
+
+      condition
+    end
   end
 end
+
+Liquid::Template.register_filter(
+  Bunto::Filters
+)

data/lib/bunto/frontmatter_defaults.rb

@@ -94,8 +94,8 @@ module Bunto
       return true if !scope.key?('path') || scope['path'].empty?
 
       scope_path = Pathname.new(scope['path'])
-      Pathname.new(sanitize_path(path)).ascend do |path|
-        if path.to_s == scope_path.to_s
+      Pathname.new(sanitize_path(path)).ascend do |ascended_path|
+        if ascended_path.to_s == scope_path.to_s
           return true
         end
       end

data/lib/bunto/hooks.rb

@@ -12,6 +12,7 @@ module Bunto
     # initial empty hooks
     @registry = {
       :site => {
+        :after_init => [],
         :after_reset => [],
         :post_read => [],
         :pre_render => [],

data/lib/bunto/layout.rb

@@ -29,7 +29,14 @@ module Bunto
       @site = site
       @base = base
       @name = name
-      @path = site.in_source_dir(base, name)
+
+      if site.theme && site.theme.layouts_path.eql?(base)
+        @base_dir = site.theme.root
+        @path = site.in_theme_dir(base, name)
+      else
+        @base_dir = site.source
+        @path = site.in_source_dir(base, name)
+      end
 
       self.data = {}
 
@@ -45,5 +52,13 @@ 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/mime.types

@@ -797,4 +797,4 @@ video/x-ms-wvx                                                            wvx
 video/x-msvideo                                                           avi
 video/x-sgi-movie                                                         movie
 video/x-smv                                                               smv
-x-conference/x-cooltalk                                                   ice
+x-conference/x-cooltalk                                                   ice

data/lib/bunto/page.rb

@@ -40,6 +40,7 @@ module Bunto
       @base = base
       @dir  = dir
       @name = name
+      @path = site.in_source_dir(base, dir, name)
 
       process(name)
       read_yaml(File.join(base, dir), name)

data/lib/bunto/plugin.rb

@@ -60,7 +60,7 @@ module Bunto
     #
     # Returns the safety Boolean.
     def self.safe(safe = nil)
-      if safe
+      if !defined?(@safe) || !safe.nil?
         @safe = safe
       end
       @safe || false

data/lib/bunto/plugin_manager.rb

@@ -30,16 +30,16 @@ module Bunto
     def self.require_from_bundler
       if !ENV["BUNTO_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
         require "bundler"
-        Bundler.setup # puts all groups on the load path
-        required_gems = Bundler.require(:bunto_plugins) # requires the gems in this group only
+
+        Bundler.setup
+        required_gems = Bundler.require(:bunto_plugins)
         Bunto.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
         ENV["BUNTO_NO_BUNDLER_REQUIRE"] = "true"
+
         true
       else
         false
       end
-    rescue LoadError, Bundler::GemfileNotFound
-      false
     end
 
     # Check whether a gem plugin is allowed to be used during this build.

data/lib/bunto/publisher.rb

@@ -8,14 +8,14 @@ module Bunto
       can_be_published?(thing) && !hidden_in_the_future?(thing)
     end
 
+    def hidden_in_the_future?(thing)
+      thing.respond_to?(:date) && !@site.future && thing.date.to_i > @site.time.to_i
+    end
+
     private
 
     def can_be_published?(thing)
       thing.data.fetch('published', true) || @site.unpublished
     end
-
-    def hidden_in_the_future?(thing)
-      thing.respond_to?(:date) && !@site.future && thing.date.to_i > @site.time.to_i
-    end
   end
 end

data/lib/bunto/readers/data_reader.rb

@@ -4,6 +4,7 @@ module Bunto
     def initialize(site)
       @site = site
       @content = {}
+      @entry_filter = EntryFilter.new(site)
     end
 
     # Read all the files in <source>/<dir>/_drafts and create a new Draft
@@ -26,7 +27,7 @@ module Bunto
     #
     # Returns nothing
     def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
+      return unless File.directory?(dir) && !@entry_filter.symlink?(dir)
 
       entries = Dir.chdir(dir) do
         Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
@@ -34,7 +35,7 @@ module Bunto
 
       entries.each do |entry|
         path = @site.in_source_dir(dir, entry)
-        next if File.symlink?(path) && site.safe
+        next if @entry_filter.symlink?(path)
 
         key = sanitize_filename(File.basename(entry, '.*'))
         if File.directory?(path)

data/lib/bunto/readers/layout_reader.rb

@@ -7,8 +7,12 @@ module Bunto
     end
 
     def read
-      layout_entries.each do |f|
-        @layouts[layout_name(f)] = Layout.new(site, layout_directory, f)
+      layout_entries.each do |layout_file|
+        @layouts[layout_name(layout_file)] = Layout.new(site, layout_directory, layout_file)
+      end
+
+      theme_layout_entries.each do |layout_file|
+        @layouts[layout_name(layout_file)] ||= Layout.new(site, theme_layout_directory, layout_file)
       end
 
       @layouts
@@ -18,11 +22,23 @@ module Bunto
       @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
     end
 
+    def theme_layout_directory
+      @theme_layout_directory ||= site.theme.layouts_path if site.theme
+    end
+
     private
 
     def layout_entries
+      entries_in layout_directory
+    end
+
+    def theme_layout_entries
+      theme_layout_directory ? entries_in(theme_layout_directory) : []
+    end
+
+    def entries_in(dir)
       entries = []
-      within(layout_directory) do
+      within(dir) do
         entries = EntryFilter.new(site).filter(Dir['**/*.*'])
       end
       entries