bridgetown-core 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1084717b64c2b8052f5e87763a1382c3f83fa49e842da56f37757a783cf547
-  data.tar.gz: 9d421e1223a7e47ae0822e28788af30542af943efd360c17f2f57bfdf32360ee
+  metadata.gz: d54c0a2a041830e819a8f60b45164f00fa833bc5d795941599969bb967e550ae
+  data.tar.gz: 81bf01e9efec7ea134d9c76de18a0b19bdd4d9addc7d0011a03fc038d18890f3
 SHA512:
-  metadata.gz: eb167ebdaaece121612d9ebe513889577f9345989418bb16a026f784ff3522066649a89974d1e197ae13604bfd520f907d5e1c1f954dbb85a82d0b26f30d0c86
-  data.tar.gz: c7b8c58235995de4084b595077ecc5947e9489c508407a715870801494fb4a6075ed9d7f85f00eecfaf6f685534f954a2dd3195a0be0dd888fae6c8c8a2f9fcd
+  metadata.gz: 8746742cc41353b34c8f91549b1981034014fb35cb23ea4b3077b96c9c41ca10470e688c78b106b1d7b1655ca0503e01e9095bcc0f17ac3afdc8aadd891f49f9
+  data.tar.gz: 50c6e804f3712ab3a30fafddbde9c5a0c9c04487b8a3f671fb9bc8cdd1d5fb14b64913b0f048672592ef15fad8d2c5aad1e0f3c348c6fce5479fdfa13f718aa2

data/lib/bridgetown-core/collection.rb

@@ -109,14 +109,20 @@ module Bridgetown
       @relative_directory ||= "_#{label}"
     end
 
+    # The relative path to the directory containing the collection.
+    #
+    # Returns a String containing the directory name where the collection
+    #   is stored relative to the source directory
+    def relative_path
+      Pathname.new(container).join(relative_directory).to_s
+    end
+
     # The full path to the directory containing the collection.
     #
-    # Returns a String containing th directory name where the collection
+    # Returns a String containing the directory name where the collection
     #   is stored on the filesystem.
     def directory
-      @directory ||= site.in_source_dir(
-        File.join(container, relative_directory)
-      )
+      @directory ||= site.in_source_dir(relative_path)
     end
 
     # The full path to the directory containing the collection, with
@@ -209,7 +215,7 @@ module Bridgetown
     end
 
     def read_document(full_path)
-      doc = Document.new(full_path, :site => site, :collection => self)
+      doc = Document.new(full_path, site: site, collection: self)
       doc.read
       docs << doc if site.unpublished || doc.published?
     end
@@ -263,7 +269,7 @@ module Bridgetown
 
     def read_static_file(file_path, full_path)
       relative_dir = Bridgetown.sanitized_path(
-        relative_directory,
+        relative_path,
         File.dirname(file_path)
       ).chomp("/.")
 

data/lib/bridgetown-core/command.rb

@@ -66,7 +66,7 @@ module Bridgetown
                    "Serve the website from the given base URL"
         cmd.option "force_polling", "--force_polling", "Force watch to use polling"
         cmd.option "lsi", "--lsi", "Use LSI for improved related posts"
-        cmd.option "unpublished", "--unpublished",
+        cmd.option "unpublished", "-U", "--unpublished",
                    "Render posts that were marked as unpublished"
         cmd.option "disable_disk_cache", "--disable-disk-cache",
                    "Disable caching to disk"

data/lib/bridgetown-core/commands/build.rb

@@ -30,20 +30,20 @@ module Bridgetown
                                       " build is about to begin…"
 
           options = configuration_from_options(options)
-          site = Bridgetown::Site.new(options)
+          @site = Bridgetown::Site.new(options)
 
           if options.fetch("skip_initial_build", false)
             Bridgetown.logger.warn "Build Warning:", "Skipping the initial build." \
                                " This may result in an out-of-date site."
           else
-            build(site, options)
+            build(options)
           end
 
           if options.fetch("detach", false)
             Bridgetown.logger.info "Auto-regeneration:",
                                    "disabled when running server detached."
           elsif options.fetch("watch", false)
-            watch(site, options)
+            watch(options)
           else
             Bridgetown.logger.info "Auto-regeneration:", "disabled. Use --watch to enable."
           end
