lib/jekyll/favicon/static_file.rb in jekyll-favicon-1.0.0.pre.1 vs lib/jekyll/favicon/static_file.rb in jekyll-favicon-1.0.0.pre.2

- old
+ new

@@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'pathname' -require 'forwardable' -require 'jekyll/static_file' -require 'jekyll/favicon/static_file/sourceable' -require 'jekyll/favicon/static_file/taggable' -require 'jekyll/favicon/static_file/referenceable' -require 'jekyll/favicon/utils' -require 'jekyll/favicon/configuration' +require "pathname" +require "forwardable" +require "jekyll/static_file" +require "jekyll/favicon/static_file/sourceable" +require "jekyll/favicon/static_file/taggable" +require "jekyll/favicon/static_file/referenceable" +require "jekyll/favicon/utils" +require "jekyll/favicon/configuration" module Jekyll module Favicon # Class for static files from with spec dictionary # Modify source from spec source @@ -21,11 +21,11 @@ include StaticFile::Referenceable attr_reader :spec, :site def initialize(site, spec = {}) - raise StandardError unless spec.include? 'name' + raise StandardError unless spec.include? "name" @spec = spec spec_dir, spec_name = File.split spec_relative_path super site, site.source, spec_dir, spec_name end @@ -41,13 +41,13 @@ def patch(configuration) taggable_patch spec_patch configuration end def href - Pathname.new('/') - .join(url) - .to_s + Pathname.new("/") + .join(*[site.baseurl, url].compact) + .to_s end private def spec_patch(configuration) @@ -60,15 +60,15 @@ end end end def site_dir - site_configuration.fetch('dir', '.') + site_configuration.fetch("dir", ".") end def site_background - site_configuration.fetch('background', 'transparent') + site_configuration.fetch("background", "transparent") end def site_configuration Configuration.merged site end @@ -78,20 +78,20 @@ end def spec_relative_pathname return spec_pathname if spec_pathname.relative? - pathname.relative_path_from '/' + pathname.relative_path_from "/" end def spec_pathname Pathname.new(site_dir) - .join(*spec_dir_name) + .join(*spec_dir_name) end def spec_dir_name - spec.values_at('dir', 'name') - .compact + spec.values_at("dir", "name") + .compact end end end end