typo 5.4 → 5.4.1

data/spec/controllers/comments_controller_spec.rb

@@ -66,14 +66,6 @@ describe CommentsController, 'create' do
     post :create, :comment => comment, :article_id => contents(:article1).id
   end
 
-  it "should throw an error if sp_allow_non_ajax_comments is false and there are no xhr headers" do
-    b = blogs(:default)
-    b.sp_allow_non_ajax_comments = false
-    b.save
-    make_the_request
-    response.response_code.should == 400
-  end
-
   it "should redirect to the article" do
     make_the_request
     response.should redirect_to("#{blogs(:default).base_url}/#{contents(:article1).created_at.year}/#{sprintf("%.2d", contents(:article1).created_at.month)}/#{sprintf("%.2d", contents(:article1).created_at.day)}/#{contents(:article1).permalink}")
@@ -87,15 +79,6 @@ describe CommentsController, 'AJAX creation' do
     xhr :post, :create, :comment => comment, :article_id => contents(:article1).id
   end
 
-  it "should be be successful if blog.sp_allow_non_ajax_comments is false" do
-    b = blogs(:default)
-    b.sp_allow_non_ajax_comments = false
-    b.save
-    b.sp_allow_non_ajax_comments.should_not be_true
-    make_the_request
-    response.should be_success
-  end
-
   it "should render the comment partial" do
     make_the_request
     response.should render_template("/articles/_comment")

data/spec/controllers/xml_controller_spec.rb

@@ -147,11 +147,6 @@ describe XmlController do
     assert_response :redirect
   end
 
-#  it "test_bad_format" do
-#    get :feed, :format => 'atom04', :type => 'feed'
-#    assert_response :missing
-#  end
-
   it "test_bad_type" do
     get :feed, :format => 'rss20', :type => 'foobar'
     assert_response :missing

data/spec/factories.rb

@@ -1,8 +1,13 @@
 require 'factory_girl'
 
+Factory.sequence :user do |n|
+  "user#{n}"
+end
+
 Factory.define :user do |u|
-  u.login 'shingara'
-  u.email 'cyril.mougel@gmail.com'
+  u.login { Factory.next(:user) }
+  u.email 'some.where@out.there'
+  u.password 'top-secret'
 end
 
 Factory.define :article do |a|
@@ -10,7 +15,7 @@ Factory.define :article do |a|
   a.body 'A content with several data'
   a.permalink 'a-big-article'
   a.published_at Time.now
-  a.user Factory.build(:user)
+  a.association :user, :factory => :user
 end
 
 Factory.define :second_article, :parent => :article do |a|

data/spec/models/article_spec.rb

@@ -15,12 +15,19 @@ describe Article do
     it 'should second_article factory valid' do
       Factory(:second_article).should be_valid
       Factory.build(:second_article).should be_valid
-
     end
     it 'should article_with_accent_in_html' do
       Factory(:article_with_accent_in_html).should be_valid
       Factory.build(:article_with_accent_in_html).should be_valid
     end
+    it 'should store user too' do
+      a = Factory(:article)
+      Article.find(a.id).user.should_not be_nil
+    end
+    it 'should multiple article factory valid' do
+      Factory(:article).should be_valid
+      Factory(:article).should be_valid
+    end
   end
 
   def assert_results_are(*expected)
@@ -307,7 +314,7 @@ describe Article do
   end
 
   describe 'body_and_extended' do
-    before :each do 
+    before :each do
       @article = contents(:article1)
     end
 
@@ -358,7 +365,7 @@ describe Article do
   end
 
   describe 'body_and_extended=' do
-    before :each do 
+    before :each do
       @article = contents(:article1)
     end
 
@@ -367,7 +374,7 @@ describe Article do
       @article.body.should == 'foo'
       @article.extended.should == 'bar'
     end
-    
+
     it 'should remove newlines around <!--more-->' do
       @article.body_and_extended = "foo\n<!--more-->\nbar"
       @article.body.should == 'foo'
@@ -442,4 +449,24 @@ describe Article do
       Article.published_at_like(2.month.ago.strftime('%Y-%m-%d')).map(&:id).sort.should == [@article_two_month_ago.id].sort
     end
   end
