typo 5.3 → 5.4

data/config/environments/cucumber.rb

@@ -0,0 +1,23 @@
+config.cache_classes = true # This must be true for Cucumber to operate correctly!
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+config.gem "cucumber",    :lib => false,        :version => ">=0.3.92" unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+config.gem "webrat",      :lib => false,        :version => ">=0.4.4" unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem "rspec",       :lib => false,        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+
+config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase of at least 30 characters" }

data/config/environments/development.rb

@@ -8,7 +8,7 @@ config.whiny_nils        = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = true
+config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/config/environments/test.rb

@@ -21,3 +21,8 @@ config.action_controller.allow_forgery_protection    = false
 
 Migrator.offer_migration_when_available            = false
 require 'ruby-debug'
+config.gem "thoughtbot-factory_girl",
+  :lib    => "factory_girl",
+  :source => "http://gems.github.com"
+config.gem 'rspec', :lib => false
+config.gem 'rspec-rails', :lib => false

data/config/initializers/access_rules.rb

@@ -47,6 +47,7 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   map.permission "admin/cache"
   map.permission "admin/dashboard"
   map.permission "admin/textfilters"
+  map.permission "previews"
 
   map.project_module :write, nil do |project|
     project.menu    "Write",            { :controller => "admin/content",    :action => "new" }
@@ -57,19 +58,12 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   map.project_module :content, nil do |project|
     project.menu    "Manage",           { :controller => "admin/content",    :action => "index" }
     project.submenu "Articles",         { :controller => "admin/content",    :action => "index" }
-	project.submenu "Pages",            { :controller => "admin/pages",      :action => "index" }
-	project.submenu "Categories",       { :controller => "admin/categories", :action => "index" }
-	project.submenu "Uploads",          { :controller => "admin/resources",  :action => "index" }
-	project.submenu "Tags",             { :controller => "admin/tags",       :action => "index" }
-  end
-
-  map.project_module :feedback, nil do |project|
-    project.menu    "Comments",              { :controller => "admin/feedback" }
-    project.submenu "All comments",          { :controller => "admin/feedback" }    
-    project.submenu "Limit to ham",          { :controller => "admin/feedback",  :ham => 'f' }
-    project.submenu "Unapproved comments",   { :controller => "admin/feedback",  :confirmed  => "f" }    
-    project.submenu "Limit to spam",         { :controller => "admin/feedback",  :published  => "f" }
-    project.submenu "",                      { :controller => "admin/comments", :action => "show" }
+    project.submenu "Comments",         { :controller => "admin/feedback" }
+	  project.submenu "Pages",            { :controller => "admin/pages",      :action => "index" }
+	  project.submenu "Categories",       { :controller => "admin/categories", :action => "index" }
+	  project.submenu "Uploads",          { :controller => "admin/resources",  :action => "index" }
+	  project.submenu "Tags",             { :controller => "admin/tags",       :action => "index" }
+	  project.submenu "",                      { :controller => "admin/comments", :action => "show" }
     project.submenu "",                      { :controller => "admin/comments", :action => "new" }
     project.submenu "",                      { :controller => "admin/comments", :action => "edit" }
     project.submenu "",                      { :controller => "admin/comments", :action => "destroy" }
@@ -80,25 +74,28 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   end
 
   map.project_module :themes, nil do |project|
-    project.menu    "Design",                { :controller => "admin/themes", :action => "index"  }
+    project.menu    "Customize",             { :controller => "admin/themes", :action => "index"  }
+    project.submenu "Choose theme",          { :controller => "admin/themes", :action => "index" }
+    project.submenu "Customize sidebar",     { :controller => "admin/sidebar", :action => "index" }
     project.submenu "Theme editor",          { :controller => "admin/themes", :action => "editor" }
