You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.

Changesets
» Changeset 16

Changeset 16

Configured for temporary /rails/typo location on Alpha. Updated
several layouts for RISC OS Open Limited site style. Now produces
proper "Not found" page in redirect_controller.rb. Updates to
database schema from Typo SVN (small change in the way tables are
defined, but same tables end up being defined). Set location of
SendMail in vendor/rails/actionmailer/lib/action_mailer/base.rb.

Comitted by: adh
Date: Sunday July 23 10:51:56 2006 (over 18 years ago)

Affected files:

rool/rails/typo/trunk/README:

prev.	current


		Currently you need all of those things to get typo to run:

15		* Ruby 1.8.4 or higher
16		* Rails 1.1.x
	15	* Ruby -v of 1.8.2 (25-05-2004) or 1.8.3
	16	* Rails 0.14.2 (or possibly 0.14.3)
		* A database. Typo supports MySQL, PostgreSQL, and SQLite.
		* Ruby drivers for your database.
		* For best performance, you should have a web server running either

rool/rails/typo/trunk/app/controllers/redirect_controller.rb:

prev.	current

		path = url_root + path unless url_root.nil? or path[0,url_root.length] == url_root
		redirect_to path
		else
13		~~render :text => "Page not found", :status => 404~~
	13	render :text => '<html><head><title>Page not
	14	found</title></head><body>Internal redirection error - page not
	15	found.<br>Please consult the system adminstrator.</body></html>',
	16	:status => 404
		end
		end
		end

rool/rails/typo/trunk/app/views/shared/_search.rhtml:

prev.	current

		<%= start_form_tag({:controller => 'articles', :action => 'search'}, {:method => 'get', :id => 'sform'}) %>
2		~~<label for="q">Live Search:</label><input type="text" id="q" name="q" value="" size="15" />~~
	2	<h3><label for="q">Search news</label></h3>
	3	<p />
	4	<input type="text" id="q" name="q" value="" size="15" />
		<%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
		<%= end_form_tag %>
5		~~<%= observe_field "q", :frequency => 1,~~
6		~~:url => { :controller => "live", :action => "search" },~~
	7	<%= observe_field "q", :frequency => 1,
	8	:url => { :controller => "live", :action => "search" },
		:loading => "Element.show('search_spinner')",
		:complete => "Element.hide('search_spinner')",
		:update => "search-results",

rool/rails/typo/trunk/config/boot.rb:

prev.	current

		end

		Rails::Initializer.run(:set_load_path)
44		~~end~~

	45	end

rool/rails/typo/trunk/config/database.yml:

prev.	current

1		~~login: &login~~
2		~~adapter: mysql~~
3		~~host: localhost~~
4		~~username: root~~
5		~~password:~~
	1	# Typo PostgreSQL database configuration. Syntax taken from
	2	# "http://blog.bleything.net/" (Ben Bleything, June 2006).

	4	dbinfo: &dbinfo
	5	adapter: postgresql
	6	host: /home/adh/postgres/
	7	username: adh
	8	password: oiarfewa
	9
	10	# Warning: The database defined as 'test' will be erased and
	11	# re-generated from your development database when you run 'rake'.
	12	# Do not set this db to the same as development or production.
	13
		development:
8		~~database: typo_dev~~
9		~~<<: *login~~
	15	<<: *dbinfo
	16	database: typo

		test:
12		~~database: typo_tests~~
13		~~<<: *login~~
	19	<<: *dbinfo
	20	database: typo-test

		production:
	23	<<: *dbinfo
		database: typo
17		~~<<: *login~~

rool/rails/typo/trunk/config/environment.rb:

prev.	current

		require File.join(File.dirname(__FILE__), 'boot')

		Rails::Initializer.run do \|config\|
	11	# We don't run in the document root, so images etc. must come from
	12	# a non-root location too. Hijack the 'asset host' facility to get
	13	# helper-based links pointing in the right place.
	14	config.action_controller.asset_host = "/rails/typo"
	15
		# Skip frameworks you're not going to use
		# config.frameworks -= [ :action_web_service, :action_mailer ]

