'/' missing in canonical link in the category pages

[floydpink]

First up, thanks heaps for Octopress! Love it!

Here's my setup:
The blog (deployed here) is being published to the /blogs sub-directory of an existing gh-pages branch, whose root has the main site. (As an aside, the rake deploy script has been tweaked slightly to accommodate the main site as well, to the effect that there is a git pull --rebase from gh-pages first, and then a git push).

Running on Windows 7, with Git Bash and Ruby 1.9.3 installed via RubyInstaller.
The blog source is here.

The issue I have is that the canonical link url in the category pages alone, are all with the / between blogs and blog missing.

After source\_includes\head.html was tweaked as below (to see the variables that are in play to generate the canonical url):

   {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
+  <!-- site.url: {{ site.url }} -->
+  <!-- site.permalink: {{ site.permalink }} -->
+  <!-- page.url: {{ page.url }} -->
+  <!-- canonical: {{ canonical }} -->
   <link rel="canonical" href="{{ canonical }}">
   <link href="{{ root_url }}/favicon.png" rel="icon">
   <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">

...here are the excerpts from:

• public\blogs\blog\archives\index.html ( good )

  <!-- site.url: http://flickrdownloadr.com/blogs -->
  <!-- site.permalink: /blog/:year/:month/:day/:title/ -->
  <!-- page.url: /blog/archives/index.html -->
  <!-- canonical: http://flickrdownloadr.com/blogs/blog/archives/ -->
  <link rel="canonical" href="http://flickrdownloadr.com/blogs/blog/archives/">

• public\blogs\index.html ( good )

  <!-- site.url: http://flickrdownloadr.com/blogs -->
  <!-- site.permalink: /blog/:year/:month/:day/:title/ -->
  <!-- page.url: /index.html -->
  <!-- canonical: http://flickrdownloadr.com/blogs/ -->
  <link rel="canonical" href="http://flickrdownloadr.com/blogs/">

• and public\blogs\blog\categories\general ( bad! )

  <!-- site.url: http://flickrdownloadr.com/blogs -->
  <!-- site.permalink: /blog/:year/:month/:day/:title/ -->
  <!-- page.url: blog/categories/general/index.html -->
  <!-- canonical: http://flickrdownloadr.com/blogsblog/categories/general/ -->
  <link rel="canonical" href="http://flickrdownloadr.com/blogsblog/categories/general/">

So, I see that the page.url not starting with a / is what is causing the canonical link in the category pages to be generated incorrectly, but I do not know if this is just me alone or how I could fix this.

Could someone help please?

[footedesign]

I addressed this in Pull #980 if you want to see what I did. Really easy fix.

[floydpink]

@footedesign: It does fix the canonical link, but adds an additional / to all the category links (including in the RSS feed):

The Good:

<link rel="canonical" href="http://www.harimenon.com/blog/categories/blog/">

The side effects:

<a class='category' href='//blog/categories/octopress/'>Octopress</a>, <a class='category' href='//blog/categories/travis-ci/'>Travis-CI</a>, <a class='category' href='//blog/categories/blog/'>blog</a>, <a class='category' href='//blog/categories/technical/'>technical</a>

<footer>
  <span class="categories">posted in <a class='category' href='//blog/categories/octopress/'>Octopress</a>, <a class='category' href='//blog/categories/travis-ci/'>Travis-CI</a>, <a class='category' href='//blog/categories/blog/'>blog</a>, <a class='category' href='//blog/categories/technical/'>technical</a></span>
</footer>

<link href="http://www.harimenon.com//blog/categories/blog/atom.xml" rel="self"/>

[alexkirmse]

Yeah ran into this as well...this, somewhat hackish approach, seemed to work. Adds a forward slash if the page.url contains 'categories':

{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{% if page.url contains 'categories' %}/{% endif %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}

[floydpink]

Thanks @alexkirmse. I have included this into another pull request I have open (#953)

[floydpink]

@alexkirmse: I have enhanced the change a little bit as could be seen here.
It avoids the check for a hard-coded 'categories' and instead goes after site.category_dir

[alexkirmse]

site.category_dir is definitely cleaner, thanks!

[swestcott]

Most recent patch works for me too, thanks.

[parkr]

@floydpink This included in #953?

[floydpink]

@parkr Yep. But that is off of master and not 2.1
If you could take this into both those branches, that would be awesome

Thanks

[floydpink]

Thank you, @parkr