-    project.submenu "Sidebar",               { :controller => "admin/sidebar", :action => "index" }
-    project.submenu "Theme catalogue",       { :controller => "admin/themes", :action => "catalogue" }
+    project.submenu "View theme catalogue",       { :controller => "admin/themes", :action => "catalogue" }
   end
   
   map.project_module :settings, nil do |project|
     project.menu    "Settings",              { :controller => "admin/settings", :action => "index" }
     project.submenu "General settings",      { :controller => "admin/settings", :action => "index" }
     project.submenu "Write",                 { :controller => "admin/settings", :action => "write" }
-    project.submenu "Read",                  { :controller => "admin/settings", :action => "read" }
     project.submenu "Feedback",              { :controller => "admin/settings", :action => "feedback" }			
     project.submenu "SEO",                   { :controller => "admin/settings", :action => "seo" }
     project.submenu "Blacklist",             { :controller => "admin/blacklist", :action => "index" }
-  end  
-  
-  map.project_module :users, "admin/users" do |project|
-    project.menu    "Users",                 { :action => "index" }
-    project.submenu "Users",                 { :action => "index" }
-  end  
+    project.submenu "Users",                 { :controller => "admin/users", :action => "index" }
+    project.submenu "",                 { :controller => "admin/users", :action => "show" }
+    project.submenu "",                 { :controller => "admin/users", :action => "new" }
+    project.submenu "",                 { :controller => "admin/users", :action => "edit" }
+    project.submenu "",                 { :controller => "admin/users", :action => "destroy" }
+  end    
   
+  map.project_module :profile, "admin/profiles" do |project|
+    project.menu    "Profile",                 { :action => "index" }
+  end
 end

data/config/locales/nl.rb

