typo 5.0.2 → 5.0.3.98

data/spec/controllers/categories_controller_spec.rb

@@ -8,7 +8,7 @@ describe CategoriesController, "/index" do
     controller.stub!(:template_exists?) \
       .and_return(true)
 
-    this_blog = Blog.new
+    this_blog = Blog.default
     controller.stub!(:this_blog) \
       .and_return(this_blog)
   end
@@ -50,7 +50,7 @@ describe CategoriesController, '/articles/category/foo' do
 
     controller.stub!(:template_exists?) \
       .and_return(true)
-    this_blog = Blog.new
+    this_blog = Blog.default
     controller.stub!(:this_blog) \
       .and_return(this_blog)
   end

data/spec/controllers/comments_controller_spec.rb

@@ -10,8 +10,8 @@ describe CommentsController, "routes" do
       :article_id => 'slug', :action => action}
   end
 
-  it "should recognize GET /articles/2007/10/11/slug/comments" do
-    routes.recognize_path('/articles/2007/10/11/slug/comments', :method => :get).should ==
+  it "should recognize GET /2007/10/11/slug/comments" do
+    routes.recognize_path('/2007/10/11/slug/comments', :method => :get).should ==
       basic_result('index')
   end
 end
@@ -42,12 +42,12 @@ describe "All Requests", :shared => true do
                   :articles                   => @articles,
                   :requested_article          => @article)
 
+
     @article.stub!(:to_param).and_return(['2007', '10', '11', 'slug'])
     Article.stub!(:find).and_return(@article)
 
     Comment.stub!(:find).and_return(@comment)
     Blog.stub!(:find).and_return(@blog)
-#    controller.stub!(:article_path).and_return('/articles/2007/10/11/slug')
   end
 end
 
@@ -130,7 +130,7 @@ describe CommentsController, 'create' do
 
   it "should redirect to the article" do
     make_the_request
-    response.should redirect_to('/articles/2007/10/11/slug')
+    response.should redirect_to('/2007/10/11/slug')
   end
 end
 
@@ -156,18 +156,18 @@ end
 describe CommentsController, 'scoped index' do
   it_should_behave_like "All Requests"
 
-  it "GET /articles/2007/10/11/slug/comments should redirect to /articles/2007/10/11/slug#comments" do
+  it "GET 2007/10/11/slug/comments should redirect to /2007/10/11/slug#comments" do
     do_request :get, 'index'
-    response.should redirect_to("/articles/2007/10/11/slug#comments")
+    response.should redirect_to("/2007/10/11/slug#comments")
   end
 
-  it "GET /articles/2007/10/11/slug/comments.atom should return an atom feed" do
+  it "GET /2007/10/11/slug/comments.atom should return an atom feed" do
     do_request :get, 'index', :format => 'atom'
     response.should be_success
     response.should render_template("articles/_atom_feed")
   end
 
-  it "GET /articles/2007/10/11/slug/comments.rss should return an rss feed" do
+  it "GET /2007/10/11/slug/comments.rss should return an rss feed" do
     do_request :get, 'index', :format => 'rss'
     response.should be_success
     response.should render_template("articles/_rss20_feed")
@@ -175,12 +175,6 @@ describe CommentsController, 'scoped index' do
 end
 
 describe CommentsController, 'GET /comments' do
-  before do
-    @the_mock = mock('blog', :null_object => true)
-    @the_mock.stub!(:lang).and_return('en_US')
-    Blog.stub!(:find).and_return(@the_mock)
-  end
-
   it "should be successful" do
     get 'index'
     response.should be_success
@@ -196,12 +190,6 @@ describe CommentsController, 'GET /comments' do
 end
 
 describe CommentsController, "GET /comments.:format" do
-  before do
-    @the_mock = mock('blog', :null_object => true)
-    @the_mock.stub!(:lang).and_return('en_US')
-    Blog.stub!(:find).and_return(@the_mock)
-  end
-
   it ":format => 'atom' should return an atom feed" do
     get 'index', :format => 'atom'
     response.should be_success

