@@ -43,7 +43,7 @@ class ArticleDrop < BaseDrop end def url - @url ||= absolute_url(@site.permalink_for(@source)) + @url ||= absolute_url(@site.permalink_for(@source)[1..-1]) end def comments_feed_url app/drops/article_drop.rb @@ -112,8 +112,8 @@ module Mephisto old_published = article.published_at article.published_at ||= Time.now.utc article.article_id ||= article.id - permalink_style.split('/').inject [''] do |s, piece| - s << ((name = variable_format?(piece)) && PERMALINK_OPTIONS.keys.include?(name.to_sym) ? variable_value_for(article, name) : piece) + '/' + permalink_style.split('/').collect! do |piece| + (name = variable_format?(piece)) && PERMALINK_OPTIONS.keys.include?(name.to_sym) ? variable_value_for(article, name) : piece end.join('/') ensure article.published_at = old_published lib/mephisto/dispatcher.rb @@ -1,5 +1,33 @@ require File.dirname(__FILE__) + '/../test_helper' +['', '/blog'].each do |root| + context "Article Drop with relative root = #{root.inspect}" do + fixtures :sites, :sections, :contents, :assigned_sections, :users, :tags, :taggings, :assigned_assets, :assets + + setup do + @context = mock_context('site' => sites(:first).to_liquid) + @article = contents(:welcome).to_liquid(:mode => :single) + @article.context = @context + Mephisto::Liquid::UrlMethods.stubs(:relative_url_root).returns(root) + end + + specify "should show article url" do + t = Time.now.utc - 3.days + assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto", @article.url + end + + specify "should show comments feed url" do + t = Time.now.utc - 3.days + assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/comments.xml", @article.comments_feed_url + end + + specify "should change feed url" do + t = Time.now.utc - 3.days + assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/changes.xml", @article.changes_feed_url + end + end +end + context "Article Drop" do fixtures :sites, :sections, :contents, :assigned_sections, :users, :tags, :taggings, :assigned_assets, :assets @@ -71,21 +99,6 @@ context "Article Drop" do assert_equal '<p>body</p>', a.send(:body_for_mode, :list) end - specify "should show article url" do - t = Time.now.utc - 3.days - assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto", @article.url - end - - specify "should show comments feed url" do - t = Time.now.utc - 3.days - assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/comments.xml", @article.comments_feed_url - end - - specify "should change feed url" do - t = Time.now.utc - 3.days - assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/changes.xml", @article.changes_feed_url - end - specify "should show taggable tags" do assert_equal %w(rails), contents(:another).to_liquid.tags end test/unit/article_drop_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../test_helper' class SectionDropTest < Test::Unit::TestCase - fixtures :sites, :sections, :contents + fixtures :sites, :sections, :contents, :assigned_sections def test_equality section = sections(:home).to_liquid test/unit/section_drop_test.rb 281dd17cb2b7a970260b27bbdc5e7d24e7220633 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/e668bea7af08a86c26f0b856b8f52555a37f2154 e668bea7af08a86c26f0b856b8f52555a37f2154 2008-03-30T23:16:27-07:00 2008-03-30T23:16:27-07:00 fix bug where ArticleDrop#url was passing absolute urls to the #absolute_url helper 1c56460891451ec6621ad793059a6dbcb9b1003d rick technoweenie@gmail.com