Remove duplicate suffices from posts, fix internal post links, minor tweaks

_plugins/post_baseurl.rb

@@ -0,0 +1,92 @@
+# adapted from
+# - https://github.com/jekyll/jekyll/blob/master/lib/jekyll/tags/post_url.rb
+
+module Jekyll
+  module Tags
+    class PostComparer
+      MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
+
+      attr_reader :path, :date, :slug, :name
+
+      def initialize(name)
+        @name = name
+        all, @path, @date, @slug = *name.sub(/^\//, "").match(MATCHER)
+        raise ArgumentError.new("'#{name}' does not contain valid date and/or title.") unless all
+
+        @name_regex = /^#{path}#{date}-#{slug}\.[^.]+/
+      end
+
+      def ==(other)
+        other.basename.match(@name_regex)
+      end
+
+      def deprecated_equality(other)
+        date = Utils.parse_date(name, "'#{name}' does not contain valid date and/or title.")
+        slug == post_slug(other) &&
+          date.year  == other.date.year &&
+          date.month == other.date.month &&
+          date.day   == other.date.day
+      end
+
+      private
+      # Construct the directory-aware post slug for a Jekyll::Post
+      #
+      # other - the Jekyll::Post
+      #
+      # Returns the post slug with the subdirectory (relative to _posts)
+      def post_slug(other)
+        path = other.basename.split("/")[0...-1].join("/")
+        if path.nil? || path == ""
+          other.data['slug']
+        else
+          path + '/' + other.data['slug']
+        end
+      end
+    end
+
+    class PostBastUrl < Liquid::Tag
+      def initialize(tag_name, post, tokens)
+        super
+        @orig_post = post.strip
+        begin
+          @post = PostComparer.new(@orig_post)
+        rescue
+          raise ArgumentError.new <<-eos
+Could not parse name of post "#{@orig_post}" in tag 'post_url'.
+Make sure the post exists and the name is correct.
+eos
+        end
+      end
+
+      def render(context)
+        site = context.registers[:site]
+
+        site.posts.docs.each do |p|
+          if @post == p
+            return '/' + context.registers[:site].config['baseurl'] + p.url
+          end
+        end
+
+        # New matching method did not match, fall back to old method
+        # with deprecation warning if this matches
+
+        site.posts.docs.each do |p|
+          if @post.deprecated_equality p
+            Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " +
+              "a post using the new matching method of checking name " +
+              "(path-date-slug) equality. Please make sure that you " +
+              "change this tag to match the post's name exactly."
+            return '/' + context.registers[:site].config['baseurl'] + p.url
+          end
+        end
+
+        raise ArgumentError.new <<-eos
+Could not find post "#{@orig_post}" in tag 'post_url'.
+Make sure the post exists and the name is correct.
+eos
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('post_baseurl', Jekyll::Tags::PostBastUrl)

_plugins/post_link.rb

@@ -1,31 +0,0 @@
-require 'jekyll/tags/post_url'
-
-module Jekyll
-    class PostLink < Liquid::Tag
-        def initialize(tag_name, post, tokens)
-            super
-            @orig_post = post.strip
-            begin
-                @post = Jekyll::Tags::PostComparer.new(@orig_post)
-            rescue
-                raise ArgumentError.new <<-eos
-Could not parse name of post "#{@orig_post}" in tag 'post_url'.
-
-Make sure the post exists and the name is correct.
-eos
-            end
-        end
-
-        def render(context)
-            site = context.registers[:site]
-            site.posts.docs.each do |p|
-              if @post == p
-                return '/' + context.registers[:site].config['baseurl'] + p.url
-              end
-            end
-        end
-        
-    end
-end
- 
-Liquid::Template.register_tag('post_link', Jekyll::PostLink)