+
+  describe '#has_child?' do
+    it 'should be true if article has one to link it by parent_id' do
+      Factory(:article, :parent_id => contents(:article1).id)
+      contents(:article1).should be_has_child
+    end
+    it 'should be false if article has no article to link it by parent_id' do
+      contents(:article1).should_not be_has_child
+    end
+  end
+
+  describe 'self#last_draft(id)' do
+    it 'should return article if no draft associated' do
+      Article.last_draft(contents(:article1).id).should == contents(:article1)
+    end
+    it 'should return draft associated to this article if there are one' do
+      draft = Factory(:article, :parent_id => contents(:article1).id, :state => 'draft')
+      Article.last_draft(contents(:article1).id).should == draft
+    end
+  end
 end

data/spec/models/configuration_spec.rb

@@ -23,10 +23,6 @@ describe 'Given a new blog' do
     @blog.sp_article_auto_close.should == 0
   end
 
-  it "#sp_allow_non_ajax_comments should be false" do
-    @blog.should be_sp_allow_non_ajax_comments
-  end
-
   it "#sp_url_limit should be 0" do
     @blog.sp_url_limit.should == 0
   end

data/spec/models/user_spec.rb

@@ -1,5 +1,18 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+describe User do
+  describe 'Factory Girl' do
+    it 'should user factory valid' do
+      Factory.create(:user).should be_valid
+      Factory.build(:user).should be_valid
+    end
+    it 'should multiple user factory valid' do
+      Factory.create(:user).should be_valid
+      Factory.create(:user).should be_valid
+    end
+  end
+end
+
 describe 'With the contents and users fixtures loaded' do
   before(:each) do
     User.stub!(:salt).and_return('change-me')

data/spec/spec_helper.rb

@@ -53,6 +53,19 @@ def this_blog
   Blog.default || Blog.create!
 end
 
+# test standard view and all themes
+def with_each_theme
+  yield nil, ""
+  Dir.new(File.join(RAILS_ROOT, "themes")).each do |theme|
+    next if theme =~ /\.\.?/
+    view_path = "#{RAILS_ROOT}/themes/#{theme}/views" 
+    if File.exists?("#{RAILS_ROOT}/themes/#{theme}/helpers/theme_helper.rb")
+      require "#{RAILS_ROOT}/themes/#{theme}/helpers/theme_helper.rb"
+    end
+    yield theme, view_path
+  end
+end
+
 # This test now has optional support for validating the generated RSS feeds.
 # Since Ruby doesn't have a RSS/Atom validator, I'm using the Python source
 # for http://feedvalidator.org and calling it via 'system'.

data/spec/views/articles/index_spec.rb

@@ -1,11 +1,9 @@
 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" : "" 
+with_each_theme do |theme, view_path|
   describe "#{view_path}/articles/index" do
     before(:each) do
-      @controller.view_paths = [ "#{RAILS_ROOT}/themes/#{theme}/views" ] if theme
+      @controller.view_paths.unshift(view_path) if theme
       # we only want to test pagination links
       ActionView::Base.class_eval do
         def article_links(article)
@@ -15,18 +13,18 @@ require File.dirname(__FILE__) + '/../../spec_helper'
         alias :tag_links :article_links
       end
     end
-  
+
     context "normally" do
       before(:each) do
         @controller.action_name = "index"
         assigns[:articles] = Article.paginate(:all, :page => 2, :per_page => 4)
         render "articles/index"
       end
-    
+
       it "should not have pagination link to page 2 without q param" do
         response.should_not have_tag("a[href=?]", "/page/2")
       end
-      
+
       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
@@ -36,7 +34,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
         response.should_not have_tag("p>p", "body")
       end
     end
-    
+
     # *notice
     # this assumptions has "&", i don`t know why, but we want only to test the q= param in link and have separated this test from controller
     context "when search" do
@@ -48,14 +46,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
         assigns[:articles] = Blog.default.articles_matching(params[:q], :page => 2, :per_page => 4)
         render "articles/index"
       end
-    
+
       it "should not have pagination link to page 2 with q param" do
         response.should_not have_tag("a[href=?]", "/search/body?page=2") # *notice
       end