@@ -51,31 +51,30 @@ module Bridgetown
 
         # Build your Bridgetown site.
         #
-        # site - the Bridgetown::Site instance to build
-        # options - A Hash of options passed to the command
+        # options - A Hash of options passed to the command or loaded from config
         #
         # Returns nothing.
-        def build(site, options)
+        def build(options)
           t = Time.now
-          source = File.expand_path(options["source"])
-          destination = File.expand_path(options["destination"])
+          display_folder_paths(options)
+          if options["unpublished"]
+            Bridgetown.logger.info "Unpublished mode:",
+                                   "enabled. Processing documents marked unpublished"
+          end
           incremental = options["incremental"]
-          Bridgetown.logger.info "Source:", source
-          Bridgetown.logger.info "Destination:", destination
           Bridgetown.logger.info "Incremental build:",
                                  (incremental ? "enabled" : "disabled. Enable with --incremental")
           Bridgetown.logger.info "Generating…"
-          process_site(site)
+          process_site(@site)
           Bridgetown.logger.info "Done! 🎉", "Completed in #{(Time.now - t).round(3)} seconds."
         end
 
         # Private: Watch for file changes and rebuild the site.
         #
-        # site - A Bridgetown::Site instance
-        # options - A Hash of options passed to the command
+        # options - A Hash of options passed to the command or loaded from config
         #
         # Returns nothing.
-        def watch(site, options)
+        def watch(options)
           # Warn Windows users that they might need to upgrade.
           if Utils::Platforms.bash_on_windows?
             Bridgetown.logger.warn "",
@@ -88,7 +87,21 @@ module Bridgetown
           end
 
           #          External.require_with_graceful_fail "bridgetown-watch"
-          Bridgetown::Watcher.watch(options, site)
+          Bridgetown::Watcher.watch(@site, options)
+        end
+
+        # Private: display the source and destination folder paths
+        #
+        # options - A Hash of options passed to the command
+        #
+        # Returns nothing.
+        def display_folder_paths(options)
+          source = File.expand_path(options["source"])
+          destination = File.expand_path(options["destination"])
+          plugins_dir = File.expand_path(options["plugins_dir"])
+          Bridgetown.logger.info "Source:", source
+          Bridgetown.logger.info "Destination:", destination
+          Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
         end
       end
     end

data/lib/bridgetown-core/commands/clean.rb

@@ -24,9 +24,9 @@ module Bridgetown
           metadata_file = File.join(options["source"], ".bridgetown-metadata")
           cache_dir = File.join(options["source"], options["cache_dir"])
 
-          remove(destination, :checker_func => :directory?)
-          remove(metadata_file, :checker_func => :file?)
-          remove(cache_dir, :checker_func => :directory?)
+          remove(destination, checker_func: :directory?)
+          remove(metadata_file, checker_func: :file?)
+          remove(cache_dir, checker_func: :directory?)
         end
 
         def remove(filename, checker_func: :file?)

data/lib/bridgetown-core/commands/serve.rb

@@ -58,6 +58,7 @@ module Bridgetown
               opts["serving"] = true
               opts["watch"]   = true unless opts.key?("watch")
 
+              # TODO: this prints the configuration file log message out-of-order
               config = configuration_from_options(opts)
               config["url"] = default_url(config) if Bridgetown.env == "development"
 
@@ -102,15 +103,15 @@ module Bridgetown
 
         def webrick_opts(opts)
           opts = {
-            :BridgetownOptions  => opts,
-            :DoNotReverseLookup => true,
-            :MimeTypes          => mime_types,
-            :DocumentRoot       => opts["destination"],
-            :StartCallback      => start_callback(opts["detach"]),
-            :StopCallback       => stop_callback(opts["detach"]),
-            :BindAddress        => opts["host"],
-            :Port               => opts["port"],
-            :DirectoryIndex     => DIRECTORY_INDEX,
+            BridgetownOptions: opts,
+            DoNotReverseLookup: true,
+            MimeTypes: mime_types,
+            DocumentRoot: opts["destination"],
+            StartCallback: start_callback(opts["detach"]),
+            StopCallback: stop_callback(opts["detach"]),
+            BindAddress: opts["host"],
+            Port: opts["port"],
+            DirectoryIndex: DIRECTORY_INDEX,
           }
 
           opts[:DirectoryIndex] = [] if opts[:BridgetownOptions]["show_dir_listing"]