@@ -0,0 +1,103 @@
+{
+  :'nl' => {
+    :date => {
+      :formats => {
+        :default      => "%d/%m/%Y",
+        :short        => "%e %b",
+        :long         => "%e %B %Y",
+        :long_ordinal => lambda { |date| "#{date.day}e van %B %Y" },
+        :only_day     => "%e"
+      },
+      :day_names => %w(Zondag Maandag Dinsdag Woensdag Donderdag Vrijdag Zaterdag),
+      :abbr_day_names => %w(Zo Ma Di Wo Do Vr Za),
+      :month_names => [nil] + %w(Januari Februari Maart April Mei Juni Juli Augustus September Oktober November December),
+      :abbr_month_names => [nil] + %w(Jan Feb Mrt Apr Mei Jun Jul Aug Sep Okt Nov Dec),
+      :order => [:day, :month, :year]
+    },
+    :time => {
+      :formats => {
+        :default      => "%a %b %d %H:%M:%S %Z %Y",
+        :time         => "%H:%M",
+        :short        => "%d %b %H:%M",
+        :long         => "%d %B %Y %H:%M",
+        :long_ordinal => lambda { |time| "#{time.day}e van %B %Y %H:%M" },
+        :only_second  => "%S"
+      },
+      :datetime => {
+        :formats => {
+          :default => "%Y-%m-%dT%H:%M:%S%Z"
+        }
+      },
+      :time_with_zone => {
+        :formats => {
+          :default => lambda { |time| "%Y-%m-%d %H:%M:%S #{time.formatted_offset(false, 'UTC')}" }
+        }
+      },
+      :am => %q('s ochtends),
+      :pm => %q('s middags)
+    },
+    :datetime => {
+      :distance_in_words => {
+        :half_a_minute       => 'een halve minuut',
+        :less_than_x_seconds => {:zero => 'minder dan een seconde', :one => 'minder dan 1 seconde', :other => 'minder dan {{count}} secondes'},
+        :x_seconds           => {:one => '1 seconde', :other => '{{count}} secondes'},
+        :less_than_x_minutes => {:zero => 'minder dan een minuut', :one => 'minder dan 1 minuut', :other => 'minder dan {{count}} minuten'},
+        :x_minutes           => {:one => "1 minuut", :other => "{{count}} minuten"},
+        :about_x_hours       => {:one => 'ongeveer 1 uur', :other => 'ongeveer {{count}} uren'},
+        :x_days              => {:one => '1 dag', :other => '{{count}} dagen'},
+        :about_x_months      => {:one => 'ongeveer 1 maand', :other => 'ongeveer {{count}} maanden'},
+        :x_months            => {:one => '1 maand', :other => '{{count}} maanden'},
+        :about_x_years       => {:one => 'ongeveer 1 jaar', :other => 'ongeveer {{count}} jaren'},
+        :over_x_years        => {:one => 'langer dan 1 jaar', :other => 'langer dan {{count}} jaren'}
+      }
+    },
+    :number => {
+      :format => {
+        :precision => 2,
+        :separator => ',',
+        :delimiter => '.'
+      },
+      :currency => {
+        :format => {
+          :unit => '€',
+          :precision => 2,
+          :format => '%u %n'
+        }
+      }
+    },
+
+    # Active Record
+    :activerecord => {
+      :errors => {
+        :template => {
+          :header => {
+            :one => "Kon dit {{model}} object niet opslaan: 1 fout.", 
+            :other => "Kon dit {{model}} niet opslaan: {{count}} fouten."
+          },
+          :body => "Controleer alstublieft de volgende velden:"
+        },
+        :messages => {
+          :inclusion => "is niet in de lijst opgenomen",
+          :exclusion => "is niet beschikbaar",
+          :invalid => "is ongeldig",
+          :confirmation => "komt niet met z'n bevestiging overeen",
+          :accepted  => "moet worden geaccepteerd",
+          :empty => "moet opgegeven zijn",
+          :blank => "moet opgegeven zijn",
+          :too_long => "is te lang (niet meer dan {{count}} karakters)",
+          :too_short => "is te kort (niet minder dan {{count}} karakters)",
+          :wrong_length => "heeft niet de juiste lengte (moet precies {{count}} karakters zijn)",
+          :taken => "is niet beschikbaar",
+          :not_a_number => "is niet een getal",
+          :greater_than => "moet groter zijn dan {{count}}",
+          :greater_than_or_equal_to => "moet groter of gelijk zijn aan {{count}}",
+          :equal_to => "moet gelijk zijn aan {{count}}",
+          :less_than => "moet minder zijn dan {{count}}",
+          :less_than_or_equal_to => "moet minder of gelijk zijn aan {{count}}",
+          :odd => "moet oneven zijn",
+          :even => "moet even zijn"
+        }
+      }
+    }
+  }
+}

data/config/routes.rb

@@ -15,7 +15,8 @@ ActionController::Routing::Routes.draw do |map|
   # this improves caches_page because now apache and webrick will send out the
   # cached feeds with the correct xml mime type.
 
-  map.xml 'articles.:format', :controller => 'articles', :action => 'index', :format => /rss|atom/
+  map.rss 'articles.rss', :controller => 'articles', :action => 'index', :format => 'rss'
+  map.atom 'articles.atom', :controller => 'articles', :action => 'index', :format => 'atom'
   
   map.with_options :controller => 'xml', :path_prefix => 'xml' do |controller|
     controller.xml 'itunes/feed.xml', :action => 'itunes'
@@ -37,8 +38,8 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :trackbacks
 
   map.live_search_articles '/live_search/', :controller => "articles", :action => "live_search"
-  map.connect '/search/:q.:format', :controller => "articles", :action => "search"
-  map.connect '/search/', :controller => "articles", :action => "search"
+  map.search '/search/:q.:format', :controller => "articles", :action => "search"
+  map.search_base '/search/', :controller => "articles", :action => "search"
   map.connect '/archives/', :controller => "articles", :action => "archives"
 
   # I thinks it's useless. More investigating
@@ -57,6 +58,9 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect '/tag/:id/page/:page', :controller => 'tags', :action => 'show'
   map.connect '/tags/page/:page', :controller => 'tags', :action => 'index'
+
+  map.connect '/author/:id', :controller => 'authors', :action => 'show'
+  map.xml '/author/:id.:format', :controller => 'authors', :action => 'show', :format => /rss|atom/
   
   # allow neat perma urls
   map.connect 'page/:page',
@@ -81,6 +85,8 @@ ActionController::Routing::Routes.draw do |map|
       :controller => 'textfilter', :action => 'public_action'
   end
 
+  map.connect 'previews/:id', :controller => 'previews', :action => 'index'
+
   # Work around the Bad URI bug
   %w{ accounts backend files sidebar textfilter xml }.each do |i|
     map.connect "#{i}", :controller => "#{i}", :action => 'index'
@@ -88,7 +94,7 @@ ActionController::Routing::Routes.draw do |map|
     map.connect "#{i}/:action/:id", :controller => i, :id => nil
   end
 
-  %w{advanced blacklist cache categories comments content feedback general pages
+  %w{advanced blacklist cache categories comments content profiles feedback general pages
      resources sidebar textfilters themes trackbacks users settings tags }.each do |i|
     map.connect "/admin/#{i}", :controller => "admin/#{i}", :action => 'index'
     map.connect "/admin/#{i}/:action/:id", :controller => "admin/#{i}", :action => nil, :id => nil

data/db/migrate/001_initial_schema.rb

@@ -43,6 +43,10 @@ class InitialSchema < ActiveRecord::Migration
         t.column :position, :integer
       end
 
+      category = Bare1Category.create(:name => 'General',
+        :position => 1
+      )
+      
       article = Bare1Article.create(:title=>'Hello World!',
         :author=>'Mr Typo',
         :body=>'Welcome to Typo. This is your first article. Edit or delete it, then start blogging!',

data/db/migrate/057_add_categorization_model.rb

@@ -18,17 +18,24 @@ class AddCategorizationModel < ActiveRecord::Migration
       # You need test if ArticlesCategory object exist because if
       # exception raise even rescue in migration and migration failed and stop
       # :(
-      if Object.constants.include? 'ArticlesCategory'
-        ArticlesCategory.find(:all).each do |ac|
+      if table_exists? :articles_categories
+        ArticlesCategory.all.each do |ac|
           Categorization.create!(:article_id => ac.article_id,
                                  :category_id => ac.category_id,
                                  :is_primary => (ac.is_primary == 1))
         end
+        drop_table :articles_categories
       end
     end
-
-    # The ArticleCategories table is doesn't create
-    #drop_table :articles_categories rescue nil
+    # Adds the article category to the first post if and only if generating the schema
+    if User.count.zero?
+      puts "Adding category to default article"
+      article = Article.find(:first)
+      category = Category.find(:first)
+      Categorization.create!(:article_id => article.id,
+                             :category_id => category.id,
+                             :is_primary => 1)
+    end
   end
 
   def self.down

data/db/migrate/060_cleanup_contents_table.rb

@@ -1,6 +1,14 @@
 class CleanupContentsTable < ActiveRecord::Migration
   def self.up
-    remove_index(:contents, :article_id) rescue nil
+    if adapter_name == 'PostgreSQL'
+      indexes(:contents).each do |index|
+        if index.name =~ /article_id/
+          remove_index(:contents, :name => index.name)
+        end
+      end
+    else
+      remove_index :contents, :article_id rescue nil
+    end
 
     remove_column :contents, :article_id rescue nil
     remove_column :contents, :email 

data/db/migrate/067_remove_blog_ids.rb

@@ -1,6 +1,14 @@
 class RemoveBlogIds < ActiveRecord::Migration
   def self.up
-    remove_index :contents, :blog_id rescue nil
+    if adapter_name == 'PostgreSQL'
+      indexes(:contents).each do |index|
+        if index.name =~ /blog_id/
+          remove_index(:contents, :name => index.name)
+        end
+      end
+    else
+      remove_index :contents, :blog_id rescue nil
+    end
     remove_column :contents, :blog_id 
     remove_column :sidebars, :blog_id 
     remove_column :feedback, :blog_id 

data/db/migrate/075_move_editor_to_user.rb

@@ -1,17 +1,7 @@
 class MoveEditorToUser < ActiveRecord::Migration
   def self.up
     add_column :users, :editor, :integer, :default => 2
-    
-    unless $schema_generator
-      blog = Blog.default
-      editor = blog.editor
-      users = User.find(:all)
-      users.each do |user|
-        user.editor = editor.to_i
-        user.save!
-      end
-    end
-    
+    User.update_all("editor = #{Blog.default.editor.to_i}")
   end
 
   def self.down

data/db/migrate/078_add_textfilter_to_users.rb

@@ -5,11 +5,7 @@ class AddTextfilterToUsers < ActiveRecord::Migration
 
     unless Blog.default.nil?
       t = TextFilter.find(:first, :conditions => "name= '#{Blog.default.text_filter}'")
-      User.find(:all).each do |user|
-        STDERR.puts "Adding textfilter #{t.name} to #{user.login}"
-        user.text_filter_id = t.id
-        user.save
-      end
+      User.update_all("text_filter_id = #{t.id}")
     end    
   end
 

data/db/migrate/079_move_editor_as_string.rb

@@ -4,11 +4,7 @@ class MoveEditorAsString < ActiveRecord::Migration
     add_column :users, :editor, :string, :default => 'simple'
     
     unless $schema_generator
-      users = User.find(:all)
-      users.each do |user|
-        user.editor = 'simple'
-        user.save!
-      end
+      User.update_all("editor = 'simple'")
     end
     
   end

data/db/migrate/080_add_state_to_user.rb

@@ -3,11 +3,7 @@ class AddStateToUser < ActiveRecord::Migration
     add_column :users, :state, :string, :default => 'active'
     
     unless $schema_generator
-      users = User.find(:all)
-      users.each do |user|
-        user.state = 'active'
-        user.save!
-      end
+      User.update_all("state = 'active'")
     end
     
   end

data/db/migrate/082_add_users_options.rb

@@ -0,0 +1,35 @@
+class AddUsersOptions < ActiveRecord::Migration
+  def self.up
+    add_column :users, :firstname, :string
+    add_column :users, :lastname, :string
+    add_column :users, :nickname, :string
+    add_column :users, :url, :string
+    add_column :users, :msn, :string    
+    add_column :users, :aim, :string    
+    add_column :users, :yahoo, :string
+    add_column :users, :twitter, :string
+    add_column :users, :description, :text
+    remove_column :users, :notify_via_jabber
+    
+    unless $schema_generator
+      users = User.find(:all)
+      users.each do |user|
+        user.nickname = user.name
+        user.save!
+      end
+    end
+  end
+
+  def self.down
+    remove_column :users, :firstname
+    remove_column :users, :lastname
+    remove_column :users, :nickname
+    remove_column :users, :url
+    remove_column :users, :msn
+    remove_column :users, :aim
+    remove_column :users, :jabber
+    remove_column :users, :yahoo
+    remove_column :users, :description
+    add_column :users, :notify_via_jabber, :tinyint
+  end
+end

data/db/migrate/083_add_users_display_perms.rb

@@ -0,0 +1,19 @@
+class AddUsersDisplayPerms < ActiveRecord::Migration
+  def self.up
+    add_column :users, :show_url, :boolean
+    add_column :users, :show_msn, :boolean    
+    add_column :users, :show_aim, :boolean   
+    add_column :users, :show_yahoo, :boolean
+    add_column :users, :show_twitter, :boolean
+    add_column :users, :show_jabber, :boolean
+  end
+
+  def self.down
+    remove_column :users, :show_url
+    remove_column :users, :show_msn
+    remove_column :users, :show_aim
+    remove_column :users, :show_yahoo
+    remove_column :users, :show_twitter
+    remove_column :users, :show_jabber
+  end
+end