typo 3.99.3 → 3.99.4

data/db/migrate/022_superclass_trackbacks.rb

@@ -1,6 +1,7 @@
 class SuperclassTrackbacks < ActiveRecord::Migration
   class BareContent < ActiveRecord::Base
     include BareMigration
+    set_inheritance_column :bogustype     # see migration #20 for why
   end
 
   class BareTrackback < ActiveRecord::Base

data/db/migrate/023_superclass_pages.rb

@@ -1,5 +1,6 @@
 class Bare23Content < ActiveRecord::Base
   include BareMigration
+  set_inheritance_column :bogustype     # see migration #20 for why
 end
 
 class Bare23Page < ActiveRecord::Base
@@ -9,12 +10,12 @@ end
 class SuperclassPages < ActiveRecord::Migration
   def self.up
     STDERR.puts "Merging Pages into Content table"
-    modify_tables_and_update(:add_column, :contents, :name, :string) do
+    modify_tables_and_update(:add_column, Bare23Content, :name, :string) do
       Bare23Content.transaction do
         if not $schema_generator
           Bare23Page.find(:all).each do |p|
             Bare23Content.create(:type           => 'Page',
-                                 :title          => p.name,
+                                 :name           => p.name,
                                  :user_id        => p.user_id,
                                  :body           => p.body,
                                  :body_html      => p.body_html,
@@ -46,7 +47,7 @@ class SuperclassPages < ActiveRecord::Migration
     modify_tables_and_update(:create_table, :pages, lambda {|t| init_pages(t)}) do
       Bare23Content.transaction do
         Bare23Content.find(:all, :conditions => "type = 'Page'").each do |p|
-          Bare23Page.create(:name           => p.title,
+          Bare23Page.create(:name           => p.name,
                             :user_id        => p.user_id,
                             :body           => p.body,
                             :body_html      => p.body_html,

data/db/schema.rb

@@ -36,6 +36,7 @@ ActiveRecord::Schema.define(:version => 46) do
   add_index "categories", ["permalink"], :name => "categories_permalink_index"
 
   create_table "contents", :force => true do |t|
+    t.column "type", :string
     t.column "title", :string
     t.column "author", :string
     t.column "body", :text
@@ -51,15 +52,14 @@ ActiveRecord::Schema.define(:version => 46) do
     t.column "guid", :string
     t.column "text_filter_id", :integer
     t.column "whiteboard", :text
-    t.column "comments_count", :integer
-    t.column "trackbacks_count", :integer
-    t.column "type", :string
     t.column "article_id", :integer
     t.column "email", :string
     t.column "url", :string
-    t.column "ip", :string
+    t.column "ip", :string, :limit => 40
     t.column "blog_name", :string
     t.column "name", :string
+    t.column "comments_count", :integer
+    t.column "trackbacks_count", :integer
     t.column "published", :boolean, :default => false
     t.column "allow_pings", :boolean
     t.column "allow_comments", :boolean

data/doc/Installer.txt

@@ -22,7 +22,8 @@ You'll need the following software installed on your system:
 3.  SWIG (http://www.swig.org)
 4.  SQLite 3
 
-Most modern Unix systems should have all four of these easily available in pre-built form.
+Most modern Unix systems should have all four of these easily available in
+pre-built form.
 
 
 Installing Typo
@@ -61,7 +62,12 @@ Starting and Stopping Typo
 
 To stop Typo from running, run `typo stop /path/to/typo`. To restart it, run
 `typo start /path/to/typo`. Since this Typo install uses Mongrel, not FastCGI,
-you can't depend on your web server restarting it automatically on reboot.  You'll need to either create an init script or cron reboot entry to restart it, depending on your host and/or privilege level.
+you can't depend on your web server restarting it automatically on reboot.
+You'll need to either create an init script or cron reboot entry to restart
+it, depending on your host and/or privilege level.
+
+Ask your hosting provider or the Typo mailing list (typo-list@rubyforge.org)
+if you need help with this.
 
 
 Configuration Variables
@@ -73,9 +79,78 @@ them via 'typo config DIRECTORY name1=value1 name2=value2...'  For example:
 
   typo config /var/www/typo web-server=mongrel_cluster
 
+Here's a list of available configuration variables in Typo 4.0.0:
+
+### bind-address
+
+The `bind-address` controls which IP address(es) Mongrel uses. By default,
+Mongrel listens for connections on all IP addresses that are in use on the
+server. You can restrict this by setting `bind-address`. The most useful
+setting is probably `bind-address=127.0.0.1`, which will tell Mongrel to only
+listen to connections from the local server.
+
+### database
+
+The `database` variable controls which Database driver Typo uses. By default,
+this is `sqlite`. Setting it to any other value will supress SQLite-specific
+upgrade and maintenance commands.
+
+### port-number
+
+The `port-number` variable controls which TCP port Mongrel uses. By default,
+it's a random number between 4000 and 5000.
+
+### rails-environment
+
+This controls which Rails environment Typo uses. This defaults to
+`production`; the other usable value is `development`.
+
+### threads
+
+The `threads` variable controls how many copies of Mongrel are used when using
+the `mongrel_cluster` web server. Each thread listens on its own port number,
+so setting `threads=2` while `port-number` is 4000 will make mongrel-cluster
+run two copies of Mongrel, one listening on port 4000 and one on 4001.
+
+### url-prefix
+
+The `url-prefix` variable is used to tell Typo to run in a subdirectory
+instead of the root of a specific URL hostname. For example, if you want Typo
+to live at http://blog.example.com/blog instead of http://blog.example.com/,
+then you'd need to set `url-prefix=/blog`.
+
+### web-server
+
+The `web-server` variable controls which server Typo uses. By default,
+`web-server` is `mongrel`, but you can change it to `mongrel-cluster` or
+`external`. If you use `external`, then 'typo PATH start` won't start a web
+server of its own, and you'll have to provide your own web server. This is the
+easiest way to use Typo with FastCGI--just set `web-server=external` and then
+tweak `.htaccess`.
+
+
+Troubleshooting
+---------------
+
+### Tests fail with ID=0
+
+You didn't install Swig before installing `sqlite3-ruby`. Uninstall the SQLite
+driver, install Swig, and then re-install `sqlite3-ruby`.
+
+### MySQL fails with timeout errors
+
+Install the MySQL GEM. It's faster then Rails' default MySQL driver, and it
+works substantially better.
+
+### Typo crashes randomly
 
-TODO
-----
+First, try running Typo under Webrick in the foreground to see if you can
+reproduce the problem. Run `RAILS_ENV=production ./script/server webrick` from
+your Typo directory and then see if you can get it to crash. If it dies, then
+open a Trac ticket (http://typosphere.org/trac) describing the problem and
+include the crash message along with any relevant information from the logs.
+Also include which version of Ruby (ruby -v), Rails, and Typo, and which OS
+you're using.
 
-1.  Figure out how to best have Typo restart on reboot.
-2.  Handle the "missing swig" problem better.
+Generally, if Typo suddenly exiting, it's probably caused by a bad Ruby
+interpreter on your system.

data/doc/typo-4.0-release-notes.txt

@@ -0,0 +1,135 @@
+Typo 4.0
+========
+
+Welcome to Typo 4.0.  Typo is a blogging platform, like Movable Typo or 
+Wordpress, written using Ruby on Rails.
+
+This is the first major release since Typo 2.6.  We skipped Typo 3.0 to avoid confusion with the Typo3 project.
+
+
+Changes since Typo 2.6
+----------------------
+
+* A new installer and a Typo .gem file.  Run 'gem install typo' and then
+  'typo install /some/path' to install Typo.
+
+* Text filter plugins, including easy inline Flickr image support and syntax
+  highlighting for code.
+
+* Enhanced feed support.  Atom 1.0 and RSS 2.0 are both supported.  Atom 0.3
+  has been removed.  Both feed types have better UUIDs.  There are also 
+  per-tag, -category, and -author feeds.  Most pages have their own 
+  content-specific feeds available via feed autodiscovery.
+
+* Tags.  The 'keywords' field in the Typo admin UI (as well as many blog 
+  editors) has been commandeered to provide tagging for Typo.  Tags are
+  separated by spaces (just like Flickr).  If you want to include a space
+  in a tag, then use quotes.
+
+* Improved spam management.  There's a "Feedback" tab in the admin interface
+  that lists all comments and trackbacks so they can be bulk-deleted.  In
+  addition, Typo can now use Akismet for spam filtering.
+
+* File uploads.  You can now upload images and other content directly from the 
+  admin UI.
+
+* Podcast support (experimental).
+
+* Email and/or Jabber notification of new content, including comments and 
+  trackbacks.
+
+* Support for posting articles with a future posting date.  Pre-posted 
+  articles don't appear on the blog or feeds until their posting date passes.
+
+* A new cache system that automatically times out stale entries.  Several 
+  types of content, including the Flickr sidebar, will automatically cause the
+  page to be rebuilt every few hours to ensure freshness.
+
+* Better theme support.  Some of this was back-ported to Typo 2.6.0.
+
+* A redirect table to help users migrating to Typo.  You can enter new URLs
+  into the Redirect table and Typo will look there whenever it doesn't 
+  recognize a URL.  So you can move from Movable Type-style permalinks to
+  Typo-style permalinks without losing the perma- in your links.
+
+* Cleaner migrations.
+
+* Rails 1.1 support.  Rails 1.1.4 is strongly recommended.  Rails 1.0 won't 
+  work at all.
+
+* Improved sidebar support, with a cleaner API and more built-in sidebars.
+
+* Google sitemap support.
+
+* Gravatars support for comments.
+
+* Comment previews.
+
+* Markup help for comments, articles, and pages.
+
+
+How to Install Typo
+-------------------
+
+There are two ways to install Typo: automatically, using the new Typo installer, or manually, by downloading the source and building a working Rails environment (database, etc) for it.
+
+New users should use the installer wherever possible because it's substantially easier and less trouble-prone.
+
+
+### Installing Typo via the Typo Installer 
+
+You'll need the following software installed on your system:
+
+  1.  Ruby 1.8.4
+  2.  RubyGems (http://www.rubygems.org)
+  3.  SWIG (http://www.swig.org)
+  4.  SQLite 3
+
+Most Linux distributions should have these easily available.  OS X users can
+probably use the 'Locomotive' Rails installer, and there is probably something 
+similar available for Windows users.
+
+Once these prerequisites have been installed run these two commands:
+
+    $ gem install typo
+    $ typo install /some/path
+
+The first command will download the latest Typo release, along with a bunch of
+dependencies.  The second command will create a new Typo install in
+`/some/path` (you'll probably want to use a path like `/var/www/typo` instead,
+or `/tmp/typo` if you're just testing things out). The Typo installer will
+create a SQLite database, create all of the tables needed for Typo, and then
+run a battery of tests to make sure that everything works successfully on your
+system.  When that's complete, it'll start up the Mongrel webserver on a 
+random TCP port.  You can access Typo directly via Mongrel for testing, and
+then you can use the installer's directions to set up a more permanent hosting
+environment.
+
+The same process can be used to upgrade Typo in the future--just run `gem
+install typo` to upgrade the version of the Typo installer on your system,
+then run `typo install /some/path` to upgrade your existing Typo install. The
+installer will back up your database, apply changes, re-test your environment,
+and then restart Mongrel.
+
+
+### Installing Typo Manually
+
+The manual installation process is only recommended for experienced Rails
+users, or people with an existing pre-4.0 Typo install. You'll need to
+download the source for Typo, either via the .zip and .tar files on Rubyforge
+or via Subversion. Then create a database for Typo by hand and populate it
+using the schema files in `db/schema.*.sql`. At this point, run
+`./script/server` to verify that Typo works successfully, and then set up
+either Mongrel or FastCGI to connect Typo to your existing web server.
+
+The full procedure for doing all of this is outside of the scope of this
+document.
+
+
+Support, or where to turn when things break
+-------------------------------------------
+
+Typo development occurs via http://typosphere.org.  If you find a bug, please
+file a bug report via http://typosphere.org/trac/newticket
+
+If you have problems, please send mail to typo-list@rubyforge.org.  You can also visit Typo's IRC channel, #typo on irc.freenode.net and ask for help.

data/installer/rails-installer.rb

@@ -72,16 +72,19 @@ class RailsInstaller
     stop
     
     backup_database
+    install_pre_hook
     pre_migrate_database
     copy_files
     freeze_rails
     create_default_config_files
+    fix_permissions
     create_directories
     create_initial_database
     set_initial_port_number
     expand_template_files
     
     migrate
+    install_post_hook
     save
     
     run_rails_tests
@@ -89,6 +92,11 @@ class RailsInstaller
     start
   end
   
+  def install_pre_hook
+  end
+  
+  def install_post_hook
+  end
   
   # Start application in the background
   def start(foreground = false)
@@ -299,9 +307,19 @@ class RailsInstaller
     cp("#{database_yml}.#{config['database']}",database_yml)
   end
   
+  def fix_permissions
+    unless RUBY_PLATFORM =~ /mswin32/
+      message "Making scripts executable"
+      chmod 0555, File.join(install_directory,'public','dispatch.fcgi')
+      chmod 0555, File.join(install_directory,'public','dispatch.cgi')
+      chmod 0555, Dir[File.join(install_directory,'script','*')]
+    end
+  end
+  
   # Create required directories, like tmp
   def create_directories
     mkdir_p(File.join(install_directory,'tmp','cache'))
+    chmod(755, File.join(install_directory,'tmp','cache'))
     mkdir_p(File.join(install_directory,'tmp','session'))
     mkdir_p(File.join(install_directory,'tmp','sockets'))
     mkdir_p(File.join(install_directory,'log'))
@@ -483,10 +501,11 @@ class RailsInstaller
     commands = Command.commands.keys.sort
     commands.each do |cmd|
       cmd_class = Command.commands[cmd]
-      cmd_help = cmd_class.help(self)
+      flag_help = cmd_class.flag_help_text.gsub(/APPNAME/,app_name)
+      help = cmd_class.help_text.gsub(/APPNAME/,app_name)
       
-      STDERR.puts "  #{app_name} #{cmd} DIRECTORY #{cmd_help.first}"
-      STDERR.puts "    #{cmd_help.last}"
+      STDERR.puts "  #{app_name} #{cmd} DIRECTORY #{flag_help}"
+      STDERR.puts "    #{help}"
     end
   end
 end

data/installer/rails-installer/commands.rb

@@ -10,7 +10,20 @@ class RailsInstaller
       raise "Not Implemented"
     end
     
-    def self.help(installer)
+    def self.flag_help(text)
+      @flag_help = text
+    end
+    
+    def self.flag_help_text
+      @flag_help || ''
+    end
+    
+    def self.help(text)
+      @help = text
+    end
+    
+    def self.help_text
+      @help || ''
     end
   
     def self.inherited(sub)
@@ -26,6 +39,8 @@ class RailsInstaller
     end
     
     class Install < RailsInstaller::Command
+      help "Install or upgrade APPNAME in PATH."
+
       def self.command(installer, *args)
         version = nil
         args.each do |arg|
@@ -38,13 +53,12 @@ class RailsInstaller
         
         installer.install(version)
       end
-      
-      def self.help(installer)
-        ['',"Install or upgrade #{installer.app_name} in PATH."]
-      end
     end
     
     class Config < RailsInstaller::Command
+      help "Read or set a configuration variable"
+      flag_help '[KEY=VALUE]...'
+
       def self.command(installer, *args)
         if args.size == 0
           installer.config.keys.sort.each do |k|
@@ -64,53 +78,40 @@ class RailsInstaller
           end
           installer.save
         end
-        
-      end
-      
-      def self.help(installer)
-        ['[KEY=VALUE]...',"Read or set a #{installer.app_name} configuration variable"]
       end
     end
     
     class Start < RailsInstaller::Command
+      help "Start the web server in the background"
+
       def self.command(installer, *args)
         installer.start
       end
-      
-      def self.help(installer)
-        ['',"Start the web server for #{installer.app_name} in the background"]
-      end
     end
 
     class Run < RailsInstaller::Command
+      help "Start the web server in the foreground"
+      
       def self.command(installer, *args)
         installer.start(true)
       end
-      
-      def self.help(installer)
-        ['',"Start the web server for #{installer.app_name} in the foreground"]
-      end
     end
 
     class Restart < RailsInstaller::Command
+      help "Stop and restart the web server."
+      
       def self.command(installer, *args)
         installer.stop
         installer.start
       end
-      
-      def self.help(installer)
-        ['',"Stop and restart the web server for #{installer.app_name}."]
-      end
     end
     
     class Stop < RailsInstaller::Command
+      help "Stop the web server"
+      
       def self.command(installer, *args)
         installer.stop
       end
-
-      def self.help(installer)
-        ['',"Stop the web server for #{installer.app_name}"]
-      end
     end
   end
 end