typo 4.0.0 → 4.0.1

data/app/views/admin/general/index.rhtml

@@ -25,10 +25,14 @@
       <label for="blog_subtitle">Blog subtitle:</label>
       <input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" />
     </p>
-  <p>
-    <label for="canonical_server_url">Canonical Server Url:</label>
-    <input name="setting[canonical_server_url]" id="canonical_server_url" type="text" value="<%= this_blog.canonical_server_url %>" />
-  </p>
+    <p>
+      <input name="setting[title_prefix]" id="blog_title_prefix" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.title_prefix %> />
+      <label for="blog_title_prefix">Prefix page title with blog name</label>
+    </p>
+    <p>
+      <label for="canonical_server_url">Canonical Server Url:</label>
+      <input name="setting[canonical_server_url]" id="canonical_server_url" type="text" value="<%= this_blog.canonical_server_url %>" />
+    </p>
     <p>
       <input name="setting[default_allow_comments]" id="default_allow_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.default_allow_comments%> />
       <input name="setting[default_allow_comments]" type="hidden" value="0"/>

data/app/views/admin/users/show.rhtml

@@ -1,4 +1,4 @@
-  <% @page_heading = 'Users' %>
+  <% @page_heading = "User: #{@user.name}" %>
 
   <% content_for('tasks') do %>
     <%= task_new 'Create new user' %>
@@ -16,3 +16,9 @@
     <label>Notify on new comments:</label> <span class="static"><%= @user.notify_on_comments? ? "yes" : "no" %></span><br/>
     
   </div>
+
+
+  <div class="list">
+    <h2>User's articles</h2>
+    <%= render :partial => 'admin/content/articles' %>
+  </div>

data/app/views/articles/read.rhtml

@@ -38,7 +38,7 @@
   <% if @article.comments.blank? %>
     <li id="dummy_comment" style="display: none"></li>
   <% else %>
-    <%= render(:partial => "comment", :collection => @article.comments.to_a.select {|c| c.published? }) %>
+    <%= render(:partial => "comment", :collection => @article.published_comments) %>
   <% end %>
   </ol>
 <% end -%>
@@ -50,7 +50,7 @@
     <span class="light-bg"><%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article.id %></span>
     </p>
   <%= content_tag(:ol,
-        render(:partial => "trackback", :collection => @article.trackbacks),
+        render(:partial => "trackback", :collection => @article.published_trackbacks),
         :id => 'trackbackList', :class => 'trackback-list') unless @article.trackbacks.blank? %>
 <% end -%>
 

data/bin/typo

@@ -1,21 +1,22 @@
 #!/usr/bin/env ruby
 
-require 'installer/rails-installer'
+require 'rails-installer'
 
 class TypoInstaller < RailsInstaller
   application_name 'typo'
   support_location 'the Typo mailing list'
-  rails_version '1.1.4'
+  rails_version '1.1.5'
   
   def install_post_hook
     sweep_cache
   end
-  
+
   # Sweep the cache
   def sweep_cache
-    Dir.chdir(install_directory)
-    message "Cleaning out #{@@app_name.capitalize}'s cache"
-    status = system("rake -s sweep_cache > /dev/null 2> /dev/null")
+    in_directory install_directory do
+      message "Cleaning out #{@@app_name.capitalize}'s cache"
+      status = system_silently("rake -s sweep_cache")
+    end
   end
 end
 

data/components/plugins/sidebars/recent_comments_controller.rb

@@ -18,6 +18,6 @@ class Plugins::Sidebars::RecentCommentsController < Sidebars::ComponentPlugin
   # setting :flag,       true, :input_type => :checkbox
 
   def content
-    @comments = Comment.find(:all, :limit => count, :order => 'created_at DESC' )
+    @comments = Comment.find(:all, :limit => count, :conditions => ['published = ?', true], :order => 'created_at DESC')
   end
 end

data/config/environment.rb

@@ -48,6 +48,8 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
   config.active_record.observers = :content_observer, :email_notifier, :web_notifier
 
+  config.active_record.allow_concurrency = true
+
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 

data/db/migrate/046_fixup_forthcoming_publications.rb