@@ -121,8 +122,6 @@ module Bridgetown
         end
 
         def start_up_webrick(opts, destination)
-          @reload_reactor.start(opts) if opts["livereload"]
-
           @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           @server.mount(opts["baseurl"].to_s, Servlet, destination, file_handler_opts)
 
@@ -134,8 +133,8 @@ module Bridgetown
         # Recreate NondisclosureName under utf-8 circumstance
         def file_handler_opts
           WEBrick::Config::FileHandler.merge(
-            :FancyIndexing     => true,
-            :NondisclosureName => [
+            FancyIndexing: true,
+            NondisclosureName: [
               ".ht*", "~*",
             ]
           )
@@ -152,10 +151,10 @@ module Bridgetown
 
         def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%<prefix>s://%<address>s:%<port>i%<baseurl>s",
-                 :prefix  => ssl_enabled ? "https" : "http",
-                 :address => address,
-                 :port    => port,
-                 :baseurl => baseurl ? "#{baseurl}/" : "")
+                 prefix: ssl_enabled ? "https" : "http",
+                 address: address,
+                 port: port,
+                 baseurl: baseurl ? "#{baseurl}/" : "")
         end
 
         def default_url(opts)
@@ -234,8 +233,6 @@ module Bridgetown
           unless detached
             proc do
               mutex.synchronize do
-                # Block until EventMachine reactor starts
-                @reload_reactor&.started_event&.wait
                 @running = true
                 Bridgetown.logger.info("Server running…", "press ctrl-c to stop.")
                 @run_cond.broadcast
@@ -248,10 +245,6 @@ module Bridgetown
           unless detached
             proc do
               mutex.synchronize do
-                unless @reload_reactor.nil?
-                  @reload_reactor.stop
-                  @reload_reactor.stopped_event.wait
-                end
                 @running = false
                 @run_cond.broadcast
               end

data/lib/bridgetown-core/configuration.rb

@@ -150,8 +150,8 @@ module Bridgetown
     def config_files(override)
       # Adjust verbosity quickly
       Bridgetown.logger.adjust_verbosity(
-        :quiet   => quiet?(override),
-        :verbose => verbose?(override)
+        quiet: quiet?(override),
+        verbose: verbose?(override)
       )
 
       # Get configuration from <root_dir>/<matching_default_config>

data/lib/bridgetown-core/convertible.rb

@@ -208,7 +208,7 @@ module Bridgetown
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
       Bridgetown.logger.debug "Writing:", path
-      File.write(path, output, :mode => "wb")
+      File.write(path, output, mode: "wb")
       Bridgetown::Hooks.trigger hook_owner, :post_write, self
     end
 

data/lib/bridgetown-core/document.rb

@@ -203,9 +203,9 @@ module Bridgetown
     # Returns the computed URL for the document.
     def url
       @url ||= URL.new(
-        :template     => url_template,
-        :placeholders => url_placeholders,
-        :permalink    => permalink
+        template: url_template,
+        placeholders: url_placeholders,
+        permalink: permalink
       ).to_s
     end
 
@@ -238,7 +238,7 @@ module Bridgetown
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
       Bridgetown.logger.debug "Writing:", path
-      File.write(path, output, :mode => "wb")
+      File.write(path, output, mode: "wb")
 
       trigger_hooks(:post_write)
     end
@@ -412,7 +412,7 @@ module Bridgetown
 
     def merge_defaults
       defaults = @site.frontmatter_defaults.all(relative_path, type)
-      merge_data!(defaults, :source => "front matter defaults") unless defaults.empty?
+      merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
     end
 
     def read_content(**opts)
@@ -420,7 +420,7 @@ module Bridgetown
       if content =~ YAML_FRONT_MATTER_REGEXP
         self.content = $POSTMATCH
         data_file = SafeYAML.load(Regexp.last_match(1))
-        merge_data!(data_file, :source => "YAML front matter") if data_file
+        merge_data!(data_file, source: "YAML front matter") if data_file
       end
     end
 