data/spec/controllers/redirect_controller_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../test/test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'redirect_controller'
+
+# Re-raise errors caught by the controller.
+class RedirectController; def rescue_action(e) raise e end; end
+
+describe RedirectController do
+  before do
+    request.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
+  end
+
+  # Replace this with your real tests.
+  def test_redirect
+    get :redirect, :from => "foo/bar"
+    assert_response 301
+    assert_response :redirect, "/someplace/else"
+  end
+
+  def test_url_root_redirect
+    @request.relative_url_root = "/blog"
+    get :redirect, :from => "foo/bar"
+    assert_response 301
+    assert_response :redirect, "/blog/someplace/else"
+
+    get :redirect, :from => "bar/foo"
+    assert_response 301
+    assert_response :redirect, "/blog/someplace/else"
+  end
+
+  def test_no_redirect
+    get :redirect, :from => "something/that/isnt/there"
+    assert_response 404
+  end
+end

data/spec/controllers/tags_controller_spec.rb

@@ -8,7 +8,7 @@ describe TagsController, "/index" do
     controller.stub!(:template_exists?) \
       .and_return(true)
 
-    this_blog = Blog.new
+    this_blog = Blog.default
     controller.stub!(:this_blog) \
       .and_return(this_blog)
   end
@@ -50,7 +50,7 @@ describe TagsController, '/articles/tag/foo' do
 
     controller.stub!(:template_exists?) \
       .and_return(true)
-    this_blog = Blog.new
+    this_blog = Blog.default
     controller.stub!(:this_blog) \
       .and_return(this_blog)
   end

data/spec/controllers/textfilter_controller_spec.rb