-      
+
       it "should have pagination link to page 1 with q param if on page 2" do
         response.should have_tag("a[href=?]", "/search/body?page=1") # *notice
-      end    
+      end
     end
   end
 end

data/spec/views/articles/read_spec.rb

@@ -1,11 +1,9 @@
 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" : "" 
+with_each_theme do |theme, view_path|
   describe "#{view_path}/articles/read" do
     before(:each) do
-      @controller.view_paths = [ "#{RAILS_ROOT}/themes/#{theme}/views" ] if theme
+      @controller.view_paths.unshift(view_path) if theme
       # we do not want to test article links and such
       ActionView::Base.class_eval do
         def article_links(article)
@@ -18,7 +16,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
   
     context "applying text filters" do
       before(:each) do
-        @controller.action_name = "read"
+        @controller.action_name = "redirect"
         assigns[:article] = contents('article1')
         render "articles/read"
       end

data/test/fixtures/blogs.yml

@@ -32,5 +32,4 @@ default:
     link_to_author: false
     itunes_summary: ""
     comment_text_filter: markdown
-    sp_allow_non_ajax_comments: true
     permalink_format: /%year%/%month%/%day%/%title%

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

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

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

@@ -10,14 +10,16 @@
   </p>
 
   <div class="content">
-    <% if controller.action_name == 'show' or controller.action_name == 'index' %>
+    <% unless controller.action_name == 'redirect' %>
       <% if article.excerpt? %>
         <%= article.excerpt %>
       <% else %>
         <%= article.html(:body) %>
-        <div class="extended">
-          <p><%= link_to_permalink article,"Continue reading..." %></p>
-        </div>
+        <% if article.extended? %>
+          <div class="extended">
+            <p><%= link_to_permalink article,"Continue reading..." %></p>
+          </div>
+        <% end %>
       <% end %>
     <% else %>
       <%= article.html(:body) %>

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

@@ -1,14 +1,16 @@
 <div class="atomentry" id="article-<%= article.id %>">
   <h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
   <div class="content">
-    <% if controller.action_name == 'show' or controller.action_name == 'index' %>
+    <% unless controller.action_name == 'redirect' %>
       <% if article.excerpt? %>
         <%= article.excerpt %>
       <% else %>
         <%= article.html(:body) %>
-        <div class="extended">
-          <p><%= link_to_permalink article,"Continue reading..." %></p>
-        </div>
+        <% if article.extended? %>
+          <div class="extended">
+            <p><%= link_to_permalink article,"Continue reading..." %></p>
+          </div>
+        <% end %>
       <% end %>
     <% else %>
       <%= article.html(:body) %>

data/themes/true-blue-3/views/articles/_article.html.erb

@@ -1,15 +1,17 @@
 <div class='category-excerpt <%= "border" if @article_counter >= 0 %>' id="article-<%= article.id %>">
   <h2><%= (controller.controller_name == 'redirect') ? article.title : link_to_permalink(article,article.title) %></h2>
+  <% unless controller.action_name == 'redirect' %>
     <% if article.excerpt? %>
       <%= article.excerpt %>
     <% else %>
-      <% if article.extended %>
-        <%= article.html(:body) %>
-      <% else %>
-        <%= article.html(:body) %>
-        <%= article.html(:extended) %>
-      <% end %>
+      <%= article.html(:body) %>
     <% end %>
+  <% else %>
+    <%= article.html(:body) %>
+    <% if article.extended? %>
+      <%= article.html(:extended) %>
+    <% end %>
+  <% end %>
   <div class='author'>
     Published on <%= _(article.published_at.utc.strftime(_("%%a, %%d %%b %%Y %%H:%%M", article.published_at.utc))) %>
   </div>

data/themes/true-blue-3/views/categories/_article.html.erb

@@ -1,5 +1,5 @@
 <div class='category-excerpt <%= "border" if @article_counter >= 0 %>' id="article-<%= article.id %>">
-  <h2><%= link_to_permalink(article,article.title %></h2>
+  <h2><%= link_to_permalink(article, article.title) %></h2>
     <% if article.excerpt? %>
       <%= article.excerpt %>
     <% else %>

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

@@ -6,14 +6,16 @@
     </div>
   </div>
   <div class="content">
-    <% if controller.action_name == 'show' or controller.action_name == 'index' %>
+    <% unless controller.action_name == 'redirect' %>
       <% if article.excerpt? %>
         <%= article.excerpt %>
       <% else %>
         <%= article.html(:body) %>
-        <div class="extended">
-          <p><%= link_to_permalink article,"Continue reading..." %></p>
-        </div>
+        <% if article.extended? %>
+          <div class="extended">
+            <p><%= link_to_permalink article,"Continue reading..." %></p>
+          </div>
+        <% end %>
       <% end %>
     <% else %>
       <%= article.html(:body) %>
@@ -22,7 +24,7 @@
       </div>
     <% end %>
   </div>
-  <% if controller.controller_name == "articles" and controller.action_name == "show" %>
+  <% if controller.controller_name == "articles" and controller.action_name == "redirect" %>
   <div class="meta">
     <p class="infos"><small>
       <%= _("This entry was posted on %s", content_tag(:abbr, js_distance_of_time_in_words_to_now(@article.published_at), {:class => 'published', :title => @article.published_at.xmlschema})) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: "5.4"
+  version: 5.4.1
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 +01:00
+date: 2009-12-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,6 @@ files:
 - app/controllers/admin/dashboard_controller.rb
 - app/controllers/admin/feedback_controller.rb
 - app/controllers/admin/pages_controller.rb
-- app/controllers/admin/previews_controller.rb
 - app/controllers/admin/profiles_controller.rb
 - app/controllers/admin/resources_controller.rb
 - app/controllers/admin/settings_controller.rb
@@ -162,8 +161,6 @@ files:
 - app/controllers/content_controller.rb
 - app/controllers/feedback_controller.rb
 - app/controllers/grouping_controller.rb
-- app/controllers/previews_controller.rb
-- app/controllers/redirect_controller.rb
 - app/controllers/tags_controller.rb
 - app/controllers/textfilter_controller.rb
 - app/controllers/theme_controller.rb
@@ -194,7 +191,6 @@ files:
 - app/helpers/content_helper.rb
 - app/helpers/groupings_helper.rb
 - app/helpers/mail_helper.rb
-- app/helpers/redirect_helper.rb
 - app/helpers/sidebar_helper.rb
 - app/helpers/sidebars/plugin_helper.rb
 - app/helpers/tags_helper.rb
@@ -493,6 +489,7 @@ files:
 - db/schema.postgresql.sql
 - db/schema.rb
 - db/schema.sqlite.sql
+- db/schema.sqlite3.sql
 - db/schema.sqlserver.sql
 - db/schema_version
 - db/scripts/fix_permalinks.rb
@@ -564,11 +561,13 @@ files:
 - public/images/admin/input_text_right.jpg
 - public/images/admin/input_text_small_left.jpg
 - public/images/admin/input_text_small_right.jpg
+- public/images/admin/loading.gif
 - public/images/admin/publisher_bottom.jpg
 - public/images/admin/publisher_top.jpg
 - public/images/admin/typologo.gif
 - public/images/calendar_date_select/calendar.gif
 - public/images/close.gif
+- public/images/closelabel.gif
 - public/images/go.png
 - public/images/loading.gif
 - public/images/nextlabel.gif
@@ -921,8 +920,6 @@ files:
 - spec/controllers/backend_controller_spec.rb
 - spec/controllers/categories_controller_spec.rb
 - spec/controllers/comments_controller_spec.rb
-- spec/controllers/previews_controller_spec.rb
-- spec/controllers/redirect_controller_spec.rb
 - spec/controllers/routes/articles_routing_spec.rb
 - spec/controllers/routes/xml_routing_spec.rb
 - spec/controllers/tags_controller_spec.rb
@@ -1184,6 +1181,7 @@ files:
 - themes/typographic/views/articles/index.html.erb
 - themes/typographic/views/articles/read.html.erb
 - themes/typographic/views/theme/static_view_test.html.erb
+- Typo users guide.pdf
 - UPGRADE
 - vendor/akismet/akismet.rb
 - vendor/flickr/flickr.rb