@@ -1,7 +1,7 @@
 require 'bare_migration'
 class FixupForthcomingPublications < ActiveRecord::Migration
   class Trigger < ActiveRecord::Base
-    belongs_to :pending_items, :polymorphic => true
+    belongs_to :pending_item, :polymorphic => true
   end
 
   class Content < ActiveRecord::Base

data/db/migrate/048_remove_count_caching.rb

@@ -0,0 +1,31 @@
+class RemoveCountCaching < ActiveRecord::Migration
+  class Content < ActiveRecord::Base
+    include BareMigration
+
+    def count_children_of_type(type)
+      self.class.find(:all,
+                      :conditions => ["article_id = ? and type = ?",
+                                                  self.id,     type]).size
+    end
+
+    def correct_counts
+      self.comments_count = self.count_children_of_type('Comment')
+      self.trackbacks_count = self.count_children_of_type('Trackback')
+    end
+  end
+
+  def self.up
+    remove_column :contents, :comments_count
+    remove_column :contents, :trackbacks_count
+  end
+
+  def self.down
+    modify_tables_and_update(
+     [:add_column, Content, :comments_count, :integer],
+     [:add_column, Content, :trackbacks_count, :integer]) do |a|
+      if not $schema_generator
+        a.correct_counts
+      end
+    end
+  end
+end

data/db/migrate/049_move_feedback_to_new_state_machine.rb

@@ -0,0 +1,33 @@
+class MoveFeedbackToNewStateMachine < ActiveRecord::Migration
+  class Content < ActiveRecord::Base
+    include BareMigration
+  end
+
+  def self.up
+    return if $schema_generator
+    Content.find(:all,
+                 :conditions => ['type = ? or type = ?',
+                                    'Trackback', 'Comment']).each do |c|
+      c.state = if c.published?
+                  'ContentState::PresumedHam'
+                else
+                  'ContentState::PresumedSpam'
+                end
+      c.save!
+    end
+  end
+
+  def self.down
+    return if $schema_generator
+    Content.find(:all,
+                 :conditions => ['type = ? or type = ?',
+                                    'Trackback', 'Comment']).each do |c|
+      c.state = if c.published?
+                  'ContentState::Published'
+                else
+                  'ContentState::Withdrawn'
+                end
+      c.save!
+    end
+  end
+end

data/db/schema.mysql-v3.sql