@@ -464,7 +464,7 @@ module Bridgetown
 
     def modify_date(date)
       if !data["date"] || data["date"].to_i == site.time.to_i
-        merge_data!({ "date" => date }, :source => "filename")
+        merge_data!({ "date" => date }, source: "filename")
       end
     end
 

data/lib/bridgetown-core/drops/collection_drop.rb

@@ -8,12 +8,12 @@ module Bridgetown
       mutable false
 
       def_delegator  :@obj, :write?, :output
-      def_delegators :@obj, :label, :docs, :files, :directory, :relative_directory
+      def_delegators :@obj, :label, :docs, :files, :relative_path
 
       private def_delegator :@obj, :metadata, :fallback_data
 
       def to_s
-        docs.to_s
+        label
       end
     end
   end

data/lib/bridgetown-core/drops/document_drop.rb

@@ -17,7 +17,7 @@ module Bridgetown
       private def_delegator :@obj, :data, :fallback_data
 
       def collection
-        @obj.collection.label
+        @collection ||= @obj.collection.to_liquid
       end
 
       def excerpt
@@ -33,11 +33,11 @@ module Bridgetown
       end
 
       def previous
-        @obj.previous_doc.to_liquid
+        @previous ||= @obj.previous_doc.to_liquid
       end
 
       def next
-        @obj.next_doc.to_liquid
+        @next ||= @obj.next_doc.to_liquid
       end
 
       # Generate a Hash for use in generating JSON.
@@ -48,6 +48,9 @@ module Bridgetown
       # Returns a Hash ready for JSON generation.
       def hash_for_json(state = nil)
         to_h.tap do |hash|
+          # use collection label in the hash
+          hash["collection"] = hash["collection"]["label"] if hash["collection"]
+
           if state && state.depth >= 2
             hash["previous"] = collapse_document(hash["previous"]) if hash["previous"]
             hash["next"]     = collapse_document(hash["next"]) if hash["next"]

data/lib/bridgetown-core/drops/url_drop.rb

@@ -19,8 +19,8 @@ module Bridgetown
       end
 
       def title
-        Utils.slugify(@obj.data["slug"], :mode => "pretty", :cased => true) ||
-          Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true)
+        Utils.slugify(@obj.data["slug"], mode: "pretty", cased: true) ||
+          Utils.slugify(@obj.basename_without_ext, mode: "pretty", cased: true)
       end
 
       def slug

data/lib/bridgetown-core/filters.rb

@@ -60,7 +60,7 @@ module Bridgetown
     # Returns the given filename or title as a lowercase URL String.
     # See Utils.slugify for more detail.
     def slugify(input, mode = nil)
-      Utils.slugify(input, :mode => mode)
+      Utils.slugify(input, mode: mode)
     end
 
     # XML escape a string for use. Replaces any special characters with
@@ -75,7 +75,7 @@ module Bridgetown
     #
     # Returns the escaped String.
     def xml_escape(input)
-      input.to_s.encode(:xml => :attr).gsub(%r!\A"|"\Z!, "")
+      input.to_s.encode(xml: :attr).gsub(%r!\A"|"\Z!, "")
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters

data/lib/bridgetown-core/hooks.rb

