bunto 3.0.0 → 3.2.1

data/lib/bunto/url.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
@@ -35,8 +35,15 @@ module Bunto
     # The generated relative URL of the resource
     #
     # Returns the String URL
+    # Raises a Bunto::Errors::InvalidURLError if the relative URL contains a colon
     def to_s
-      sanitize_url(generated_permalink || generated_url)
+      sanitized_url = sanitize_url(generated_permalink || generated_url)
+      if sanitized_url.include?(":")
+        raise Bunto::Errors::InvalidURLError,
+          "The URL #{sanitized_url} is invalid because it contains a colon."
+      else
+        sanitized_url
+      end
     end
 
     # Generates a URL from the permalink
@@ -67,32 +74,32 @@ module Bunto
 
     def generate_url_from_hash(template)
       @placeholders.inject(template) do |result, token|
-        break result if result.index(':').nil?
+        break result if result.index(":").nil?
         if token.last.nil?
-          # Remove leading '/' to avoid generating urls with `//`
-          result.gsub(/\/:#{token.first}/, '')
+          # Remove leading "/" to avoid generating urls with `//`
+          result.gsub(%r!/:#{token.first}!, "")
         else
-          result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+          result.gsub(%r!:#{token.first}!, self.class.escape_path(token.last))
         end
       end
     end
 
     def generate_url_from_drop(template)
-      template.gsub(/:([a-z_]+)/.freeze) do |match|
-        replacement = @placeholders.public_send(match.sub(':'.freeze, ''.freeze))
+      template.gsub(%r!:([a-z_]+)!) do |match|
+        replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
         if replacement.nil?
-          ''.freeze
+          "".freeze
         else
           self.class.escape_path(replacement)
         end
-      end.gsub(/\/\//.freeze, '/'.freeze)
+      end.gsub(%r!//!, "/".freeze)
     end
 
     # Returns a sanitized String URL, stripping "../../" and multiples of "/",
     # as well as the beginning "/" so we can enforce and ensure it.
 
     def sanitize_url(str)
-      "/" + str.gsub(/\/{2,}/, "/").gsub(/\.+\/|\A\/+/, "")
+      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+/|\A/+!, "")
     end
 
     # Escapes a path to be a valid URL path segment
@@ -106,7 +113,7 @@ module Bunto
     #
     # Returns the escaped path.
     def self.escape_path(path)
-      # Because URI.escape doesn't escape '?', '[' and ']' by default,
+      # Because URI.escape doesn't escape "?", "[" and "]" by default,
       # specify unsafe string (except unreserved, sub-delims, ":", "@" and "/").
       #
       # URI path segment is defined in RFC 3986 as follows:
@@ -116,7 +123,7 @@ module Bunto
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, %r{[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]}).encode("utf-8")
     end
 
     # Unescapes a URL path segment
@@ -130,7 +137,7 @@ module Bunto
     #
     # Returns the unescaped path.
     def self.unescape_path(path)
-      URI.unescape(path.encode('utf-8'))
+      URI.unescape(path.encode("utf-8"))
     end
   end
 end

data/lib/bunto/utils.rb

@@ -2,27 +2,25 @@
 module Bunto
   module Utils
     extend self
-    autoload :Platforms, 'bunto/utils/platforms'
+    autoload :Platforms, "bunto/utils/platforms"
     autoload :Ansi, "bunto/utils/ansi"
 
     # Constants for use in #slugify
-    SLUGIFY_MODES = %w(raw default pretty)
+    SLUGIFY_MODES = %w(raw default pretty).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
-    SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
+    SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^[:alnum:]]+").freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
     # Takes an indented string and removes the preceding spaces on each line
 
     def strip_heredoc(str)
-      str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "")
+      str.gsub(%r!^[ \t]{#{(str.scan(%r!^[ \t]*(?=\S)!).min || "").size}}!, "")
     end
 
     # Takes a slug and turns it into a simple title.
 
     def titleize_slug(slug)
-      slug.split("-").map! do |val|
-        val.capitalize
-      end.join(" ")
+      slug.split("-").map!(&:capitalize).join(" ")
     end
 
     # Non-destructive version of deep_merge_hashes! See that method.
@@ -42,17 +40,9 @@ module Bunto
     #
     # Thanks to whoever made it.
     def deep_merge_hashes!(target, overwrite)
-      target.merge!(overwrite) do |key, old_val, new_val|
-        if new_val.nil?
-          old_val
-        else
-          mergable?(old_val) && mergable?(new_val) ? deep_merge_hashes(old_val, new_val) : new_val
-        end
-      end
-
-      if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil?
-        target.default_proc = overwrite.default_proc
-      end
+      merge_values(target, overwrite)
+      merge_default_proc(target, overwrite)
+      duplicate_frozen_values(target)
 
       target
     end
@@ -61,6 +51,15 @@ module Bunto
       value.is_a?(Hash) || value.is_a?(Drops::Drop)
     end
 
+    def duplicable?(obj)
+      case obj
+      when nil, false, true, Symbol, Numeric
+        false
+      else
+        true
+      end
+    end
+
     # Read array from the supplied hash favouring the singular key
     # and then the plural key, and handling any nil entries.
     #
@@ -71,7 +70,9 @@ module Bunto
     # Returns an array
     def pluralized_array_from_hash(hash, singular_key, plural_key)
       [].tap do |array|
-        array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
+        value = value_from_singular_key(hash, singular_key)
+        value ||= value_from_plural_key(hash, plural_key)
+        array << value
       end.flatten.compact
     end
 
@@ -133,17 +134,19 @@ module Bunto
     # Determines whether a given file has
     #
     # Returns true if the YAML front matter is present.
+    # rubocop: disable PredicateName
     def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.readline } =~ /\A---\s*\r?\n/)
+      !!(File.open(file, "rb", &:readline) =~ %r!\A---\s*\r?\n!)
     rescue EOFError
       false
     end
+    # rubocop: enable PredicateName
 
     # Slugify a filename or title.
     #
     # string - the filename or title to slugify
     # mode - how string is slugified
-    # cased - whether to replace all  uppercase letters with their
+    # cased - whether to replace all uppercase letters with their
     # lowercase counterparts
     #
     # When mode is "none", return the given string.
@@ -172,7 +175,7 @@ module Bunto
     #
     # Returns the slugified string.
     def slugify(string, mode: nil, cased: false)
-      mode ||= 'default'
+      mode ||= "default"
       return nil if string.nil?
 
       unless SLUGIFY_MODES.include?(mode)
@@ -182,21 +185,21 @@ module Bunto
       # Replace each character sequence with a hyphen
       re =
         case mode
-        when 'raw'
+        when "raw"
           SLUGIFY_RAW_REGEXP
-        when 'default'
+        when "default"
           SLUGIFY_DEFAULT_REGEXP
-        when 'pretty'
+        when "pretty"
           # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
           # and is allowed in both extN and NTFS.
           SLUGIFY_PRETTY_REGEXP
         end
 
       # Strip according to the mode
-      slug = string.gsub(re, '-')
+      slug = string.gsub(re, "-")
 
       # Remove leading/trailing hyphen
-      slug.gsub!(/^\-|\-$/i, '')
+      slug.gsub!(%r!^\-|\-$!i, "")
 
       slug.downcase! unless cased
       slug
@@ -267,7 +270,7 @@ module Bunto
     # Returns matched pathes
     def safe_glob(dir, patterns, flags = 0)
       return [] unless Dir.exist?(dir)
-      pattern = File.join(Array patterns)
+      pattern = File.join(Array(patterns))
       return [dir] if pattern.empty?
       Dir.chdir(dir) do
         Dir.glob(pattern, flags).map { |f| File.join(dir, f) }
@@ -284,5 +287,31 @@ module Bunto
       merged
     end
 
+    private
+    def merge_values(target, overwrite)
+      target.merge!(overwrite) do |_key, old_val, new_val|
+        if new_val.nil?
+          old_val
+        elsif mergable?(old_val) && mergable?(new_val)
+          deep_merge_hashes(old_val, new_val)
+        else
+          new_val
+        end
+      end
+    end
+
+    private
+    def merge_default_proc(target, overwrite)
+      if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
+        target.default_proc = overwrite.default_proc
+      end
+    end
+
+    private
+    def duplicate_frozen_values(target)
+      target.each do |key, val|
+        target[key] = val.dup if val.frozen? && duplicable?(val)
+      end
+    end
   end
 end

data/lib/bunto/utils/ansi.rb

@@ -8,17 +8,17 @@ module Bunto
       extend self
 
       ESCAPE = format("%c", 27)
-      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze
+      MATCH = %r!#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m!ix
       COLORS = {
-        :red => 31,
-        :green => 32,
-        :black => 30,
+        :red     => 31,
+        :green   => 32,
+        :black   => 30,
         :magenta => 35,
-        :yellow => 33,
-        :white => 37,
-        :blue => 34,
-        :cyan => 36
-      }
+        :yellow  => 33,
+        :white   => 37,
+        :blue    => 34,
+        :cyan    => 36
+      }.freeze
 
       # Strip ANSI from the current string.  It also strips cursor stuff,
       # well some of it, and it also strips some other stuff that a lot of