...	...

		# Force all environments to use the same logger level
		# (by default production uses :info, the others :debug)
36		~~# config.log_level = :debug~~
	41	config.log_level = :warn

		# Use the database for sessions instead of the file system
		# (create the session table with 'rake create_sessions_table')
...	...

		# Include your application configuration below

	76	# Allow multiple Rails applications by giving the session cookie a
	77	# unique prefix.
	78
	79	ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:session_key] = 'typoapp_session_id'
	80
		# Load included libraries.
		require 'redcloth'
		require 'bluecloth'

rool/rails/typo/trunk/config/environments/production.rb:

prev.	current

		# Use a different logger for distributed setups
		# config.logger = SyslogLogger.new

8
		# Full error reports are disabled and caching is turned on
		config.action_controller.consider_all_requests_local = false
		config.action_controller.perform_caching = true

		# Enable serving of images, stylesheets, and javascripts from an asset server
14		~~# config.action_controller.asset_host = "http://assets.example.com"~~
	13	# config.action_controller.asset_host = "/rails/typo"

		# Disable delivery errors if you bad email addresses should just be ignored
		# config.action_mailer.raise_delivery_errors = false

rool/rails/typo/trunk/config/routes.rb:

prev.	current

		ActionController::Routing::Routes.draw do \|map\|

		# default
4		~~map.index '', :controller => 'articles', :action => 'index'~~
5		~~map.admin 'admin', :controller => 'admin/general', :action => 'index'~~
	4	map.index '/rails/typo/', :controller => 'articles', :action => 'index'
	5	map.admin '/rails/typo/admin', :controller => 'admin/general', :action => 'index'

		# admin/comments controller needs parent article id
8		~~map.connect 'admin/comments/article/:article_id/:action/:id',~~
	8	map.connect '/rails/typo/admin/comments/article/:article_id/:action/:id',
		:controller => 'admin/comments', :action => nil, :id => nil
10		~~map.connect 'admin/trackbacks/article/:article_id/:action/:id',~~
	10	map.connect '/rails/typo/admin/trackbacks/article/:article_id/:action/:id',
		:controller => 'admin/trackbacks', :action => nil, :id => nil
12		~~map.connect 'admin/content/:action/:id', :controller => 'admin/content'~~
	12	map.connect '/rails/typo/admin/content/:action/:id', :controller => 'admin/content'

		# make rss feed urls pretty and let them end in .xml
		# this improves caches_page because now apache and webrick will send out the
		# cached feeds with the correct xml mime type.
17		~~map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'~~
18		~~map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'~~
19		~~map.xml 'xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'~~
20		~~map.xml 'xml/trackbackrss/feed.xml', :controller => 'xml', :action => 'trackbackrss'~~
	17	map.xml '/rails/typo/xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
	18	map.xml '/rails/typo/xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
	19	map.xml '/rails/typo/xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
	20	map.xml '/rails/typo/xml/trackbackrss/feed.xml', :controller => 'xml', :action => 'trackbackrss'

22		~~map.xml 'xml/:format/feed.xml', :controller => 'xml', :action => 'feed', :type => 'feed'~~
23		~~map.xml 'xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'~~
24		~~map.xml 'xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'~~
25		~~map.xml 'xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'~~
	22	map.xml '/rails/typo/xml/:format/feed.xml', :controller => 'xml', :action => 'feed', :type => 'feed'
	23	map.xml '/rails/typo/xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'
	24	map.xml '/rails/typo/xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
	25	map.xml '/rails/typo/xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'

		# allow neat perma urls
28		~~map.connect 'articles',~~
	28	map.connect '/rails/typo/articles',
		:controller => 'articles', :action => 'index'
30		~~map.connect 'articles/page/:page',~~
	30	map.connect '/rails/typo/articles/page/:page',
		:controller => 'articles', :action => 'index',
		:page => /\d+/

34		~~map.connect 'articles/:year/:month/:day',~~
	34	map.connect '/rails/typo/articles/:year/:month/:day',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
37		~~map.connect 'articles/:year/:month',~~
	37	map.connect '/rails/typo/articles/:year/:month',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/, :month => /\d{1,2}/
