typo 5.4.4 → 5.5

data/app/controllers/admin/cache_controller.rb

@@ -1,9 +0,0 @@
-class Admin::CacheController < Admin::BaseController
-
-  def sweep_html
-    sweep_cache
-    flash[:notice] = _('HTML was cleared')
-    redirect_to :controller => '/admin/settings'
-  end
-
-end

data/app/models/cache_information.rb

@@ -1,19 +0,0 @@
-class CacheInformation < ActiveRecord::Base
-  validates_presence_of :path
-  validates_uniqueness_of :path
-
-  before_destroy :delete_path_in_page_cache_directory
-
-  def delete_path_in_page_cache_directory
-    if File.exist? path_in_page_cache_directory
-      FileUtils.rm(path_in_page_cache_directory)
-    else
-      Rails.logger.warn("path : #{path} no more exist")
-    end
-  end
-
-  def path_in_page_cache_directory
-    File.join(ActionController::Base.page_cache_directory, path)
-  end
-
-end

data/db/schema.rb

@@ -1,242 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 88) do
-
-  create_table "articles_tags", :id => false, :force => true do |t|
-    t.integer "article_id"
-    t.integer "tag_id"
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.text   "settings"
-    t.string "base_url"
-  end
-
-  create_table "cache_informations", :force => true do |t|
-    t.string   "path"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "cache_informations", ["path"], :name => "index_cache_informations_on_path"
-
-  create_table "categories", :force => true do |t|
-    t.string  "name"
-    t.integer "position",    :default => 0, :null => false
-    t.string  "permalink"
-    t.text    "keywords"
-    t.text    "description"
-    t.integer "parent_id"
-  end
-
-  add_index "categories", ["permalink"], :name => "categories_permalink_index"
-
-  create_table "categorizations", :force => true do |t|
-    t.integer "article_id"
-    t.integer "category_id"
-    t.boolean "is_primary"
-  end
-
-  create_table "contents", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.string   "author"
-    t.text     "body"
-    t.text     "extended"
-    t.text     "excerpt"
-    t.string   "keywords"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "user_id"
-    t.string   "permalink"
-    t.string   "guid"
-    t.integer  "text_filter_id"
-    t.text     "whiteboard"
-    t.string   "name"
-    t.boolean  "published",      :default => false
-    t.boolean  "allow_pings"
-    t.boolean  "allow_comments"
-    t.datetime "published_at"
-    t.string   "state"
-    t.integer  "parent_id"
-  end
-
-  add_index "contents", ["published"], :name => "contents_published_index"
-  add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
-
-  create_table "feedback", :force => true do |t|
-    t.string   "type"
-    t.string   "title"
-    t.string   "author"
-    t.text     "body"
-    t.text     "excerpt"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "user_id"
-    t.string   "guid"
-    t.integer  "text_filter_id"
-    t.text     "whiteboard"
-    t.integer  "article_id"
-    t.string   "email"
-    t.string   "url"
-    t.string   "ip",               :limit => 40
-    t.string   "blog_name"
-    t.boolean  "published",                      :default => false
-    t.datetime "published_at"
-    t.string   "state"
-    t.boolean  "status_confirmed"
-  end
-
-  add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
-  add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
-
-  create_table "notifications", :force => true do |t|
-    t.integer  "content_id"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "page_caches", :force => true do |t|
-    t.string "name", :null => false
-  end
-
-  add_index "page_caches", ["name"], :name => "name"
-
-  create_table "pings", :force => true do |t|
-    t.integer  "article_id"
-    t.string   "url"
-    t.datetime "created_at"
-  end
-
-  add_index "pings", ["article_id"], :name => "article_id"
-
-  create_table "profiles", :force => true do |t|
-    t.string "label"
-    t.string "nicename"
-    t.text   "modules"
-  end
-
-  create_table "profiles_rights", :force => true do |t|
-    t.integer "profile_id"
-    t.integer "right_id"
-  end
-
-  create_table "redirects", :force => true do |t|
-    t.string "from_path"
-    t.string "to_path"
-  end
-
-  create_table "resources", :force => true do |t|
-    t.integer  "size"
-    t.string   "filename"
-    t.string   "mime"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "article_id"
-    t.boolean  "itunes_metadata"
-    t.string   "itunes_author"
-    t.string   "itunes_subtitle"
-    t.integer  "itunes_duration"
-    t.text     "itunes_summary"
-    t.string   "itunes_keywords"
-    t.string   "itunes_category"
-    t.boolean  "itunes_explicit"
-  end
-
-  create_table "rights", :force => true do |t|
-    t.string "name"
-    t.string "description"
-  end
-
-  create_table "sidebars", :force => true do |t|
-    t.integer  "active_position"
-    t.text     "config"
-    t.integer  "staged_position"
-    t.datetime "updated_at"
-    t.string   "type"
-  end
-
-  create_table "sitealizer", :force => true do |t|
-    t.string   "path"
-    t.string   "ip"
-    t.string   "referer"
-    t.string   "language"
-    t.string   "user_agent"
-    t.datetime "created_at"
-    t.date     "created_on"
-  end
-
-  create_table "tags", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "display_name"
-  end
-
-  create_table "text_filters", :force => true do |t|
-    t.string "name"
-    t.string "description"
-    t.string "markup"
-    t.text   "filters"
-    t.text   "params"
-  end
-
-  create_table "text_link_ads_rss", :force => true do |t|
-    t.string  "html",    :limit => 1024
-    t.integer "post_id"
-  end
-
-  create_table "triggers", :force => true do |t|
-    t.integer  "pending_item_id"
-    t.string   "pending_item_type"
-    t.datetime "due_at"
-    t.string   "trigger_method"
-  end
-
-  create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 80
-    t.string   "password",                  :limit => 40
-    t.string   "name",                      :limit => 80
-    t.string   "email",                     :limit => 80
-    t.boolean  "notify_via_email"
-    t.boolean  "notify_on_new_articles"
-    t.boolean  "notify_on_comments"
-    t.boolean  "notify_watch_my_articles"
-    t.string   "jabber"
-    t.integer  "profile_id"
-    t.string   "remember_token"
-    t.datetime "remember_token_expires_at"
-    t.string   "text_filter_id",                          :default => "1"
-    t.string   "editor",                                  :default => "simple"
-    t.string   "state",                                   :default => "active"
-    t.string   "firstname"
-    t.string   "lastname"
-    t.string   "nickname"
-    t.string   "url"
-    t.string   "msn"
-    t.string   "aim"
-    t.string   "yahoo"
-    t.string   "twitter"
-    t.text     "description"
-    t.boolean  "show_url"
-    t.boolean  "show_msn"
-    t.boolean  "show_aim"
-    t.boolean  "show_yahoo"
-    t.boolean  "show_twitter"
-    t.boolean  "show_jabber"
-    t.datetime "last_connection"
-  end
-
-  add_index "users", ["login"], :name => "login", :unique => true
-
-end

