Fix #178: Respect Jekyll#config["baseurl"] when prefixing the path.

lib/jekyll/assets/env.rb

@@ -52,20 +52,24 @@ def extra_assets
       end
 
       def cdn?() !dev? && !!asset_config["cdn"] end
+      def baseurl() jekyll.config["baseurl"] || "" end
       def dev?() %W(development test).include? Jekyll.env end
       def compress?(what) !!asset_config["compress"][what] end
       def asset_config() jekyll.config["assets"] ||= {} end
       def digest?() !!asset_config["digest"] end
       def prefix() asset_config["prefix"] end
 
-      def prefix_path(path = nil)
+      def prefix_path(path = "")
         prefix = cdn? && asset_config["skip_prefix_with_cdn"] ? "" : self.prefix
+        path   = [baseurl, prefix, path]
         if cdn? && (cdn = asset_config["cdn"])
-          return File.join(cdn, prefix) if !path
-          File.join(cdn, prefix, path)
+          File.join(cdn, *path).chomp(
+            "/"
+          )
         else
-          return prefix if !path
-          File.join(prefix, path)
+          File.join(*path).chomp(
+            "/"
+          )
         end
       end
 

spec/lib/jekyll/assets/env_spec.rb

@@ -42,6 +42,12 @@
     expect(@env.prefix_path).to eq "/assets"
   end
 
+  it "uses Jekylls baseurl when prefixing the url" do
+    @env.jekyll.config["baseurl"] = "/hello"
+    expect(@env.prefix_path).to eq "/hello/assets"
+    @env.jekyll.config["baseurl"] = ""
+  end
+
   it "digests by default in production" do
     allow(Jekyll).to receive(:env).and_return "production"
     expect(uncached_env.digest?).to be true