40		~~map.connect 'articles/:year',~~
	40	map.connect '/rails/typo/articles/:year',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/

44		~~map.connect 'articles/:year/:month/:day/page/:page',~~
	44	map.connect '/rails/typo/articles/:year/:month/:day/page/:page',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/, :page => /\d+/
47		~~map.connect 'articles/:year/:month/page/:page',~~
	47	map.connect '/rails/typo/articles/:year/:month/page/:page',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
50		~~map.connect 'articles/:year/page/:page',~~
	50	map.connect '/rails/typo/articles/:year/page/:page',
		:controller => 'articles', :action => 'find_by_date',
		:year => /\d{4}/, :page => /\d+/

54		~~map.connect 'articles/:year/:month/:day/:title',~~
	54	map.connect '/rails/typo/articles/:year/:month/:day/:title',
		:controller => 'articles', :action => 'permalink',
		:year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/

58		~~map.connect 'articles/category/:id',~~
	58	map.connect '/rails/typo/articles/category/:id',
		:controller => 'articles', :action => 'category'
60		~~map.connect 'articles/category/:id/page/:page',~~
	60	map.connect '/rails/typo/articles/category/:id/page/:page',
		:controller => 'articles', :action => 'category',
		:page => /\d+/

64		~~map.connect 'articles/tag/:id',~~
	64	map.connect '/rails/typo/articles/tag/:id',
		:controller => 'articles', :action => 'tag'
66		~~map.connect 'articles/tag/:id/page/:page',~~
	66	map.connect '/rails/typo/articles/tag/:id/page/:page',
		:controller => 'articles', :action => 'tag',
		:page => /\d+/

70		~~map.connect 'pages/*name',:controller => 'articles', :action => 'view_page'~~
	70	map.connect '/rails/typo/pages/*name',:controller => 'articles', :action => 'view_page'

72		~~map.connect 'stylesheets/theme/:filename',~~
	72	map.connect '/rails/typo/stylesheets/theme/:filename',
		:controller => 'theme', :action => 'stylesheets'
74		~~map.connect 'javascript/theme/:filename',~~
	74	map.connect '/rails/typo/javascript/theme/:filename',
		:controller => 'theme', :action => 'javascript'
76		~~map.connect 'images/theme/:filename',~~
	76	map.connect '/rails/typo/images/theme/:filename',
		:controller => 'theme', :action => 'images'

79		~~map.connect 'plugins/filters/:filter/:public_action',~~
	79	map.connect '/rails/typo/plugins/filters/:filter/:public_action',
		:controller => 'textfilter', :action => 'public_action'

		# Kill attempts to connect directly to the theme controller.
		# Ideally we'd disable these by removing the default route (below),
		# but that breaks too many things for Typo 2.5.
85		~~map.connect 'theme/*stuff',~~
	85	map.connect '/rails/typo/theme/*stuff',
		:controller => 'theme', :action => 'error'

		# Allow legacy urls to still work
89		~~map.connect ':controller/:action/:id'~~
	89	map.connect '/rails/typo/:controller/:action/:id'

91		~~map.connect '*from', :controller => 'redirect', :action => 'redirect'~~
	91	map.connect '/rails/typo/*from', :controller => 'redirect', :action => 'redirect'
		end

rool/rails/typo/trunk/db/schema.mysql-v3.sql:

prev.	current


		-- indexes

173		~~CREATE INDEX `blacklist_patterns_pattern_index` ON blacklist_patterns (`pattern`);~~
174		~~CREATE INDEX `categories_permalink_index` ON categories (`permalink`);~~
175		~~CREATE INDEX `contents_blog_id_index` ON contents (`blog_id`);~~
176		~~CREATE INDEX `contents_article_id_index` ON contents (`article_id`);~~
177		~~CREATE INDEX `page_caches_name_index` ON page_caches (`name`);~~
178		~~CREATE INDEX `pings_article_id_index` ON pings (`article_id`);~~
179		~~CREATE INDEX `sessions_sessid_index` ON sessions (`sessid`);~~
	173	CREATE INDEX blacklist_patterns_pattern_index ON blacklist_patterns (pattern);
	174	CREATE INDEX categories_permalink_index ON categories (permalink);
	175	CREATE INDEX contents_blog_id_index ON contents (blog_id);
	176	CREATE INDEX contents_article_id_index ON contents (article_id);
	177	CREATE INDEX page_caches_name_index ON page_caches (name);
	178	CREATE INDEX pings_article_id_index ON pings (article_id);
	179	CREATE INDEX sessions_sessid_index ON sessions (sessid);

		-- data