@@ -6,41 +6,41 @@ module Bridgetown
 
     # compatibility layer for octopress-hooks users
     PRIORITY_MAP = {
-      :low    => 10,
-      :normal => 20,
-      :high   => 30,
+      low: 10,
+      normal: 20,
+      high: 30,
     }.freeze
 
     # initial empty hooks
     @registry = {
-      :site      => {
-        :after_init  => [],
-        :after_reset => [],
-        :post_read   => [],
-        :pre_render  => [],
-        :post_render => [],
-        :post_write  => [],
+      site: {
+        after_init: [],
+        after_reset: [],
+        post_read: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
       },
-      :pages     => {
-        :post_init   => [],
-        :pre_render  => [],
-        :post_render => [],
-        :post_write  => [],
+      pages: {
+        post_init: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
       },
-      :posts     => {
-        :post_init   => [],
-        :pre_render  => [],
-        :post_render => [],
-        :post_write  => [],
+      posts: {
+        post_init: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
       },
-      :documents => {
-        :post_init   => [],
-        :pre_render  => [],
-        :post_render => [],
-        :post_write  => [],
+      documents: {
+        post_init: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
       },
-      :clean     => {
-        :on_obsolete => [],
+      clean: {
+        on_obsolete: [],
       },
     }
 
@@ -67,10 +67,10 @@ module Bridgetown
     # 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_render => [],
-        :post_write  => [],
+        post_init: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
       }
 
       unless @registry[owner][event]

data/lib/bridgetown-core/liquid_renderer/file.rb

@@ -10,7 +10,7 @@ module Bridgetown
 
       def parse(content)
         measure_time do
-          @renderer.cache[@filename] ||= Liquid::Template.parse(content, :line_numbers => true)
+          @renderer.cache[@filename] ||= Liquid::Template.parse(content, line_numbers: true)
         end
         @template = @renderer.cache[@filename]
 

data/lib/bridgetown-core/liquid_renderer/table.rb

@@ -28,7 +28,7 @@ module Bridgetown
           data.each { |row| t << row }
           t << :separator
           t << footer
-          t.style = { :alignment => :right, :border_top => false, :border_bottom => false }
+          t.style = { alignment: :right, border_top: false, border_bottom: false }
           t.align_column(0, :left)
         end
 

data/lib/bridgetown-core/log_adapter.rb

@@ -5,10 +5,10 @@ module Bridgetown
     attr_reader :writer, :messages, :level
 
     LOG_LEVELS = {
-      :debug => ::Logger::DEBUG,
-      :info  => ::Logger::INFO,
-      :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR,
+      debug: ::Logger::DEBUG,
+      info: ::Logger::INFO,
+      warn: ::Logger::WARN,
+      error: ::Logger::ERROR,
     }.freeze
 
     # Public: Create a new instance of a log writer

data/lib/bridgetown-core/page.rb

@@ -124,9 +124,9 @@ module Bridgetown
     # Returns the String url.
     def url
       @url ||= URL.new(
-        :template     => template,
-        :placeholders => url_placeholders,
-        :permalink    => permalink
+        template: template,
+        placeholders: url_placeholders,
+        permalink: permalink
       ).to_s
     end
 
@@ -134,9 +134,9 @@ module Bridgetown
     # desired placeholder replacements. For details see "url.rb"
     def url_placeholders
       {
-        :path       => @dir,
-        :basename   => basename,
-        :output_ext => output_ext,
+        path: @dir,
+        basename: basename,
+        output_ext: output_ext,
       }
     end
 

data/lib/bridgetown-core/plugin.rb

@@ -3,11 +3,11 @@
 module Bridgetown
   class Plugin
     PRIORITIES = {
-      :low     => -10,
-      :highest => 100,
-      :lowest  => -100,
-      :normal  => 0,
-      :high    => 10,
+      low: -10,
+      highest: 100,
+      lowest: -100,
+      normal: 0,
+      high: 10,
     }.freeze
 
     #

data/lib/bridgetown-core/reader.rb

@@ -70,7 +70,10 @@ module Bridgetown
     def retrieve_posts(dir)
       return if outside_configured_directory?(dir)
 
-      site.posts.docs.concat(post_reader.read_posts(dir))
+      post_reader.read_posts(dir).tap do |entries|
+        site.posts.docs.concat(entries.select { |entry| entry.is_a?(Document) })
+        site.posts.files.concat(entries.select { |entry| entry.is_a?(StaticFile) })
+      end
     end
 
     # Recursively traverse directories with the read_directories function.

data/lib/bridgetown-core/readers/data_reader.rb

@@ -55,13 +55,13 @@ module Bridgetown
       case File.extname(path).downcase
       when ".csv"
         CSV.read(path,
-                 :headers  => true,
-                 :encoding => site.config["encoding"]).map(&:to_hash)
+                 headers: true,
+                 encoding: site.config["encoding"]).map(&:to_hash)
       when ".tsv"
         CSV.read(path,
-                 :col_sep  => "\t",
-                 :headers  => true,
-                 :encoding => site.config["encoding"]).map(&:to_hash)
+                 col_sep: "\t",
+                 headers: true,
+                 encoding: site.config["encoding"]).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end

data/lib/bridgetown-core/readers/post_reader.rb

@@ -25,8 +25,8 @@ module Bridgetown
     # Returns nothing.
     def read_publishable(dir, magic_dir, matcher)
       read_content(dir, magic_dir, matcher)
-        .tap { |docs| docs.each(&:read) }
-        .select { |doc| processable?(doc) }
+        .tap { |entries| entries.select { |entry| entry.respond_to?(:read) }.each(&:read) }
+        .select { |entry| processable?(entry) }
     end
 
     # Read all the content files from <source>/<dir>/magic_dir
@@ -40,18 +40,38 @@ module Bridgetown
     # Returns klass type of content files
     def read_content(dir, magic_dir, matcher)
       @site.reader.get_entries(dir, magic_dir).map do |entry|
-        next unless matcher.match?(entry)
-
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
-        Document.new(path,
-                     :site       => @site,
-                     :collection => @site.posts)
+
+        if matcher.match?(entry) || Utils.has_yaml_header?(path)
+          # Process as Document
+          Document.new(path,
+                       site: @site,
+                       collection: @site.posts)
+        else
+          # Process as Static File
+          read_static_file(
+            path,
+            File.join(dir, magic_dir, File.dirname(entry).sub(".", ""))
+          )
+        end
       end.reject(&:nil?)
     end
 
     private
 
+    def read_static_file(full_path, relative_dir)
+      StaticFile.new(
+        site,
+        site.source,
+        relative_dir,
+        File.basename(full_path),
+        @site.posts
+      )
+    end
+
     def processable?(doc)
+      return true if doc.is_a?(StaticFile)
+
       if doc.content.nil?
         Bridgetown.logger.debug "Skipping:", "Content in #{doc.relative_path} is nil"
         false

data/lib/bridgetown-core/related_posts.rb

@@ -27,7 +27,7 @@ module Bridgetown
 
     def build_index
       self.class.lsi ||= begin
-        lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
+        lsi = ClassifierReborn::LSI.new(auto_rebuild: false)
         Bridgetown.logger.info("Populating LSI...")
 
         site.posts.docs.each do |x|

data/lib/bridgetown-core/renderer.rb

@@ -69,9 +69,9 @@ module Bridgetown
     # rubocop: disable Metrics/AbcSize
     def render_document
       info = {
-        :registers        => { :site => site, :page => payload["page"] },
-        :strict_filters   => liquid_options["strict_filters"],
-        :strict_variables => liquid_options["strict_variables"],
+        registers: { site: site, page: payload["page"] },
+        strict_filters: liquid_options["strict_filters"],
+        strict_variables: liquid_options["strict_variables"],
       }
 
       output = document.content

data/lib/bridgetown-core/static_file.rb

@@ -41,12 +41,7 @@ module Bridgetown
     # Returns source file path.
     def path
       @path ||= begin
-        # Static file is from a collection inside custom collections directory
-        if !@collection.nil? && !@site.config["collections_dir"].empty?
-          File.join(*[@base, @site.config["collections_dir"], @dir, @name].compact)
-        else
-          File.join(*[@base, @dir, @name].compact)
-        end
+        File.join(*[@base, @dir, @name].compact)
       end
     end
 
@@ -125,11 +120,11 @@ module Bridgetown
 
     def placeholders
       {
-        :collection => @collection.label,
-        :path       => cleaned_relative_path,
-        :output_ext => "",
-        :name       => "",
-        :title      => "",
+        collection: @collection.label,
+        path: cleaned_relative_path,
+        output_ext: "",
+        name: "",
+        title: "",
       }
     end
 
@@ -149,7 +144,7 @@ module Bridgetown
       @cleaned_relative_path ||= begin
         cleaned = relative_path[0..-extname.length - 1]
         cleaned.gsub!(%r!\.*\z!, "")
-        cleaned.sub!(@collection.relative_directory, "") if @collection
+        cleaned.sub!(@collection.relative_path, "") if @collection
         cleaned
       end
     end
@@ -159,12 +154,12 @@ module Bridgetown
     # be overriden in the collection's configuration in bridgetown.config.yml.
     def url
       @url ||= begin
-        base = if @collection.nil?
+        base = if @collection.nil? || @collection.label == "posts"
                  cleaned_relative_path
                else
                  Bridgetown::URL.new(
-                   :template     => @collection.url_template,
-                   :placeholders => placeholders
+                   template: @collection.url_template,
+                   placeholders: placeholders
                  )
                end.to_s.chomp("/")
         base << extname

data/lib/bridgetown-core/tags/highlight.rb

@@ -82,11 +82,11 @@ module Bridgetown
       def render_rouge(code)
         require "rouge"
         formatter = ::Rouge::Formatters::HTMLLegacy.new(
-          :line_numbers => @highlight_options[:linenos],
-          :wrap         => false,
-          :css_class    => "highlight",
-          :gutter_class => "gutter",
-          :code_class   => "code"
+          line_numbers: @highlight_options[:linenos],
+          wrap: false,
+          css_class: "highlight",
+          gutter_class: "gutter",
+          code_class: "code"
         )
         lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         formatter.format(lexer.lex(code))

data/lib/bridgetown-core/utils.rb

@@ -212,7 +212,7 @@ module Bridgetown
         string = I18n.transliterate(string)
       end
 
-      slug = replace_character_sequence_with_hyphen(string, :mode => mode)
+      slug = replace_character_sequence_with_hyphen(string, mode: mode)
 
       # Remove leading/trailing hyphen
       slug.gsub!(%r!^\-|\-$!i, "")

data/lib/bridgetown-core/utils/ansi.rb

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

data/lib/bridgetown-core/utils/platforms.rb

@@ -7,7 +7,7 @@ module Bridgetown
 
       # TODO: jruby is NOT supported by Bridgetown. This should probably
       # get removed.
-      { :jruby? => "jruby", :mri? => "ruby" }.each do |k, v|
+      { jruby?: "jruby", mri?: "ruby" }.each do |k, v|
         define_method k do
           ::RUBY_ENGINE == v
         end
@@ -55,7 +55,7 @@ module Bridgetown
       # platforms. This is mostly useful for `bridgetown doctor` and for testing
       # where we kick off certain tests based on the platform.
 
-      { :osx? => %r!darwin|mac os!, :unix? => %r!solaris|bsd! }.each do |k, v|
+      { osx?: %r!darwin|mac os!, unix?: %r!solaris|bsd! }.each do |k, v|
         define_method k do
           !!(
             RbConfig::CONFIG["host_os"] =~ v

data/lib/bridgetown-core/utils/win_tz.rb

@@ -30,7 +30,7 @@ module Bridgetown
         #
         # Format the hour as a two-digit number.
         # Establish the minutes based on modulo expression.
-        hh = format("%<hour>02d", :hour => absolute_hour(difference).ceil)
+        hh = format("%<hour>02d", hour: absolute_hour(difference).ceil)
         mm = modulo.zero? ? "00" : "30"
 
         Bridgetown.logger.debug "Timezone:", "#{timezone} #{offset}#{hh}:#{mm}"

data/lib/bridgetown-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/bridgetown-core/watcher.rb

@@ -9,23 +9,17 @@ module Bridgetown
     # Public: Continuously watch for file changes and rebuild the site
     # whenever a change is detected.
     #
-    # If the optional site argument is populated, that site instance will be
-    # reused and the options Hash ignored. Otherwise, a new site instance will
-    # be instantiated from the options Hash and used.
-    #
+    # site    - The current site instance
     # options - A Hash containing the site configuration
-    # site    - The current site instance (populated starting with Bridgetown 3.2)
-    #           (optional, default: nil)
     #
     # Returns nothing.
-    def watch(options, site = nil)
+    def watch(site, options)
       ENV["LISTEN_GEM_DEBUGGING"] ||= "1" if options["verbose"]
 
-      site ||= Bridgetown::Site.new(options)
       listener = build_listener(site, options)
       listener.start
 
-      Bridgetown.logger.info "Auto-regeneration:", "enabled for '#{options["source"]}'"
+      Bridgetown.logger.info "Auto-regeneration:", "enabled."
 
       unless options["serving"]
         trap("INT") do
@@ -45,8 +39,8 @@ module Bridgetown
     def build_listener(site, options)
       Listen.to(
         options["source"],
-        :ignore        => listen_ignore_paths(options),
-        :force_polling => options["force_polling"],
+        ignore: listen_ignore_paths(options),
+        force_polling: options["force_polling"],
         &listen_handler(site)
       )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable