typo 5.4 → 5.4.1

data/app/controllers/admin/previews_controller.rb

@@ -1,10 +0,0 @@
-class Admin::PreviewsController < Admin::BaseController
-  before_filter :setup_themer
-  
-  def index
-    @article = Article.find(params[:id])
-    
-    render :template => '/articles/read'
-  end
-  
-end

data/app/controllers/previews_controller.rb

@@ -1,10 +0,0 @@
-class PreviewsController < ContentController
-  before_filter :login_required
-  layout :theme_layout
-  
-  def index
-    @article = Article.find(params[:id])
-    
-    render :template => '/articles/read'
-  end
-end

data/app/controllers/redirect_controller.rb

@@ -1,143 +0,0 @@
-class RedirectController < ContentController
-  before_filter :verify_config
-
-  layout :theme_layout
-
-  cache_sweeper :blog_sweeper
-
-  caches_page :redirect, :if => Proc.new {|c|
-    c.request.query_string == ''
-  }
-
-  helper :'admin/base'
-
-  def self.controller_path
-    'articles'
-  end
-
-  def redirect
-    part = this_blog.permalink_format.split('/')
-    part.delete('') # delete all par of / where no data. Avoid all // or / started
-    params[:from].delete('')
-    if params[:from].last =~ /\.atom$/
-      params[:format] = 'atom'
-      params[:from].last.gsub!(/\.atom$/, '')
-    elsif params[:from].last =~ /\.rss$/
-      params[:format] = 'rss'
-      params[:from].last.gsub!(/\.rss$/, '')
-    end
-    zip_part = part.zip(params[:from])
-    article_params = {}
-    zip_part.each do |asso|
-      ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
-        if asso[0] =~ /(.*)#{format_string}(.*)/
-          before_format = $1
-          after_format = $2
-          next if asso[1].nil?
-          result =  asso[1].gsub(before_format, '')
-          result.gsub!(after_format, '')
-          article_params[format_string.gsub('%', '').to_sym] = result
-        end
-      end
-    end
-    begin
-      @article = this_blog.requested_article(article_params)
-    rescue
-      #Not really good. 
-      # TODO :Check in request_article type of DATA made in next step
-    end
-    return show_article if @article
-
-    # Redirect old version with /:year/:month/:day/:title to new format.
-    # because it's change
-    ["%year%/%month%/%day%/%title%".split('/'), "articles/%year%/%month%/%day%/%title%".split('/')].each do |part|
-      part.delete('') # delete all par of / where no data. Avoid all // or / started
-      params[:from].delete('')
-      zip_part = part.zip(params[:from])
-      article_params = {}
-      zip_part.each do |asso|
-        ['%year%', '%month%', '%day%', '%title%'].each do |format_string|
-          if asso[0] =~ /(.*)#{format_string}(.*)/
-            before_format = $1
-            after_format = $2
-            next if asso[1].nil?
-            result =  asso[1].gsub(before_format, '')
-            result.gsub!(after_format, '')
-            article_params[format_string.gsub('%', '').to_sym] = result
-          end
-        end
-      end
-      begin
-        @article = this_blog.requested_article(article_params)
-      rescue
-        #Not really good. 
-        # TODO :Check in request_article type of DATA made in next step
-      end
-      if @article
-        redirect_to @article.permalink_url, :status => 301
-        return
-      end
-    end
-
-
-    # see how manage all by this redirect to redirect in different possible
-    # way maybe define in a controller in admin part in insert in this table
-    r = Redirect.find_by_from_path(params[:from].join("/"))
-
-    if(r)
-      path = r.to_path
-      url_root = self.class.relative_url_root
-      path = url_root + path unless url_root.nil? or path[0,url_root.length] == url_root
-      redirect_to path, :status => 301
-    else
-      render :text => "Page not found", :status => 404
-    end
-  end
-
-
-  private
-
-  # See an article We need define @article before
-  def show_article
-    @comment      = Comment.new
-    @page_title   = @article.title
-    article_meta
-    
-    auto_discovery_feed
-    respond_to do |format|
-      format.html { render :template => '/articles/read' }
-      format.atom { render_feed('atom') }
-      format.rss  { render_feed('rss20') }
-      format.xml  { render_feed('atom') }
-    end
-  rescue ActiveRecord::RecordNotFound
-    error("Post not found...")
-  end
-
-  def render_feed(type)
-    render :partial => "/articles/#{type}_feed", :object => @article.published_feedback 
-  end
-
-  def article_meta
-    @keywords = ""
-    @keywords << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
-    @keywords << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?  
-    @description = "#{@article.title}, " 
-    @description << @article.categories.map { |c| c.name }.join(", ") << ", " unless @article.categories.empty?
-    @description << @article.tags.map { |t| t.name }.join(", ") unless @article.tags.empty?
-    @description << " #{this_blog.blog_name}"
-  end
-
-  # Test in fist time if we need create some data
-  # Use only in bootstraping
-  def verify_config
-    if User.count == 0
-      redirect_to :controller => "accounts", :action => "signup"
-    elsif ! this_blog.configured?
-      redirect_to :controller => "admin/settings", :action => "redirect"
-    else
-      return true
-    end
-  end
-
-end

data/app/helpers/redirect_helper.rb

@@ -1,13 +0,0 @@
-module RedirectHelper
-  def template_path
-    'articles'
-  end
-
-  def feed_rss
-    @article.feed_url(:rss20)
-  end
-
-  def feed_atom
-    @article.feed_url(:atom)
-  end
-end

