@@ -15,14 +15,14 @@ class Database < ActiveRecord::Base validates_length_of :name, :maximum => 64, - :message => 'must be less than %d characters in length' + :message => 'must be less than {count} characters in length' validates_presence_of :description, :message => 'description required' validates_length_of :description, :maximum => 255, - :message => 'must be less than %d characters in length' + :message => 'must be less than {count} characters in length' validates_presence_of :path, :if => Proc.new { |database| database.driver && database.driver.name == 'sqlite3' }, @@ -40,7 +40,7 @@ class Database < ActiveRecord::Base validates_length_of :host, :if => Proc.new { |database| database.driver && database.driver.name != 'sqlite3' }, :maximum => 255, - :message => 'must be less than %d characters in length' + :message => 'must be less than {count} characters in length' validates_presence_of :username, :if => Proc.new { |database| database.driver && database.driver.name != 'sqlite3' }, @@ -49,12 +49,12 @@ class Database < ActiveRecord::Base validates_length_of :username, :if => Proc.new { |database| database.driver && database.driver.name != 'sqlite3' }, :maximum => 32, - :message => 'must be less than %d characters in length' + :message => 'must be less than {count} characters in length' validates_length_of :password, :allow_nil => true, :maximum => 40, - :message => 'must be less than %d characters in length' + :message => 'must be less than {count} characters in length' # # app/models/database.rb @@ -7,6 +7,6 @@ class Driver < ActiveRecord::Base validates_length_of :name, :maximum => 16, - :message => 'must be %d characters or less' + :message => 'must be {count} characters or less' end app/models/driver.rb @@ -24,8 +24,9 @@ module Rails File.exist?("#{RAILS_ROOT}/vendor/rails") end + # FIXME : Ruby 1.9 def preinitialize - load(preinitializer_path) if File.exist?(preinitializer_path) + load(preinitializer_path) if File.exists?(preinitializer_path) end def preinitializer_path @@ -43,7 +44,6 @@ module Rails class VendorBoot < Boot def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) end end config/boot.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -77,11 +77,6 @@ PER_PAGE = 20 LINK_SPAN = 4 # -# Fixes for irregular pluralizations -# -Inflector.inflections.irregular 'database', 'databases' - -# # Dynamic table names can't override core Ruby/Rails classes # ALT_TABLE_NAMES = { 'proc' => 'proc_renamed', # mysql config/environment.rb @@ -1,10 +1,3 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end +ActiveSupport::Inflector.inflections do |inflect| + inflect.irregular 'database', 'databases' +end config/initializers/inflections.rb @@ -1,5 +1,5 @@ # This file is auto-generated from the current state of the database. Instead of editing this file, -# please use the migrations feature of ActiveRecord to incrementally modify your database, and +# 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 @@ -34,9 +34,7 @@ ActiveRecord::Schema.define(:version => 9) do end create_table "drivers", :force => true do |t| - t.string "name", :limit => 64 - t.datetime "created_at" - t.datetime "updated_at" + t.string "name", :limit => 16, :null => false end create_table "group_permissions", :force => true do |t| @@ -72,8 +70,8 @@ ActiveRecord::Schema.define(:version => 9) do t.datetime "updated_at" end - add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" + add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" create_table "user_groups", :force => true do |t| t.integer "user_id", :null => false @@ -95,7 +93,7 @@ ActiveRecord::Schema.define(:version => 9) do t.datetime "updated_at" end - add_index "users", ["username"], :name => "index_users_on_username", :unique => true add_index "users", ["email"], :name => "index_users_on_email", :unique => true + add_index "users", ["username"], :name => "index_users_on_username", :unique => true end db/schema.rb @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan) // (c) 2005-2007 Jon Tirsen (http://www.tirsen.com) // Contributors: public/javascripts/controls.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) // // script.aculo.us is freely distributable under the terms of an MIT-style license. public/javascripts/dragdrop.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // Contributors: // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) public/javascripts/effects.js log/mongrel.log 79e6be29eff7c8269dc469f5be0aa0e8aba84211 Greg Donald destiney@neptune.local http://github.com/gdonald/railsdb/commit/f6ab653eb0d9912667419488a46bf9ac6f8de520 f6ab653eb0d9912667419488a46bf9ac6f8de520 2008-12-31T22:13:56-08:00 2008-12-31T22:13:56-08:00 rails 2.2.2 fixes 670ff55b2194f39ff2360de8c24da26d945038ba Greg Donald destiney@neptune.local