data/lib/bunto/utils/platforms.rb

@@ -17,8 +17,8 @@ module Bunto
       # platforms. This is mostly useful for `bunto doctor` and for testing
       # where we kick off certain tests based on the platform.
 
-      { :windows? => /mswin|mingw|cygwin/, :linux? => /linux/, \
-          :osx? => /darwin|mac os/, :unix? => /solaris|bsd/ }.each do |k, v|
+      { :windows? => %r!mswin|mingw|cygwin!, :linux? => %r!linux!, \
+          :osx? => %r!darwin|mac os!, :unix? => %r!solaris|bsd! }.each do |k, v|
         define_method k do
           !!(
             RbConfig::CONFIG["host_os"] =~ v

data/lib/bunto/version.rb

@@ -1,3 +1,3 @@
 module Bunto
-  VERSION = '3.0.0'
+  VERSION = "3.2.1".freeze
 end

data/lib/site_template/_config.yml

@@ -4,6 +4,7 @@
 # which you are expected to set up once and rarely edit after that. If you find
 # yourself editing these this file very often, consider using Bunto's data files
 # feature for the data you need to update frequently.
+#
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # 'bunto serve'. If you change this file, please restart the server process.
 
@@ -20,8 +21,9 @@ description: > # this means to ignore newlines until "baseurl:"
   Google search results) and in your feed.xml site description.
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "http://example.com" # the base hostname & protocol for your site
-twitter_username: buntorb
+twitter_username: buntowaf
 github_username:  bunto
 
 # Build settings
 markdown: kramdown