@@ -60,13 +60,12 @@ CREATE TABLE contents (
   `ip` varchar(40),
   `blog_name` varchar(255),
   `name` varchar(255),
-  `comments_count` int(11),
-  `trackbacks_count` int(11),
   `published` tinyint(1) DEFAULT 0,
   `allow_pings` tinyint(1),
   `allow_comments` tinyint(1),
   `blog_id` int(11) NOT NULL,
-  `published_at` datetime
+  `published_at` datetime,
+  `state` text
 ) TYPE=MyISAM;
 
 CREATE TABLE notifications (
@@ -215,4 +214,4 @@ CREATE TABLE schema_info (
   `version` int(11)
 ) TYPE=MyISAM;
 
-insert into schema_info (version) values (46);
+insert into schema_info (version) values (49);

data/db/schema.mysql.sql

@@ -60,13 +60,12 @@ CREATE TABLE contents (
   `ip` varchar(40),
   `blog_name` varchar(255),
   `name` varchar(255),
-  `comments_count` int(11),
-  `trackbacks_count` int(11),
   `published` tinyint(1) DEFAULT 0,
   `allow_pings` tinyint(1),
   `allow_comments` tinyint(1),
   `blog_id` int(11) NOT NULL,
-  `published_at` datetime
+  `published_at` datetime,
+  `state` text
 ) ENGINE=InnoDB;
 
 CREATE TABLE notifications (
@@ -215,4 +214,4 @@ CREATE TABLE schema_info (
   `version` int(11)
 ) ENGINE=InnoDB;
 
-insert into schema_info (version) values (46);
+insert into schema_info (version) values (49);

data/db/schema.postgresql.sql

@@ -60,13 +60,12 @@ CREATE TABLE contents (
   "ip" character varying(40),
   "blog_name" character varying(255),
   "name" character varying(255),
-  "comments_count" integer,
-  "trackbacks_count" integer,
   "published" boolean DEFAULT 'f',
   "allow_pings" boolean,
   "allow_comments" boolean,
   "blog_id" integer NOT NULL,
-  "published_at" timestamp
+  "published_at" timestamp,
+  "state" text
 );
 
 CREATE TABLE notifications (
@@ -215,4 +214,4 @@ CREATE TABLE schema_info (
   "version" integer
 );
 
-insert into schema_info (version) values (46);
+insert into schema_info (version) values (49);

data/db/schema.rb

@@ -2,12 +2,12 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 47) do
+ActiveRecord::Schema.define(:version => 49) do
 
   create_table "articles_categories", :id => false, :force => true do |t|
     t.column "article_id", :integer
     t.column "category_id", :integer
-    t.column "primary_item", :integer
+    t.column "is_primary", :integer
   end
 
   create_table "articles_tags", :id => false, :force => true do |t|
@@ -16,11 +16,11 @@ ActiveRecord::Schema.define(:version => 47) do
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.column "type", :string, :limit => 15
+    t.column "type", :string
     t.column "pattern", :string
   end
 
-  add_index "blacklist_patterns", ["pattern"], :name => "idx_blacklist_pattern"
+  add_index "blacklist_patterns", ["pattern"], :name => "blacklist_patterns_pattern_index"
 
   create_table "blogs", :force => true do |t|
     t.column "settings", :text
@@ -28,8 +28,7 @@ ActiveRecord::Schema.define(:version => 47) do
 
   create_table "categories", :force => true do |t|
     t.column "name", :string
-    t.column "position", :integer, :default => 0, :null => false
-    t.column "is_primary", :integer
+    t.column "position", :integer
     t.column "permalink", :string
   end
 
@@ -58,12 +57,10 @@ ActiveRecord::Schema.define(:version => 47) do
     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
-    t.column "blog_id", :integer
+    t.column "blog_id", :integer, :null => false
     t.column "published_at", :datetime
     t.column "state", :text
   end
@@ -85,12 +82,12 @@ ActiveRecord::Schema.define(:version => 47) do
   add_index "page_caches", ["name"], :name => "page_caches_name_index"
 
   create_table "pings", :force => true do |t|
-    t.column "article_id", :integer, :null => false
+    t.column "article_id", :integer
     t.column "url", :string
     t.column "created_at", :datetime
   end
 
-  add_index "pings", ["article_id"], :name => "idx_pings_article_id"
+  add_index "pings", ["article_id"], :name => "pings_article_id_index"
 
   create_table "redirects", :force => true do |t|
     t.column "from_path", :string
@@ -124,10 +121,10 @@ ActiveRecord::Schema.define(:version => 47) do
   add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
 
   create_table "sidebars", :force => true do |t|
-    t.column "active_position", :integer
     t.column "controller", :string
+    t.column "active_position", :integer
+    t.column "config", :text
     t.column "staged_position", :integer
-    t.column "config", :string, :limit => nil
   end
 
   create_table "tags", :force => true do |t|
@@ -153,8 +150,8 @@ ActiveRecord::Schema.define(:version => 47) do
   end
 
   create_table "users", :force => true do |t|
-    t.column "login", :string, :limit => 40
-    t.column "password", :string, :limit => 40
+    t.column "login", :string
+    t.column "password", :string
     t.column "email", :text
     t.column "name", :text
     t.column "notify_via_email", :boolean
@@ -165,6 +162,4 @@ ActiveRecord::Schema.define(:version => 47) do
     t.column "jabber", :string
   end
 
-  add_index "users", ["login"], :name => "users_login_key", :unique => true
-
 end

data/db/schema.sqlite.sql

@@ -60,13 +60,12 @@ CREATE TABLE contents (
   "ip" varchar(40),
   "blog_name" varchar(255),
   "name" varchar(255),
-  "comments_count" integer,
-  "trackbacks_count" integer,
   "published" boolean DEFAULT 'f',
   "allow_pings" boolean,
   "allow_comments" boolean,
   "blog_id" integer NOT NULL,
-  "published_at" datetime
+  "published_at" datetime,
+  "state" text
 );
 
 CREATE TABLE notifications (
@@ -215,4 +214,4 @@ CREATE TABLE schema_info (
   "version" integer
 );
 
-insert into schema_info (version) values (46);
+insert into schema_info (version) values (49);

data/db/schema.sqlserver.sql

@@ -64,13 +64,12 @@ CREATE TABLE contents (
   [ip] varchar(40),
   [blog_name] varchar(255),
   [name] varchar(255),
-  [comments_count] int,
-  [trackbacks_count] int,
   [published] bit DEFAULT 0,
   [allow_pings] bit,
   [allow_comments] bit,
   [blog_id] int NOT NULL,
-  [published_at] datetime
+  [published_at] datetime,
+  [state] text
 );
 
 CREATE TABLE notifications (
@@ -229,4 +228,4 @@ CREATE TABLE schema_info (
   [version] int
 );
 
-insert into schema_info (version) values (46);
+insert into schema_info (version) values (49);

data/db/schema_version

@@ -1 +1 @@
-46
+49

data/doc/Installer.txt

@@ -137,6 +137,10 @@ Troubleshooting
 You didn't install Swig before installing `sqlite3-ruby`. Uninstall the SQLite
 driver, install Swig, and then re-install `sqlite3-ruby`.
 
+### SQLite dies with "unsupported file format"
+
+You have multiple versions of SQLite3 installed, and you're using the command-line tool from one with the library from the other.  Most likely this is on OS X with Darwinports.  Make sure that `/opt/local/bin` is ahead of `/usr/bin` in your path.
+
 ### MySQL fails with timeout errors
 
 Install the MySQL GEM. It's faster then Rails' default MySQL driver, and it

data/lib/jabber_notify.rb

@@ -3,6 +3,10 @@ require 'jabber4r/jabber4r'
 class JabberNotify
   @@jabber = nil
 
+  def self.logger
+    @@logger ||= RAILS_DEFAULT_LOGGER || Logger.new(STDOUT)
+  end
+
   def self.send_message(user, subject, body, html)
     return if user.jabber.blank?
 
@@ -22,11 +26,11 @@ class JabberNotify
   def self.session
     return @@jabber if @@jabber
 
-    address = this_blog.jabber_address
+    address = Blog.default.jabber_address
     unless address =~ /\//
       address = address + '/typo'
     end
 
-    @@jabber ||= Jabber::Session.bind(address, this_blog.jabber_password)
+    @@jabber ||= Jabber::Session.bind(address, Blog.default.jabber_password)
   end
 end

data/lib/sidebars/plugin.rb

@@ -63,7 +63,8 @@ module Sidebars
 
     class CheckBoxField < self
       def input_html(sidebar)
-        check_box_tag(input_name(sidebar), 1, !sidebar.config[key].blank?, options)
+        check_box_tag(input_name(sidebar), 1, sidebar.config[key], options)+
+        hidden_field_tag(input_name(sidebar),0)
       end
 
       def line_html(sidebar)

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "4.0.0"
+PKG_VERSION = "4.0.1"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -15,7 +15,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = false
   
   s.files = Dir.glob('**/*', File::FNM_DOTMATCH).reject do |f| 
-     [ /\.$/, /config\/database.yml$/, /config\database.yml-/, 
+     [ /\.$/, /config\/database.yml$/, /config\/database.yml-/, 
+     /database\.sqlite/,
      /\.log$/, /^pkg/, /\.svn/, /^vendor\/rails/, 
      /^public\/(files|xml|articles|pages|index.html)/, 
      /^public\/(stylesheets|javascripts|images)\/theme/, /\~$/, 
@@ -29,10 +30,11 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY 
   s.executables = ['typo']
   
-  s.add_dependency("rails", "= 1.1.4")
+  s.add_dependency("rails", "= 1.1.5")
   s.add_dependency("mongrel", ">= 0.3.13.3")
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
   s.add_dependency("sqlite3-ruby", ">= 1.1.0")
+  s.add_dependency("rails-app-installer", ">= 0.1.1")
 end
 
 Rake::GemPackageTask.new(spec) do |p|
@@ -41,7 +43,6 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-
 desc "Publish the zip/tgz"
 task :leetsoft_upload => [:package] do
   Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.zip").upload