bunto 3.2.1 → 3.4.5

data/lib/bunto/drops/bunto_drop.rb

@@ -20,7 +20,7 @@ module Bunto
       def to_h
         @to_h ||= {
           "version"     => version,
-          "environment" => environment
+          "environment" => environment,
         }
       end
 

data/lib/bunto/drops/static_file_drop.rb

@@ -0,0 +1,11 @@
+module Bunto
+  module Drops
+    class StaticFileDrop < Drop
+      extend Forwardable
+      def_delegators :@obj, :name, :extname, :modified_time, :basename
+      def_delegator :@obj, :relative_path, :path
+      def_delegator :@obj, :data, :fallback_data
+      def_delegator :@obj, :type, :collection
+    end
+  end
+end

data/lib/bunto/drops/url_drop.rb

@@ -78,6 +78,11 @@ module Bunto
       def y_day
         @obj.date.strftime("%j")
       end
+
+      private
+      def fallback_data
+        {}
+      end
     end
   end
 end

data/lib/bunto/entry_filter.rb

@@ -2,7 +2,7 @@ module Bunto
   class EntryFilter
     attr_reader :site
     SPECIAL_LEADING_CHARACTERS = [
-      ".", "_", "#", "~"
+      ".", "_", "#", "~",
     ].freeze
 
     def initialize(site, base_directory = nil)
@@ -36,8 +36,7 @@ module Bunto
     end
 
     def included?(entry)
-      glob_include?(site.include,
-        entry)
+      glob_include?(site.include, entry)
     end
 
     def special?(entry)
@@ -50,14 +49,14 @@ module Bunto
     end
 
     def excluded?(entry)
-      excluded = glob_include?(site.exclude, relative_to_source(entry))
-      if excluded
-        Bunto.logger.debug(
-          "EntryFilter:",
-          "excluded #{relative_to_source(entry)}"
-        )
+      glob_include?(site.exclude, relative_to_source(entry)).tap do |excluded|
+        if excluded
+          Bunto.logger.debug(
+            "EntryFilter:",
+            "excluded #{relative_to_source(entry)}"
+          )
+        end
       end
-      excluded
     end
 
     # --

data/lib/bunto/excerpt.rb

@@ -30,8 +30,7 @@ module Bunto
       @data
     end
 
-    def trigger_hooks(*)
-    end
+    def trigger_hooks(*); end
 
     # 'Path' of the excerpt.
     #
@@ -118,7 +117,7 @@ module Bunto
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(%r!^\[[^\]]+\]:.+$!).join("\n")
+        "" << head << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
       end
     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 http://bunto.github.io/help/!
+If you run into trouble, you can find helpful resources at https://buntorb.com/help/!
             MSG
             raise Bunto::Errors::MissingDependencyException, name
           end

data/lib/bunto/filters.rb

@@ -1,10 +1,15 @@
-require "uri"
+require "addressable/uri"
 require "json"
 require "date"
 require "liquid"
 
+require_all "bunto/filters"
+
 module Bunto
   module Filters
+    include URLFilters
+    include GroupingFilters
+
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
@@ -147,7 +152,7 @@ module Bunto
     #
     # Returns the escaped String.
     def uri_escape(input)
-      URI.escape(input)
+      Addressable::URI.normalize_component(input)
     end
 
     # Replace any whitespace in the input string with a single space
@@ -172,6 +177,7 @@ module Bunto
     # word "and" for the last one.
     #
     # array - The Array of Strings to join.
+    # connector - Word used to connect the last 2 items in the array
     #
     # Examples
     #
@@ -179,8 +185,7 @@ module Bunto
     #   # => "apples, oranges, and grapes"
     #
     # Returns the formatted String.
-    def array_to_sentence_string(array)
-      connector = "and"
+    def array_to_sentence_string(array, connector = "and")
       case array.length
       when 0
         ""
@@ -202,29 +207,6 @@ module Bunto
       as_liquid(input).to_json
     end
 
-    # Group an array of items by a property
-    #
-    # input - the inputted Enumerable
-    # property - the property
-    #
-    # Returns an array of Hashes, each looking something like this:
-    #  {"name"  => "larry"
-    #   "items" => [...] } # all the items where `property` == "larry"
-    def group_by(input, property)
-      if groupable?(input)
-        input.group_by { |item| item_property(item, property).to_s }
-          .each_with_object([]) do |item, array|
-            array << {
-              "name"  => item.first,
-              "items" => item.last,
-              "size"  => item.last.size
-            }
-          end
-      else
-        input
-      end
-    end
-
     # Filter an array of objects
     #
     # input - the object array
@@ -378,11 +360,6 @@ module Bunto
       end.localtime
     end
 
-    private
-    def groupable?(element)
-      element.respond_to?(:group_by)
-    end
-
     private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
@@ -433,6 +410,7 @@ module Bunto
 
       condition
     end
+
   end
 end
 

data/lib/bunto/filters/grouping_filters.rb