+theme: minima

data/lib/site_template/_posts/0000-00-00-welcome-to-bunto.markdown.erb

@@ -14,12 +14,12 @@ Bunto also offers powerful support for code snippets:
 def print_hi(name)
   puts "Hi, #{name}"
 end
-print_hi('Suriyaa')
-#=> prints 'Hi, Suriyaa' to STDOUT.
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
 {% endhighlight %}
 
 Check out the [Bunto docs][bunto-docs] for more info on how to get the most out of Bunto. File all bugs/feature requests at [Bunto’s GitHub repo][bunto-gh]. If you have questions, you can ask them on [Bunto Talk][bunto-talk].
 
 [bunto-docs]: http://bunto.github.io/docs/home
 [bunto-gh]:   https://github.com/bunto/bunto
-[bunto-talk]: https://bunto.github.io/talk/
+[bunto-talk]: https://talk.bunto.github.io/

data/lib/site_template/about.md

@@ -4,11 +4,11 @@ title: About
 permalink: /about/
 ---
 
-This is the base Bunto theme. You can find out more info about customizing your Bunto theme, as well as basic Bunto usage documentation at [buntorb.com](https://bunto.github.io/)
+This is the base Bunto theme. You can find out more info about customizing your Bunto theme, as well as basic Bunto usage documentation at [bunto.github.io](http://bunto.github.io/)
 
 You can find the source code for the Bunto new theme at:
-{% include icon-github.html username="SuriyaaKudoIsc" %} /
-[bunto-new](https://github.com/SuriyaaKudoIsc/bunto-new)
+{% include icon-github.html username="bunto" %} /
+[minima](https://github.com/bunto/minima)
 
 You can find the source code for Bunto at
 {% include icon-github.html username="bunto" %} /

data/lib/site_template/css/main.scss

@@ -3,8 +3,6 @@
 ---
 @charset "utf-8";
 
-
-
 // Our variables
 $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $base-font-size:   16px;
@@ -28,8 +26,7 @@ $content-width:    800px;
 $on-palm:          600px;
 $on-laptop:        800px;
 
-
-
+// Minima also includes a mixin for defining media queries.
 // Use media queries like this:
 // @include media-query($on-palm) {
 //     .wrapper {
@@ -37,17 +34,6 @@ $on-laptop:        800px;
 //         padding-left: $spacing-unit / 2;
 //     }
 // }
-@mixin media-query($device) {
-    @media screen and (max-width: $device) {
-        @content;
-    }
-}
-
-
 
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import
-        "base",
-        "layout",
-        "syntax-highlighting"
-;
+// Import partials from the `minima` theme.
+@import "minima";

data/lib/theme_template/CODE_OF_CONDUCT.md.erb

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <%= user_email %>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/