typo 5.2 → 5.2.98

data/spec/models/blog_spec.rb

@@ -44,3 +44,27 @@ describe "Given no blogs" do
     Blog.new.should be_valid
   end
 end
+
+describe "Valid permalink in blog" do
+
+  before :each do
+    @blog = blogs(:default)
+  end
+
+  ['foo', 'year', 'day', 'month', 'title', '%title', 'title%', '/year/month/day/title', '%title%.html.atom', '%title%.html.rss'].each do |permalink_type|
+    it "not valid with #{permalink_type}" do
+      assert_raise  ActiveRecord::RecordInvalid do
+        @blog.permalink_format = permalink_type
+      end
+    end
+  end
+
+  ['%year%', '%day%', '%month%', '%title%', '%title%.html', '/hello/all/%year%/%title%', 'atom/%title%.html', 'ok/rss/%title%.html'].each do |permalink_type|
+    it "should be valid with only #{permalink_type}" do
+      assert_nothing_raised  ActiveRecord::RecordInvalid do
+        @blog.permalink_format = permalink_type
+      end
+    end
+  end
+
+end

data/spec/models/cache_information_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe CacheInformation do
+
+  def cache_information(options={})
+    CacheInformation.new({:path => '/index.html'}.merge(options))
+  end
+
+  it 'should have path attribute' do
+    CacheInformation.new.should respond_to(:path)
+  end
+
+  it 'should be valid' do
+    cache_information.should be_valid
+  end
+
+  it 'should not save without path' do
+    cache_information(:path => nil).should_not be_valid
+  end
+
+  it 'should have path unique' do
+    cache_information.save
+    cache_information.should_not be_valid
+  end
+
+  it 'should destroy file in path when destroy' do
+    file_path = create_file_in_spec_public_cache_directory('index.html')
+    CacheInformation.create!(:path => '/index.html').destroy
+    File.should_not be_exist(file_path)
+  end
+
+  it "should destroy himself if path doesn't exist" do
+    CacheInformation.create!(:path => '/index.html').destroy
+    CacheInformation.find_by_path('/index.html').should be_nil
+  end
+
+  it "should logged in warning the path if path doesn't exist" do
+    Rails.logger.should_receive(:warn).with("path : /index.html no more exist")
+    CacheInformation.create!(:path => '/index.html').destroy
+  end
+
+end

data/spec/models/page_cache_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe PageCache do
+
+  describe 'PageCache#self.sweep_all' do
+
+    before(:each) do
+      all_files = ['/index.html', '/articles.rss', '/sitemap.xml']
+      @all_paths = []
+      all_files.each do |path|
+        @all_paths << create_file_in_spec_public_cache_directory(path)
+        CacheInformation.create!(:path => path)
+      end
+    end
+
+    it 'should destroy all file in cache directory with path' do
+      PageCache.sweep_all
+      @all_paths.each do |path|
+        File.should_not be_exist(path)
+      end
+    end
+
+    it 'should delete all CacheInformation' do
+      PageCache.sweep_all
+      CacheInformation.all.should be_empty
+    end
+
+  end
+
+end

data/spec/models/ping_spec.rb

@@ -126,3 +126,42 @@ describe 'Given a remote site to notify, eg technorati' do
     ping.send_weblogupdatesping('http://myblog.net', 'http://myblog.net/new-post')
   end
 end