@@ -0,0 +1,63 @@
+module Bunto
+  module Filters
+    module GroupingFilters
+      # Group an array of items by a property
+      #
+      # input - the inputted Enumerable
+      # property - the property
+      #
+      # Returns an array of Hashes, each looking something like this:
+      #  {"name"  => "larry"
+      #   "items" => [...] } # all the items where `property` == "larry"
+      def group_by(input, property)
+        if groupable?(input)
+          groups = input.group_by { |item| item_property(item, property).to_s }
+          grouped_array(groups)
+        else
+          input
+        end
+      end
+
+      # Group an array of items by 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 group_by_exp(input, variable, expression)
+        return input unless groupable?(input)
+
+        parsed_expr = parse_expression(expression)
+        @context.stack do
+          groups = input.group_by do |item|
+            @context[variable] = item
+            parsed_expr.render(@context)
+          end
+          grouped_array(groups)
+        end
+      end
+
+      private
+      def parse_expression(str)
+        Liquid::Variable.new(str, {})
+      end
+
+      private
+      def groupable?(element)
+        element.respond_to?(:group_by)
+      end
+
+      private
+      def grouped_array(groups)
+        groups.each_with_object([]) do |item, array|
+          array << {
+            "name"  => item.first,
+            "items" => item.last,
+            "size"  => item.last.size,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/bunto/filters/url_filters.rb

@@ -0,0 +1,40 @@
+require "addressable/uri"
+
+module Bunto
+  module Filters
+    module URLFilters
+      # Produces an absolute URL based on site.url and site.baseurl.
+      #
+      # input - the URL to make absolute.
+      #
+      # Returns the absolute URL as a String.
+      def absolute_url(input)
+        return if input.nil?
+        site = @context.registers[:site]
+        return relative_url(input).to_s if site.config["url"].nil?
+        Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
+      end
+
+      # Produces a URL relative to the domain root based on site.baseurl.
+      #
+      # input - the URL to make relative to the domain root
+      #
+      # Returns a URL relative to the domain root as a String.
+      def relative_url(input)
+        return if input.nil?
+        site = @context.registers[:site]
+        parts = [site.config["baseurl"], input]
+        Addressable::URI.parse(
+          parts.compact.map { |part| ensure_leading_slash(part.to_s) }.join
+        ).normalize.to_s
+      end
+
+      private
+      def ensure_leading_slash(input)
+        return input if input.nil? || input.empty? || input.start_with?("/")
+        "/#{input}"
+      end
+
+    end
+  end
+end

data/lib/bunto/frontmatter_defaults.rb

@@ -188,7 +188,7 @@ module Bunto
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
+        path.gsub(%r!\A/|(?<=[^/])\z!, "".freeze)
       end
     end
   end

data/lib/bunto/hooks.rb

@@ -6,7 +6,7 @@ module Bunto
     PRIORITY_MAP = {
       :low    => 10,
       :normal => 20,
-      :high   => 30
+      :high   => 30,
     }.freeze
 
     # initial empty hooks
@@ -17,26 +17,26 @@ module Bunto
         :post_read   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :pages     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :posts     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :documents => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
-      }
+        :post_write  => [],
+      },
     }
 
     # map of all hooks and their priorities
@@ -54,7 +54,7 @@ module Bunto
 
     # Ensure the priority is a Fixnum
     def self.priority_value(priority)
-      return priority if priority.is_a?(Fixnum)
+      return priority if priority.is_a?(Integer)
       PRIORITY_MAP[priority] || DEFAULT_PRIORITY
     end
 
@@ -64,7 +64,7 @@ module Bunto
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       }
 
       unless @registry[owner][event]
@@ -80,7 +80,7 @@ module Bunto
     end
 
     def self.insert_hook(owner, event, priority, &block)
-      @hook_priority[block] = "#{priority}.#{@hook_priority.size}".to_f
+      @hook_priority[block] = [-priority, @hook_priority.size]
       @registry[owner][event] << block
     end
 

data/lib/bunto/log_adapter.rb

@@ -6,7 +6,7 @@ module Bunto
       :debug => ::Logger::DEBUG,
       :info  => ::Logger::INFO,
       :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR
+      :error => ::Logger::ERROR,
     }.freeze
 
     # Public: Create a new instance of a log writer

data/lib/bunto/page.rb

@@ -40,7 +40,11 @@ module Bunto
       @base = base
       @dir  = dir
       @name = name
-      @path = site.in_source_dir(base, dir, name)
+      @path = if site.in_theme_dir(base) == base # we're in a theme
+                site.in_theme_dir(base, dir, name)
+              else
+                site.in_source_dir(base, dir, name)
+              end
 
       process(name)
       read_yaml(File.join(base, dir), name)
@@ -54,7 +58,7 @@ module Bunto
 
     # The generated directory into which the page will be placed
     # upon generation. This is derived from the permalink or, if
-    # permalink is absent, we be '/'
+    # permalink is absent, will be '/'
     #
     # Returns the String destination directory.
     def dir
@@ -94,7 +98,7 @@ module Bunto
       @url ||= URL.new({
         :template     => template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
+        :permalink    => permalink,
       }).to_s
     end
 
@@ -104,7 +108,7 @@ module Bunto
       {
         :path       => @dir,
         :basename   => basename,
-        :output_ext => output_ext
+        :output_ext => output_ext,
       }
     end
 

data/lib/bunto/plugin.rb

@@ -5,7 +5,7 @@ module Bunto
       :highest => 100,
       :lowest  => -100,
       :normal  => 0,
-      :high    => 10
+      :high    => 10,
     }.freeze
 
     #

data/lib/bunto/reader.rb

@@ -18,6 +18,7 @@ module Bunto
       sort_files!
       @site.data = DataReader.new(site).read(site.config["data_dir"])
       CollectionReader.new(site).read
+      ThemeAssetsReader.new(site).read
     end
 
     # Sorts posts, pages, and static files.
@@ -70,7 +71,7 @@ module Bunto
     #
     # Returns nothing.
     def retrieve_dirs(_base, dir, dot_dirs)
-      dot_dirs.map do |file|
+      dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
         unless @site.dest.sub(%r!/$!, "") == dir_path