data/doc/test_themes.rb

@@ -1,50 +0,0 @@
-require 'rubygems'
-require 'watir'
-require "test/unit"
-require 'watir/ie'
-
-@browser = Watir::IE.new
-@browser.speed = :slow
-
-TYPO_TEST="http://localhost:3000"
-LOGIN="admin"
-PASSWORD="admin"
-TEXT="My Shiny Weblog!"
-
-@browser.goto("#{TYPO_TEST}/admin")
-Watir::Waiter.wait_until{ @browser.button(:id, 'submit').exists? }
-
-@browser.text_field(:id, 'user_login').set(LOGIN)
-@browser.text_field(:id, 'user_password').set(PASSWORD)
-@browser.button(:id, 'submit').click
-
-Watir::Waiter.wait_until{ @browser.div(:id, 'footer').exists? }
-
-@browser.goto("#{TYPO_TEST}/admin/themes")
-Watir::Waiter.wait_until{ @browser.div(:id, 'footer').exists? }
-
-links = []
-@browser.divs(:class, /theme/).each do |div|
-  links << div.link(:index, 1).href
-end
-
-links.each do |link|
-  @browser.goto(link)
-  Watir::Waiter.wait_until{ @browser.div(:id, 'footer').exists? }
-  
-  @browser.goto(TYPO_TEST)
-  Watir::Waiter.wait_until{ @browser.text.downcase.include?("my shiny weblog") }
-  
-  @browser.goto("#{TYPO_TEST}/2009/12/13/hello-world")
-  Watir::Waiter.wait_until{ @browser.text.downcase.include?("my shiny weblog") }
-  
-  @browser.goto("#{TYPO_TEST}/pages/about")
-  Watir::Waiter.wait_until{ @browser.text.downcase.include?("my shiny weblog") }
-  
-  @browser.goto("#{TYPO_TEST}/tag/default")
-  Watir::Waiter.wait_until{ @browser.text.downcase.include?("my shiny weblog") }
-  
-  @browser.goto("#{TYPO_TEST}/category/default")
-  Watir::Waiter.wait_until{ @browser.text.downcase.include?("my shiny weblog") }
-  
-end