@@ -0,0 +1,264 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../test/test_helper'
+require 'textfilter_controller'
+
+require 'flickr_mock'
+
+# Re-raise errors caught by the controller.
+class TextfilterController; def rescue_action(e) raise e end; end
+class ActionController::Base; def rescue_action(e) raise e end; end
+
+describe TextfilterController do
+  before do
+    reset_whiteboard
+
+    get :test_action # set up @url; In Rails 1.0, we can't do url_for without it.
+  end
+
+  def blog
+    blogs(:default)
+  end
+
+  def filter_text(text, filters, filterparams={})
+    TextFilter.filter_text(blog, text, self, filters, filterparams)
+  end
+
+  def whiteboard
+    @whiteboard ||= Hash.new
+  end
+
+  def reset_whiteboard
+    @whiteboard = nil
+  end
+
+  def sparklines_available
+    begin
+      Plugins::Textfilters::SparklineController
+    rescue NameError
+      false
+    end
+  end
+
+  def test_unknown
+    text = filter_text('*foo*',[:unknowndoesnotexist])
+    assert_equal '*foo*', text
+  end
+
+  def test_smartypants
+    text = filter_text('"foo"',[:smartypants])
+    assert_equal '“foo”', text
+  end
+
+  def test_markdown
+    text = filter_text('*foo*', [:markdown])
+    assert_equal '<p><em>foo</em></p>', text
+
+    text = filter_text("foo\n\nbar",[:markdown])
+    assert_equal "<p>foo</p>\n\n<p>bar</p>", text
+  end
+
+  def test_filterchain
+    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
+      filter_text('*"foo"*',[:markdown,:smartypants])
+
+    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
+      filter_text('*"foo"*',[:doesntexist1,:markdown,"doesn't exist 2",:smartypants,:nopenotmeeither])
+  end
+
+  def test_amazon
+    text = filter_text('<a href="amazon:097669400X" title="Rails">Rails book</a>',
+      [:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\" title=\"Rails\">Rails book</a>",
+      text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+
+    text = filter_text('[Rails book](amazon:097669400X)',
+      [:markdown,:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
+      text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+
+
+    text = filter_text("Foo\n\n[Rails book](amazon:097669400X)",
+      [:markdown,:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<p>Foo</p>\n\n<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
+          text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+  end
+
+  def test_flickr
+    assert_equal "<div style=\"float:left\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
+      filter_text('<typo:flickr img="31366117" size="Square" style="float:left"/>',
+        [:macropre,:macropost],
+        {'flickr-user' => 'scott@sigkill.org'})
+
+    # Test default image size
+    assert_equal "<div style=\"\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
+      filter_text('<typo:flickr img="31366117"/>',
+        [:macropre,:macropost],
+        {'flickr-user' => 'scott@sigkill.org'})
+
+    # Test with caption=""
+    assert_equal "<div style=\"\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a></div>",
+      filter_text('<typo:flickr img="31366117" caption=""/>',
+        [:macropre,:macropost],
+        {'flickr-user' => 'scott@sigkill.org'})
+  end
+
+  def test_broken_flickr_link
+    assert_equal %{<div class='broken_flickr_link'>\`notaflickrid\' could not be displayed because: <br />Photo not found</div>},
+      filter_text('<typo:flickr img="notaflickrid" />',
+        [:macropre, :macropost],
+        { 'flickr-user' => 'scott@sigkill.org' })
+  end
+
+  def test_sparkline
+    return unless sparklines_available
+
+    tag = filter_text('<typo:sparkline foo="bar"/>',[:macropre,:macropost])
+    # url_for returns query params in hash order, which isn't stable, so we can't just compare
+    # with a static string.  Yuck.
+    assert tag =~ %r{^<img  src="http://test.host/plugins/filters/sparkline/plot\?(data=|foo=bar|&)+"/>$}
+
+    assert_equal "<img  title=\"aaa\" src=\"http://test.host/plugins/filters/sparkline/plot?data=\"/>",
+      filter_text('<typo:sparkline title="aaa"/>',[:macropre,:macropost])
+
+    assert_equal "<img  style=\"bbb\" src=\"http://test.host/plugins/filters/sparkline/plot?data=\"/>",
+      filter_text('<typo:sparkline style="bbb"/>',[:macropre,:macropost])
+
+    tag = filter_text('<typo:sparkline alt="ccc"/>',[:macropre,:macropost])
+    assert_tag_in tag, :tag => 'img', :attributes => {
+        'alt' => 'ccc',
+        'src' => URI.parse('http://test.host/plugins/filters/sparkline/plot?data=')
+    }, :children => { :count => 0 }
+
+    tag = filter_text('<typo:sparkline type="smooth" data="1 2 3 4"/>',[:macropre,:macropost])
+    assert_tag_in tag, :tag => 'img', :attributes => {
+        'src' => URI.parse('http://test.host/plugins/filters/sparkline/plot?data=1%2C2%2C3%2C4&type=smooth')
+    }, :children => { :count => 0 }
+
+    assert_equal "<img  src=\"http://test.host/plugins/filters/sparkline/plot?data=1%2C2%2C3%2C4%2C5%2C6\"/>",
+      filter_text('<typo:sparkline>1 2 3 4 5 6</typo:sparkline>',[:macropre,:macropost])
+  end
+
+  def test_sparkline_plot
+    return unless sparklines_available
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3'
+    assert_response :success
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot2', :data => '1,2,3'
+    assert_response :missing
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3', :type => 'smooth'
+    assert_response :success
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3', :type => 'instance_methods'
+    assert_response :error
+  end
+
+  def test_code
+    assert_equal %{<div class="typocode"><pre><code class="typocode_default "><notextile>foo-code</notextile></code></pre></div>},
+      filter_text('<typo:code>foo-code</typo:code>',[:macropre,:macropost])
+
+    assert_equal %{<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="ident">foo</span><span class="punct">-</span><span class="ident">code</span></notextile></code></pre></div>},
+      filter_text('<typo:code lang="ruby">foo-code</typo:code>',[:macropre,:macropost])
+
+    assert_equal %{<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="ident">foo</span><span class="punct">-</span><span class="ident">code</span></notextile></code></pre></div> blah blah <div class="typocode"><pre><code class="typocode_xml "><notextile>zzz</notextile></code></pre></div>},
+      filter_text('<typo:code lang="ruby">foo-code</typo:code> blah blah <typo:code lang="xml">zzz</typo:code>',[:macropre,:macropost])
+  end
+
+  def test_code_multiline
+    assert_equal %{\n<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="keyword">class </span><span class="class">Foo</span>\n  <span class="keyword">def </span><span class="method">bar</span>\n    <span class="attribute">@a</span> <span class="punct">=</span> <span class="punct">&quot;</span><span class="string">zzz</span><span class="punct">&quot;</span>\n  <span class="keyword">end</span>\n<span class="keyword">end</span></notextile></code></pre></div>\n},
+      filter_text(%{
+<typo:code lang="ruby">
+class Foo
+  def bar
+    @a = "zzz"
+  end
+end
+</typo:code>
+},[:macropre,:macropost])
+  end
+
+  def test_named_filter
+    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
+      TextFilter.filter_text_by_name(blog, '*"foo"*', 'markdown smartypants')
+  end
+
+  def test_code_plus_markup_chain
+    text = <<-EOF
+*header text here*
+
+<typo:code lang="ruby">
+class test
+  def method
+    "foo"
+  end
+end
+</typo:code>
+
+_footer text here_
+
+EOF
+
+    expects_markdown = <<-EOF
+<p><em>header text here</em></p>
+
+<div class="typocode"><pre><code class="typocode_ruby "><span class="keyword">class </span><span class="class">test</span>
+  <span class="keyword">def </span><span class="method">method</span>
+    <span class="punct">&quot;</span><span class="string">foo</span><span class="punct">&quot;</span>
+  <span class="keyword">end</span>
+<span class="keyword">end</span></code></pre></div>
+
+<p><em>footer text here</em></p>
+EOF
+
+    expects_textile = <<-EOF
+<p><strong>header text here</strong></p>
+
+
+<div class="typocode"><pre><code class="typocode_ruby "><span class="keyword">class </span><span class="class">test</span>
+  <span class="keyword">def </span><span class="method">method</span>
+    <span class="punct">&quot;</span><span class="string">foo</span><span class="punct">&quot;</span>
+  <span class="keyword">end</span>
+<span class="keyword">end</span></code></pre></div>
+
+\t<p><em>footer text here</em></p>
+EOF
+
+    assert_equal expects_markdown.strip, TextFilter.filter_text_by_name(blog, text, 'markdown')
+    assert_equal expects_textile.strip, TextFilter.filter_text_by_name(blog, text, 'textile')
+  end
+
+  def test_lightbox
+    assert_equal "<div style=\"float:left\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_b.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_t.jpg\" width=\"67\" height=\"100\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:67px\">This is Matz, Ruby's creator</p></div>",
+      filter_text('<typo:lightbox img="31366117" thumbsize="Thumbnail" displaysize="Large" style="float:left"/>',
+        [:macropre,:macropost],
+        {})
+
+#     Test default thumb image size
+    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_b.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
+      filter_text('<typo:lightbox img="31366117" displaysize="Large"/>',
+        [:macropre,:macropost],
+        {})
+
+#     Test default display image size
+    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_o.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
+      filter_text('<typo:lightbox img="31366117"/>',
+        [:macropre,:macropost],
+        {})
+
+#     Test with caption=""
+    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_o.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a></div>",
+      filter_text('<typo:lightbox img="31366117" caption=""/>',
+        [:macropre,:macropost],
+        {})
+  end
+end

data/spec/controllers/theme_controller_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../test/test_helper'
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'theme_controller'
+
+# Re-raise errors caught by the controller.
+class ThemeController; def rescue_action(e) raise e end; end
+
+describe ThemeController do
+  integrate_views
+
+  def test_stylesheets
+    get :stylesheets, :filename => "style.css"
+    assert_response :success
+    assert_equal "text/css; charset=utf-8", @response.headers['type']
+    assert_equal "inline; filename=\"style.css\"", @response.headers['Content-Disposition']
+  end
+
+  def test_images
+    get :images, :filename => "bg_white.png"
+    assert_response :success
+    assert_equal "image/png", @response.headers['type']
+    assert_equal "inline; filename=\"bg_white.png\"", @response.headers['Content-Disposition']
+  end
+
+  def test_malicious_path
+    get :stylesheets, :filename => "../../../config/database.yml"
+    assert_response 404
+  end
+
+  def test_view_theming
+    get :static_view_test
+    assert_response :success
+
+    assert @response.body =~ /Static View Test from typographic/
+  end
+
+  def disabled_test_javascript
+    get :stylesheets, :filename => "typo.js"
+    assert_response :success
+    assert_equal "text/javascript", @response.headers['type']
+    assert_equal "inline; filename=\"typo.js\"", @response.headers['Content-Disposition']
+  end
+end