Make urls generate based on the path given at write time

lib/dimples/sources/base.rb

@@ -31,11 +31,13 @@ def parse_metadata(contents)
       end
 
       def write(output_path = nil, metadata = {})
-        output = render(metadata)
-
         output_path = File.join(output_directory, filename) if output_path.nil?
         output_dir = File.dirname(output_path)
 
+        @metadata[:url] = url_for(output_dir)
+
+        output = render(metadata)
+
         FileUtils.mkdir_p(output_dir) unless File.directory?(output_dir)
         File.write(output_path, output)
       end
@@ -54,8 +56,8 @@ def output_directory
         @site.config[:output][:root]
       end
 
-      def url
-        @metadata[:url] || output_directory.gsub(@site.config[:output][:root], '')
+      def url_for(path)
+        path.gsub(@site.config[:output][:root], '').concat('/')
       end
 
       def template

lib/dimples/sources/page.rb

@@ -12,7 +12,7 @@ def output_directory
       end
 
       def url
-        @metadata[:url] || super.tap do |url|
+        super.tap do |url|
           url.concat(filename) unless filename == 'index.html'
         end
       end

lib/dimples/sources/post.rb

@@ -8,7 +8,11 @@ def output_directory
         @output_directory ||= File.dirname(@path).gsub(
           @site.config[:sources][:posts],
           @site.config[:output][:posts]
-        ).concat("/#{@metadata[:slug]}/")
+        ).concat("/#{slug}/")
+      end
+
+      def slug
+        File.basename(@path)
       end
 
       def template