data/public/javascripts/ckeditor/config.js

@@ -1,27 +0,0 @@
-/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-CKEDITOR.editorConfig = function( config )
-{
-  config.PreserveSessionOnFileBrowser = true;
-  // Define changes to default configuration here. For example:
- 	//config.language = '';
-  config.uiColor = '#E0ECFF';
-	config.toolbar = 'Basic';
-	config.entities_greek = false;
-	config.entities_latin = false;
-	config.entities_processNumerical = false;
-	config.toolbar_Basic =
-	[
-	        ['Format', '-', 'Bold', 'Italic'], 
-	        ['NumberedList','BulletedList'], 
-	        ['Outdent', 'Indent'], 
-	        ['Image', 'Flash', '-', 'Link'], 
-	        ['Maximize'], 
-	        ['Table'],
-	        ['PageBreak'],
-	        ['Source']
-	];
-}

data/spec/controllers/accounts_controller_spec.rb

@@ -1,414 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe AccountsController do
-  before(:each) do
-    User.salt = 'change-me'
-  end
-
-  describe "A successful login with 'Remember me' checked" do
-    def make_request
-      post 'login', {:user => {:login => 'bob', :password => 'test'},
-        :remember_me => '1'}
-    end
-
-    it 'should not cause password to change' do
-      User.authenticate('bob', 'test').should == users(:bob)
-      make_request
-      request.session[:user_id].should == users(:bob).id
-      User.authenticate('bob', 'test').should == users(:bob)
-    end
-  end
-end
-
-describe 'A successfully authenticated login' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:salt).and_return('change-me')
-  end
-
-  def make_request
-    post 'login', {:user => {:login => 'bob', :password => 'test'}}
-  end
-
-  it 'session gets a user' do
-    make_request
-    request.session[:user_id].should == users(:bob).id
-  end
-
-  it 'sets typo_user_profile cookie' do
-    make_request
-    cookies[:typo_user_profile].should == 'admin'
-  end
-
-  it 'redirects to /bogus/location' do
-    request.session[:return_to] = '/bogus/location'
-    make_request
-    response.should redirect_to('/bogus/location')
-  end
-  
-  it 'redirects to /admin if no return' do
-    make_request
-    response.should redirect_to(:controller => 'admin')
-  end
-
-  it 'redirects to /admin if no return and your are logged' do
-    session[:user_id] = session[:user] = users(:bob).id
-    make_request
-    response.should redirect_to(:controller => 'admin')
-  end
-
-  it "should redirect to signup if no users" do
-    User.stub!(:count).and_return(0)
-    make_request
-    response.should redirect_to('/accounts/signup')
-  end  
-end
-
-describe 'User is inactive' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:authenticate).and_return(nil)
-    User.stub!(:count).and_return(1)
-  end
- 
-  def make_request
-    post 'login', {:user => {:login => 'inactive', :password => 'longtest'}}
-  end
-  
-  it 'no user id goes in the session' do
-    make_request
-    response.session[:user_id].should be_nil
-  end
-  
-  it 'login should == "inactive"' do
-    make_request
-    assigns[:login].should == 'inactive'
-  end
-
-  it 'typo_user_profile cookie should be blank' do
-    make_request
-    cookies[:typo_user_profile].should be_blank
-  end
-
-  it 'should render login action' do
-    make_request
-    response.should render_template(:login)
-  end
-  
-end
-
-describe 'Login with nil user and password' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(1)
-  end
-  
-  def make_request
-   post 'login', {:user => {:login => nil, :password => nil}}
-  end
-
-  it 'should render login action' do
-    make_request
-    response.should render_template(:login)
-  end
-end
-
-describe 'Login gets the wrong password' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:authenticate).and_return(nil)
-    User.stub!(:count).and_return(1)
-  end
-
-  def make_request
-   post 'login', {:user => {:login => 'bob', :password => 'test'}}
-  end
-
-  it 'no user in goes in the session' do
-    make_request
-    response.session[:user_id].should be_nil
-  end
-
-  it 'login should == "bob"' do
-    make_request
-    assigns[:login].should == 'bob'
-  end
-
-  it 'typo_user_profile cookie should be blank' do
-    make_request
-    cookies[:typo_user_profile].should be_blank
-  end
-
-  it 'should render login action' do
-    make_request
-    response.should render_template(:login)
-  end
-end
-
-describe 'GET /login' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(1)
-  end
-
-  it 'should render action :login' do
-    get 'login'
-    response.should render_template(:login)
-    assigns[:login].should be_nil
-  end
-end
-
-describe 'GET /login with 0 existing users' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(0)
-  end
-
-  it 'should render action :signup' do
-    get 'login'
-    response.should redirect_to(:action => 'signup')
-    assigns[:login].should be_nil
-  end
-
-  it 'should render :signup' do
-    get 'recover_password'
-
-    response.should redirect_to(:action => 'signup')
-  end
-end
-
-describe 'GET signup and >0 existing user' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(1)
-  end
-
-  it 'should redirect to login' do
-    get 'signup'
-    response.should redirect_to(:action => 'login')
-  end
-end
-
-describe 'POST signup and >0 existing user' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(1)
-  end
-
-  it 'should redirect to login' do
-    post 'signup', params
-    response.should redirect_to(:action => 'login')
-  end
-
-  def params
-    {'user' =>  {'login' => 'newbob'}}
-  end
-end
-
-describe 'GET signup with 0 existing users' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(0)
-    @user = mock("user")
-    @user.stub!(:reload).and_return(@user)
-    User.stub!(:new).and_return(@user)
-  end
-
-  it 'sets @user' do
-    get 'signup'
-    assigns[:user].should == @user
-  end
-
-  it 'renders action signup' do
-    get 'signup'
-    response.should render_template(:signup)
-  end
-end
-
-describe 'GET signup with 0 existing users and unconfigured blog' do
-  controller_name :accounts
-
-  before(:each) do
-    Blog.delete_all
-    @blog = Blog.new.save
-    User.delete_all
-  end
-
-  it 'redirects to setup' do
-    get 'signup'
-    response.should redirect_to(:controller => 'setup', :action => 'index')
-  end
-end
-
-describe 'POST signup with 0 existing users and unconfigured blog' do
-  controller_name :accounts
-
-  before(:each) do
-    Blog.delete_all
-    @blog = Blog.new.save
-    User.delete_all
-  end
-
-  it 'redirects to setup' do
-    post 'signup', params
-    response.should redirect_to(:controller => 'setup', :action => 'index')
-  end
-  
-  def params
-    {'user' =>  {'login' => 'newbob', 'password' => 'newpassword',
-        'password_confirmation' => 'newpassword'}}
-  end
-end
-
-describe 'GET login with 0 existing users and unconfigured blog' do
-  controller_name :accounts
-
-  before(:each) do
-    Blog.delete_all
-    @blog = Blog.new.save
-    User.delete_all
-  end
-
-  it 'redirects to setup' do
-    get 'login'
-    response.should redirect_to(:controller => 'setup', :action => 'index')
-  end
-end
-
-describe 'POST login with 0 existing users and unconfigured blog' do
-  controller_name :accounts
-
-  before(:each) do
-    Blog.delete_all
-    @blog = Blog.new.save
-    User.delete_all
-  end
-
-  it 'redirects to setup' do
-    post 'login', params
-    response.should redirect_to(:controller => 'setup', :action => 'index')
-  end
-  
-  def params
-    {'user' =>  {'login' => 'newbob', 'password' => 'newpassword'}}
-  end
-end
-
-describe 'POST signup with 0 existing users' do
-  controller_name :accounts
-
-  before(:each) do
-    User.stub!(:count).and_return(0)
-    @user = mock_model(User)
-    @user.stub!(:login).and_return('newbob')
-    @user.stub!(:password=).and_return(true)
-    @user.stub!(:password).and_return('foo')
-    @user.stub!(:name=).and_return(true)
-    User.stub!(:new).and_return(@user)
-    User.stub!(:authenticate).and_return(@user)
-    @user.stub!(:save).and_return(@user)
-  end
-
-  it 'creates and saves a user' do
-    User.should_receive(:new).and_return(@user)
-    @user.should_receive(:save).and_return(@user)
-    post 'signup', params
-    assigns[:user].should == @user
-  end
-
-  it 'redirects to /account/confirm' do
-    post 'signup', params
-    response.should redirect_to(:action => 'confirm')
-  end
-
-  it 'session gets a user' do
-    post 'signup', params
-    request.session[:user_id].should == @user.id
-  end
-
-  def params
-    {'user' =>  {'login' => 'newbob', 'password' => 'newpassword',
-        'password_confirmation' => 'newpassword'}}
-  end
-end
-
-describe 'User is logged in' do
-  controller_name :accounts
-
-  before(:each) do
-    @user = mock_model(User)
-
-    # The AccountsController class uses session[:user_id], and the
-    # Typo LoginSystem uses session[:user].  So we need to set both of
-    # these up correctly.  I'm not sure why the duplication exists.
-    session[:user_id] = @user.id
-    @controller.send(:current_user=, @user)
-
-    User.should_receive(:find) \
-      .with(:first, :conditions => { :id => @user.id }) \
-      .any_number_of_times \
-      .and_return(@user)
-
-    cookies[:typo_user_profile] = 'admin'
-  end
-
-  it 'trying to log in once again redirects to admin/dashboard/index' do
-    get 'login'
-    response.should redirect_to(:controller => 'admin')
-  end
-
-  it 'logging out deletes the session[:user_id]' do
-    @user.should_receive(:forget_me)
-    get 'logout'
-    session[:user_id].should be_blank
-  end
-
-  it 'redirects to the login action' do
-    @user.should_receive(:forget_me)
-    get 'logout'
-    response.should redirect_to(:action => 'login')
-  end
-
-  it 'logging out deletes cookies containing credentials' do
-    @user.should_receive(:forget_me)
-    get 'logout'
-    cookies[:auth_token].should == nil
-    cookies[:typo_user_profile].should == nil
-  end
-end
-
-describe 'User has lost his password and send a good email' do
-  controller_name :accounts
-  
-  before(:each) do
-    @user = mock_model(User, :new_record? => false, :reload => @user)
-    @user.stub!(:profile).and_return(Profile.find_by_label('admin'))
-    User.stub!(:find_by_login).with('tobi').and_return(@user)
-    User.stub!(:count).and_return(1)
-  end
-  
-  it 'should render recover_password' do
-    get 'recover_password'
-    
-    response.should render_template('recover_password')
-  end
-  
-  it 'should render login' do
-    make_request
-    
-    response.should redirect_to(:action => 'login')
-  end
-  
-  def make_request
-   post 'recover_password', {:user => {:login => 'tobi'}}
-  end
-end