rool/rails/typo/trunk/db/schema.mysql.sql:

prev.	current


		-- indexes

173		~~CREATE INDEX `blacklist_patterns_pattern_index` ON blacklist_patterns (`pattern`);~~
174		~~CREATE INDEX `categories_permalink_index` ON categories (`permalink`);~~
175		~~CREATE INDEX `contents_blog_id_index` ON contents (`blog_id`);~~
176		~~CREATE INDEX `contents_article_id_index` ON contents (`article_id`);~~
177		~~CREATE INDEX `page_caches_name_index` ON page_caches (`name`);~~
178		~~CREATE INDEX `pings_article_id_index` ON pings (`article_id`);~~
179		~~CREATE INDEX `sessions_sessid_index` ON sessions (`sessid`);~~
	173	CREATE INDEX blacklist_patterns_pattern_index ON blacklist_patterns (pattern);
	174	CREATE INDEX categories_permalink_index ON categories (permalink);
	175	CREATE INDEX contents_blog_id_index ON contents (blog_id);
	176	CREATE INDEX contents_article_id_index ON contents (article_id);
	177	CREATE INDEX page_caches_name_index ON page_caches (name);
	178	CREATE INDEX pings_article_id_index ON pings (article_id);
	179	CREATE INDEX sessions_sessid_index ON sessions (sessid);

		-- data

rool/rails/typo/trunk/db/schema.postgresql.sql:

prev.	current


		-- indexes

173		~~CREATE INDEX "blacklist_patterns_pattern_index" ON blacklist_patterns ("pattern");~~
174		~~CREATE INDEX "categories_permalink_index" ON categories ("permalink");~~
175		~~CREATE INDEX "contents_blog_id_index" ON contents ("blog_id");~~
176		~~CREATE INDEX "contents_article_id_index" ON contents ("article_id");~~
177		~~CREATE INDEX "page_caches_name_index" ON page_caches ("name");~~
178		~~CREATE INDEX "pings_article_id_index" ON pings ("article_id");~~
179		~~CREATE INDEX "sessions_sessid_index" ON sessions ("sessid");~~
	173	CREATE INDEX blacklist_patterns_pattern_index ON blacklist_patterns (pattern);
	174	CREATE INDEX categories_permalink_index ON categories (permalink);
	175	CREATE INDEX contents_blog_id_index ON contents (blog_id);
	176	CREATE INDEX contents_article_id_index ON contents (article_id);
	177	CREATE INDEX page_caches_name_index ON page_caches (name);
	178	CREATE INDEX pings_article_id_index ON pings (article_id);
	179	CREATE INDEX sessions_sessid_index ON sessions (sessid);

		-- data

rool/rails/typo/trunk/db/schema.sqlite.sql:

prev.	current


		-- indexes

173		~~CREATE INDEX "blacklist_patterns_pattern_index" ON blacklist_patterns ("pattern");~~
174		~~CREATE INDEX "categories_permalink_index" ON categories ("permalink");~~
175		~~CREATE INDEX "contents_blog_id_index" ON contents ("blog_id");~~
176		~~CREATE INDEX "contents_article_id_index" ON contents ("article_id");~~
177		~~CREATE INDEX "page_caches_name_index" ON page_caches ("name");~~
178		~~CREATE INDEX "pings_article_id_index" ON pings ("article_id");~~
179		~~CREATE INDEX "sessions_sessid_index" ON sessions ("sessid");~~
	173	CREATE INDEX blacklist_patterns_pattern_index ON blacklist_patterns (pattern);
	174	CREATE INDEX categories_permalink_index ON categories (permalink);
	175	CREATE INDEX contents_blog_id_index ON contents (blog_id);
	176	CREATE INDEX contents_article_id_index ON contents (article_id);
	177	CREATE INDEX page_caches_name_index ON page_caches (name);
	178	CREATE INDEX pings_article_id_index ON pings (article_id);
	179	CREATE INDEX sessions_sessid_index ON sessions (sessid);

		-- data