+
+describe Ping do
+
+  describe '#send_trackback' do
+
+    it 'should send a trackback without html tag in excerpt' do
+      # contents(:xmltest).body = originally seen on <a href="http://blog.rubyonrails.org/">blog.rubyonrails.org</a>
+      ping = Ping.new(:article_id => contents(:xmltest).id,
+                      :url => 'http://github.com/fdv/typo')
+
+      post = "title=#{CGI.escape("Associations aren't :dependent => true anymore")}"
+      post << "&excerpt=#{CGI.escape("originally seen on blog.rubyonrails.org")}" # not original text see if normal ?
+      post << "&url=#{contents(:xmltest).permalink_url}"
+      post << "&blog_name=#{CGI.escape('test blog')}"
+
+      net_http = mock(Net::HTTP)
+      net_http.should_receive(:post).with('/fdv/typo', post,'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
+      Net::HTTP.should_receive(:start).with('github.com', 80).and_yield(net_http)
+      ping.send_trackback('http://github.com/fdv/typo', contents(:xmltest).permalink_url)
+    end
+
+    it 'should send a trackback without markdown tag in excerpt' do
+      # contents(:markdown_article) #in markdown format\n * we\n * use\n [ok](http://blog.ok.com) to define a link
+      ping = Ping.new(:article_id => contents(:markdown_article).id,
+                      :url => 'http://github.com/fdv/typo')
+
+      post = "title=#{CGI.escape("How made link with markdown")}"
+      post << "&excerpt=#{CGI.escape("in markdown format we use ok to define a link")}" # not original text see if normal ?
+      post << "&url=#{contents(:markdown_article).permalink_url}"
+      post << "&blog_name=#{CGI.escape('test blog')}"
+
+      net_http = mock(Net::HTTP)
+      net_http.should_receive(:post).with('/fdv/typo', post,'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
+      Net::HTTP.should_receive(:start).with('github.com', 80).and_yield(net_http)
+      ping.send_trackback('http://github.com/fdv/typo', contents(:markdown_article).permalink_url)
+    end
+
+  end
+end

data/spec/models/user_spec.rb

@@ -13,14 +13,18 @@ describe 'With the contents and users fixtures loaded' do
     User.authenticate('bob', 'wrong password').should be_nil
   end
 
+  it 'User.authenticate(inactive,valid) returns nil' do
+    User.authenticate('inactive', 'longtest').should be_nil
+  end
+
   it 'User.authenticate(invalid,whatever) returns nil' do
     User.authenticate('userwhodoesnotexist', 'what ever').should be_nil
   end
 
   it 'The various article finders work appropriately' do
-    users(:tobi).articles.size.should == 7
+    users(:tobi).articles.size.should == 8
 #    User.find(1).articles.find_published.size.should == Article.find(:all, :conditions => {:published => true}).size
-    users(:tobi).articles.published.size.should == 6
+    users(:tobi).articles.published.size.should == 7
   end
 
   it 'authenticate? works as expected' do

data/spec/spec_helper.rb

@@ -31,3 +31,17 @@ Spec::Runner.configure do |config|
   # If you declare global fixtures, be aware that they will be declared
   # for all of your examples, even those that don't use them.
 end
+
+def define_spec_public_cache_directory
+  ActionController::Base.page_cache_directory = File.join(Rails.root, 'spec', 'public')
+  unless File.exist? ActionController::Base.page_cache_directory
+    FileUtils.mkdir_p ActionController::Base.page_cache_directory
+  end
+end
+
+def create_file_in_spec_public_cache_directory(file)
+  define_spec_public_cache_directory
+  file_path = File.join(ActionController::Base.page_cache_directory, file)
+  File.open(file_path, 'a').close
+  file_path
+end

data/spec/views/articles/index_spec.rb

@@ -30,6 +30,11 @@ require File.dirname(__FILE__) + '/../../spec_helper'
       it "should have pagination link to page 1 without q param if on page 2" do
         response.should have_tag("a[href=?]", "/page/1")
       end
+
+      it "should not have too many paragraph marks around body" do
+        response.should have_tag("p", "body")
+        response.should_not have_tag("p>p", "body")
+      end
     end
     
     # *notice

data/spec/views/articles/read_spec.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+# test standard view and all themes
+[ nil, "dirtylicious", "scribbish", "standard_issue", "typographic" ].each do |theme|
+  view_path = theme ? "#{RAILS_ROOT}/themes/#{theme}/views" : "" 
+  describe "#{view_path}/articles/read" do
+    before(:each) do
+      @controller.view_paths = [ "#{RAILS_ROOT}/themes/#{theme}/views" ] if theme
+      # we do not want to test article links and such
+      ActionView::Base.class_eval do
+        def article_links(article)
+          ""
+        end
+        alias :category_links :article_links
+        alias :tag_links :article_links
+      end
+    end
+  
+    context "applying text filters" do
+      before(:each) do
+        @controller.action_name = "read"
+        assigns[:article] = contents('article1')
+        render "articles/read"
+      end
+    
+      it "should not have too many paragraph marks around body" do
+        response.should have_tag("p", "body")
+        response.should_not have_tag("p>p", "body")
+      end
+
+      it "should not have too many paragraph marks around extended contents" do
+        response.should have_tag("p", "extended content")
+        response.should_not have_tag("p>p", "extended content")
+      end
+    end
+
+    context "formatting comments" do
+      before(:each) do
+        Blog.default.comment_text_filter = 'textile'
+        @controller.action_name = "read"
+        assigns[:article] = contents('article1')
+        render "articles/read"
+      end
+    
+      it "should not have too many paragraph marks around comment contents" do
+        response.should have_tag("p>em", "italic")
+        response.should have_tag("p>strong", "bold")
+        response.should_not have_tag("p>p>em", "italic")
+      end
+    end
+  end
+end
+

data/spec/views/comments/html_sanitization_spec.rb

@@ -7,7 +7,6 @@ describe "CommentSanitization", :shared => true do
     @blog = mock_model(Blog, :use_gravatar => false)
     @blog.stub!(:lang).and_return('en_US')
     @controller.template.stub!(:this_blog).and_return(@blog)
-    Blog.stub!(:find).and_return(@blog)
 
     prepare_comment
 

data/test/fixtures/blogs.yml

@@ -33,3 +33,4 @@ default:
     itunes_summary: ""
     comment_text_filter: markdown
     sp_allow_non_ajax_comments: true
+    permalink_format: /%year%/%month%/%day%/%title%

data/test/fixtures/contents.yml

@@ -3,7 +3,7 @@
 article1:
   title: Article 1!
   body: body
-  extended: extended content
+  extended: "extended content"
   created_at: <%= (Time.now - 2.days).to_s(:db) %>
   updated_at: <%= (Time.now - 2.days).to_s(:db) %>
   published_at: <%= (Time.now - 2.days).to_s(:db) %>
@@ -17,6 +17,7 @@ article1:
   published: true
   state: published
   tags: foo, bar
+  text_filter: markdown_filter
 
 article2:
   type: Article
@@ -159,6 +160,24 @@ xmltest:
   published: true
   state: published
 
+markdown_article:
+  type: Article
+  title: How made link with markdown
+  body: "in markdown format\n * we\n * use\n [ok](http://blog.ok.com) to define a link"
+  extended: extended content
+  allow_comments: true
+  allow_pings: true
+  permalink: associations-arent-dependent-true-anymore
+  created_at: 2003-04-28 05:31:00
+  updated_at: 2003-04-28 05:31:00
+  published_at: 2003-04-28 05:31:00
+  user: tobi
+  author: Tobi
+  guid: urn:uuid:0d676c66-4135-4a8b-9d65-b6a3248d3033
+  published: true
+  state: published
+  text_filter: markdown_filter
+
 spammed_article:
   type: Article
   title: C'mon Spam Me!

data/test/fixtures/users.yml

@@ -9,7 +9,9 @@ tobi:
   notify_on_new_articles: false
   notify_on_comments: true
   profile: admin
-
+  text_filter: markdown_filter
+  state: active
+  
 bob:
   login: bob
   password: 9a91e1d8d95b6315991a88121bb0aa9f03ba0dfc # test
@@ -19,7 +21,9 @@ bob:
   notify_on_new_articles: true
   notify_on_comments: false
   profile: admin
-
+  text_filter: none_filter
+  state: active
+  
 existingbob:
   login: existingbob
   password: 9a91e1d8d95b6315991a88121bb0aa9f03ba0dfc # test
@@ -29,6 +33,8 @@ existingbob:
   notify_on_new_articles: false
   notify_on_comments: false
   profile: admin
+  text_filter: markdown_filter
+  state: active
 
 longbob:
   login: longbob
@@ -39,7 +45,9 @@ longbob:
   notify_on_new_articles: false
   notify_on_comments: false
   profile: admin
-
+  text_filter: markdown_filter
+  state: active
+  
 randomuser:
   login: randomuser
   password: 8e9b1a9a38e66ca572a5e8fdac8e256848842dfa # longtest
@@ -49,7 +57,9 @@ randomuser:
   notify_on_new_articles: true
   notify_on_comments: true
   profile: admin
-
+  text_filter: none_filter
+  state: active
+  
 user_publisher:
   login: shingara
   password: 8e9b1a9a38e66ca572a5e8fdac8e256848842dfa # longtest
@@ -59,4 +69,17 @@ user_publisher:
   notify_on_new_articles: false
   notify_on_comments: false
   profile: publisher
+  text_filter: markdown_filter
+  state: active
 
+inactive_user:
+  login: inactive
+  password: 8e9b1a9a38e66ca572a5e8fdac8e256848842dfa # longtest
+  name: inactive
+  email: inactive@example.com
+  notify_via_email: false
+  notify_on_new_articles: false
+  notify_on_comments: false
+  profile: publisher
+  text_filter: markdown_filter
+  state: inactive

data/themes/dirtylicious/layouts/default.html.erb

@@ -36,9 +36,6 @@
     	</div>
 
     	<div id="sidebar">
-      	<!-- search comment this when enable live search plugin -->
-      	<%= render :partial => 'shared/search' %>
-
       	<!-- sidebar components -->
       	<%= render_sidebars %>
     	</div>
@@ -48,9 +45,9 @@
   	<div id="footer">
     	<div class="left"><%= link_to this_blog.blog_name, this_blog.base_url %></div>
 			<div class="right">
-        <%= _("Designed by %s ported to typo by %s ", link_to ('Dirtylicious', ' http://templates.arcsin.se/'), 
-        link_to ("Frédéric de Villamil", 'http://fredericdevillamil.com')) %> <br />
-        <%= _("Powered by %s", link_to ('typo', 'http://typosphere.org')) %>
+        <%= _("Designed by %s ported to typo by %s ", link_to('Dirtylicious', ' http://templates.arcsin.se/'), 
+        link_to("Frédéric de Villamil", 'http://fredericdevillamil.com')) %> <br />
+        <%= _("Powered by %s", link_to('typo', 'http://typosphere.org')) %>
 			</div>
 			<div class="clearer"></div>
   	</div>

data/themes/dirtylicious/views/articles/_article.html.erb

@@ -9,14 +9,14 @@
   </div>
 
   <div class="content">
-    <%= simple_format article.html(:body) %>
+    <%= article.html(:body) %>
 
     <% if article.extended? -%>
       <div class="extended">
         <% if controller.action_name == 'index' -%>
           <p><%= link_to_permalink article,"Continue reading..." %></p>
         <% else -%>
-          <%= simple_format article.html(:extended) %>
+          <%= article.html(:extended) %>
         <% end -%>
       </div>
     <% end -%>

data/themes/dirtylicious/views/articles/_comment.html.erb

@@ -5,7 +5,7 @@
     <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:</abbr>
   </div>
   <div class="content">
-    <%= simple_format comment.html %>
+    <%= comment.html %>
   </div>
   <% unless comment.published -%>
   <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>

data/themes/dirtylicious/views/articles/_comment_form.html.erb

@@ -1,4 +1,4 @@
-<% form_remote_tag :url      => comments_path(@article),
+<% form_remote_tag :url      => @article.comment_url,
                     :position => :bottom,
                     :update   => {:success => 'commentList'},
                     :loading  => "loading()",
@@ -30,7 +30,7 @@
     <%= submit_to_remote('preview', 'Preview!',
                          :update => 'preview',
                          :complete => "Element.show('preview')",
-                         :url    => preview_new_comment_path(@article)) %>
+                         :url    => @article.preview_comment_url) %>
     <%= submit_tag 'Submit', :id => 'form-submit-button',  :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
     <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
   </p>