data/spec/controllers/previews_controller_spec.rb

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe PreviewsController do
-  integrate_views
-
-  describe 'index action' do
-    describe 'with non logged user' do
-      before :each do
-        @request.session = {}
-        get :index, :id => Factory(:article).id
-      end
-
-      it 'should be redirect to login' do
-        response.should redirect_to(:controller => "accounts/login", :action => :index)
-      end
-    end
-    describe 'with logged user' do
-      before :each do
-        @request.session = {:user => users(:tobi).id}
-        get :index, :id => Factory(:article).id
-      end
-
-      it 'should render template /articles/read' do
-        response.should render_template('articles/read.html.erb')
-      end
-    end
-  end
-end

data/spec/controllers/redirect_controller_spec.rb

@@ -1,165 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe RedirectController do
-  before do
-    ActionController::Base.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
-  end
-
-  it 'should split routing path' do
-    assert_routing "foo/bar/baz", {
-      :from => ["foo", "bar", "baz"],
-      :controller => 'redirect', :action => 'redirect'}
-  end
-
-  it 'should redirect from articles_routing' do
-    assert_routing "articles", {
-      :from => ["articles"],
-      :controller => 'redirect', :action => 'redirect'}
-    assert_routing "articles/foo", {
-      :from => ["articles", "foo"],
-      :controller => 'redirect', :action => 'redirect'}
-    assert_routing "articles/foo/bar", {
-      :from => ["articles", "foo", "bar"],
-      :controller => 'redirect', :action => 'redirect'}
-    assert_routing "articles/foo/bar/baz", {
-      :from => ["articles", "foo", "bar", "baz"],
-      :controller => 'redirect', :action => 'redirect'}
-  end
-
-
-  it 'should redirect' do
-    get :redirect, :from => ["foo", "bar"]
-    assert_response 301
-    assert_redirected_to "http://test.host/someplace/else"
-  end
-
-  it 'should redirect with url_root' do
-    ActionController::Base.relative_url_root = "/blog"
-    get :redirect, :from => ["foo", "bar"]
-    assert_response 301
-    assert_redirected_to "http://test.host/blog/someplace/else"
-
-    get :redirect, :from => ["bar", "foo"]
-    assert_response 301
-    assert_redirected_to "http://test.host/blog/someplace/else"
-  end
-
-  it 'should no redirect' do
-    get :redirect, :from => ["something/that/isnt/there"]
-    assert_response 404
-  end
-
-  it 'should redirect to article' do
-    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
-    assert_response 301
-    assert_redirected_to "http://myblog.net/2004/04/01/second-blog-article"
-  end
-
-  it 'should redirect to article with url_root' do
-    b = blogs(:default)
-    b.base_url = "http://test.host/blog"
-    b.save
-    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
-    assert_response 301
-    assert_redirected_to "http://test.host/blog/2004/04/01/second-blog-article"
-  end
-
-  it 'should redirect to article when url_root is articles' do
-    b = blogs(:default)
-    b.base_url = "http://test.host/articles"
-    b.save
-    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
-    assert_response 301
-    assert_redirected_to "http://test.host/articles/2004/04/01/second-blog-article"
-  end
-
-  it 'should redirect to article with articles in url_root' do
-    b = blogs(:default)
-    b.base_url = "http://test.host/aaa/articles/bbb"
-    b.save
-
-    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
-    assert_response 301
-    assert_redirected_to "http://test.host/aaa/articles/bbb/2004/04/01/second-blog-article"
-  end
-
-  describe 'with permalink_format like %title%.html' do
-
-    integrate_views
-
-    before(:each) do
-      b = blogs(:default)
-      b.permalink_format = '/%title%.html'
-      b.save
-    end
-    describe 'render article' do
-
-      integrate_views
-
-      before(:each) do
-        get :redirect, :from => ["#{contents(:article1).permalink}.html"]
-      end
-
-      it 'should render template read to article' do
-        response.should render_template('articles/read.html.erb')
-      end
-
-      it 'should have good rss feed link' do
-        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.rss")
-      end
-
-      it 'should have good atom feed link' do
-        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.atom")
-      end
-
-    end
-
-    it 'should get good article with utf8 slug' do
-      get :redirect, :from => ['2004', '06', '02', 'ルビー']
-      assigns(:article).should == contents(:utf8_article)
-    end
-
-    describe 'rendering as atom feed' do
-      before(:each) do
-        get :redirect, :from => ["#{contents(:article1).permalink}.html.atom"]
-      end
-
-      it 'should render atom partial' do
-        response.should render_template('articles/_atom_feed.atom.builder')
-      end
-
-      it 'should render a valid feed' do
-        assert_feedvalidator response.body
-      end
-    end
-
-    describe 'rendering as rss feed' do
-      before(:each) do
-        get :redirect, :from => ["#{contents(:article1).permalink}.html.rss"]
-      end
-
-      it 'should render rss20 partial' do
-        response.should render_template('articles/_rss20_feed.rss.builder')
-      end
-
-      it 'should render a valid feed' do
-        assert_feedvalidator response.body
-      end
-    end
-
-    describe 'rendering comment feed with problematic characters' do
-      before(:each) do
-        @comment = contents(:article1).comments.first
-        @comment.body = "&eacute;coute! 4 < 2, non?"
-        @comment.save!
-        get :redirect, :from => ["#{contents(:article1).permalink}.html.atom"]
-      end
-
-      it 'should result in a valid atom feed' do
-        assigns(:article).should == contents(:article1)
-        assert_feedvalidator response.body
-      end
-    end
-
-  end
-end