rool/rails/typo/trunk/db/schema.sqlserver.sql:

prev.	current


		-- indexes

187		~~CREATE INDEX [blacklist_patterns_pattern_index] ON blacklist_patterns ([pattern]);~~
188		~~CREATE INDEX [categories_permalink_index] ON categories ([permalink]);~~
189		~~CREATE INDEX [contents_blog_id_index] ON contents ([blog_id]);~~
190		~~CREATE INDEX [contents_article_id_index] ON contents ([article_id]);~~
191		~~CREATE INDEX [page_caches_name_index] ON page_caches ([name]);~~
192		~~CREATE INDEX [pings_article_id_index] ON pings ([article_id]);~~
193		~~CREATE INDEX [sessions_sessid_index] ON sessions ([sessid]);~~
	187	CREATE INDEX blacklist_patterns_pattern_index ON blacklist_patterns (pattern);
	188	CREATE INDEX categories_permalink_index ON categories (permalink);
	189	CREATE INDEX contents_blog_id_index ON contents (blog_id);
	190	CREATE INDEX contents_article_id_index ON contents (article_id);
	191	CREATE INDEX page_caches_name_index ON page_caches (name);
	192	CREATE INDEX pings_article_id_index ON pings (article_id);
	193	CREATE INDEX sessions_sessid_index ON sessions (sessid);

		-- data

rool/rails/typo/trunk/public/dispatch.cgi:

prev.	current

1		~~#!/usr/bin/env ruby~~
2
3		~~require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)~~
4
5		~~# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:~~
6		~~# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired~~
7		~~require "dispatcher"~~
8
9		~~ADDITIONAL_LOAD_PATHS.reverse.each { \|dir\| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)~~
10		~~Dispatcher.dispatch~~
	1	# (No '!...' since Lighty's config file takes care of what to do with
	2	# '.cgi' files).
	3
	4	require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
	5
	6	# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
	7	# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
	8	require "dispatcher"
	9
	10	ADDITIONAL_LOAD_PATHS.reverse.each { \|dir\| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
	11	Dispatcher.dispatch

rool/rails/typo/trunk/public/dispatch.fcgi:

prev.	current

1		~~#!/usr/bin/env ruby~~
	1	#!/bin/env ruby
		#
		# You may specify the path to the FastCGI crash log (a log of unhandled
		# exceptions which forced the FastCGI instance to exit, great for debugging)

rool/rails/typo/trunk/public/dispatch.rb:

prev.	current

1		~~#!/usr/bin/ruby~~
	1	#!/bin/ruby

		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

rool/rails/typo/trunk/script/spacecheck:

prev.	current

1		~~#!/usr/bin/env ruby~~
	1	#!/usr/bin/ruby

		require 'fileutils'

rool/rails/typo/trunk/vendor/rails/actionmailer/lib/action_mailer/base.rb:

prev.	current

		# * <tt>raise_delivery_errors</tt> - whether or not errors should be raised if the email fails to be delivered.
		#
		# * <tt>delivery_method</tt> - Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.
101		~~# Sendmail is assumed to be present at "/usr/sbin/sendmail".~~
	101	# Sendmail is assumed to be present at "/bin/sendmail".
		#
		# * <tt>perform_deliveries</tt> - Determines whether deliver_* methods are actually carried out. By default they are,
		# but this can be turned off to help functional testing.
...	...
		end

		def perform_delivery_sendmail(mail)
454		~~IO.popen("/usr/sbin/sendmail -i -t","w+") do \|sm\|~~
	454	IO.popen("/bin/sendmail -i -t","w+") do \|sm\|
		sm.print(mail.encoded.gsub(/\r/, ''))
		sm.flush
		end