rails 0.13.0 → 0.13.1

data/CHANGELOG

@@ -1,4 +1,17 @@
-*SVN*
+*0.13.1* (11 July, 2005)
+
+* Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson]
+
+* Added support for SQL Server in the database rake tasks #1652 [ken.barker@gmail.com] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
+
+* Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version
+
+* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release #1674 [court3nay@gmail.com]
+
+* Improved documentation for environment config files #1625 [court3nay@gmail.com]
+
+
+*0.13.0* (6 July, 2005)
 
 * Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.13.0' + PKG_BUILD
+PKG_VERSION     = '0.13.1' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -247,15 +247,15 @@ spec = Gem::Specification.new do |s|
   s.summary = "Web-application framework with template engine, control-flow layer, and ORM."
   s.description = <<-EOF
     Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick
-    on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates.
+    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
   EOF
 
   s.add_dependency('rake', '>= 0.5.3')
-  s.add_dependency('activesupport',    '= 1.1.0' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.11.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.9.0' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.0.0' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 0.8.0' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 1.1.1' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.11.1' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.9.1' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.0.1' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 0.8.1' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/bin/rails

@@ -1,4 +1,13 @@
-abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
+min_release  = "1.8.2 (2004-12-25)"
+ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
+if ruby_release < min_release
+  abort <<-end_message
+
+    Rails requires Ruby version #{min_release} or later.
+    You're running #{ruby_release}; please upgrade to continue.
+
+  end_message
+end
 
 Signal.trap("INT") { puts; exit }
 

data/environments/development.rb

@@ -1,6 +1,14 @@
+# In the development environment your application's code is reloaded on
+# every request.  This slows down response time but is perfect for development
+# since you don't have to restart the webserver when you make code changes.
+
+# Log error messages when you accidentally call methods on nil.
 require 'active_support/whiny_nil'
 
+# Reload code; show full error reports; disable caching.
 Dependencies.mechanism                             = :load
 ActionController::Base.consider_all_requests_local = true
 ActionController::Base.perform_caching             = false
-BREAKPOINT_SERVER_PORT = 42531
+
+# The breakpoint server port that script/breakpointer connects to.
+BREAKPOINT_SERVER_PORT = 42531

data/environments/environment.rb

@@ -1,8 +1,20 @@
-RAILS_ROOT = File.dirname(__FILE__) + "/../"
+# Load the Rails framework and configure your application.
+# You can include your own configuration at the end of this file.
+#
+# Be sure to restart your webserver when you modify this file.
+
+# The path to the root directory of your application.
+RAILS_ROOT = File.join(File.dirname(__FILE__), '..')
+
+# The environment your application is currently running.  Don't set
+# this here; put it in your webserver's configuration as the RAILS_ENV
+# environment variable instead.
+#
+# See config/environments/*.rb for environment-specific configuration.
 RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
 
-# Mocks first.
+# Load the Rails framework.  Mock classes for testing come first.
 ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
 
 # Then model subdirectories.
@@ -62,6 +74,8 @@ end
 
 [ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
 [ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
+
+# Set up routes.
 ActionController::Routing::Routes.reload
 
 Controllers = Dependencies::LoadingModule.root(
@@ -70,3 +84,4 @@ Controllers = Dependencies::LoadingModule.root(
 )
 
 # Include your app's configuration here:
+

data/environments/production.rb

@@ -1,3 +1,8 @@
+# The production environment is meant for finished, "live" apps.
+# Code is not reloaded between requests, full error reports are disabled,
+# and caching is turned on.
+
+# Don't reload code; don't show full error reports; enable caching.
 Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = false
-ActionController::Base.perform_caching             = true
+ActionController::Base.perform_caching             = true

data/environments/test.rb

@@ -1,6 +1,17 @@
+# The test environment is used exclusively to run your application's
+# test suite.  You never need to work with it otherwise.  Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs.  Don't rely on the data there!
+
+# Log error messages when you accidentally call methods on nil.
 require 'active_support/whiny_nil'
 
+# Don't reload code; show full error reports; disable caching.
 Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = true
 ActionController::Base.perform_caching             = false
-ActionMailer::Base.delivery_method                 = :test
+
+# Tell ActionMailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+ActionMailer::Base.delivery_method                 = :test

data/fresh_rakefile

@@ -135,6 +135,8 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
       `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
     when "sqlite", "sqlite3"
       `#{abcs[RAILS_ENV]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
+    when "sqlserver"
+      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
     else 
       raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
   end
@@ -154,6 +156,9 @@ task :db_structure_dump => :environment do
       `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}`
     when "sqlite", "sqlite3"
       `#{abcs[RAILS_ENV]["adapter"]} #{abcs[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql`
+    when "sqlserver"
+      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /f db\\#{RAILS_ENV}_structure.sql /q /A /r`
+      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /F db\ /q /A /r`
     else 
       raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
   end
@@ -174,6 +179,10 @@ task :purge_test_database => :environment do
       `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
     when "sqlite","sqlite3"
       File.delete(abcs["test"]["dbfile"]) if File.exist?(abcs["test"]["dbfile"])
+    when "sqlserver"
+      dropfkscript = "#{abcs["test"]["host"]}.#{abcs["test"]["database"]}.DP1".gsub(/\\/,'-')
+      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{dropfkscript}`
+      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
     else 
       raise "Unknown database adapter '#{abcs["test"]["adapter"]}'"
   end
@@ -187,7 +196,7 @@ task :clear_logs => :environment do
   end
 end
 
-desc "Migrate the database according to the migrate scripts in db/migrate"
+desc "Migrate the database according to the migrate scripts in db/migrate (only supported on PG/MySQL). A specific version can be targetted with VERSION=x"
 task :migrate => :environment do
-  ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/db/migrate/')
+  ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/db/migrate/', ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
 end

data/html/javascripts/controls.js

@@ -1,4 +1,5 @@
 // Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -19,7 +20,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {
   var children = $(element).childNodes;
   var text     = "";
@@ -37,42 +37,70 @@ Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {
   return text;
 }
 
-Ajax.Autocompleter = Class.create();
-Ajax.Autocompleter.prototype = (new Ajax.Base()).extend({
-  initialize: function(element, update, url, options) {
+// Autocompleter.Base handles all the autocompletion functionality 
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least, 
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method 
+// should get the text for which to provide autocompletion by
+// invoking this.getEntry(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: new Array (',', '\n') } which
+// enables autocompletion on multiple tokens. This is most 
+// useful when one of the tokens is \n (a newline), as it 
+// allows smart autocompletion after linebreaks.
+
+var Autocompleter = {}
+Autocompleter.Base = function() {};
+Autocompleter.Base.prototype = {
+  base_initialize: function(element, update, options) {
     this.element     = $(element); 
     this.update      = $(update);  
     this.has_focus   = false; 
     this.changed     = false; 
     this.active      = false; 
     this.index       = 0;     
-    this.entry_count = 0;    
-    this.url         = url;
+    this.entry_count = 0;
 
-    this.setOptions(options);
-    this.options.asynchronous = true;
-    this.options.onComplete   = this.onComplete.bind(this)
+    if (this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = {}
+     
+    this.options.tokens       = this.options.tokens || new Array();
     this.options.frequency    = this.options.frequency || 0.4;
     this.options.min_chars    = this.options.min_chars || 1;
-    this.options.method       = 'post';
-    
-    this.options.onShow = this.options.onShow || 
-      function(element, update){ 
-        if(!update.style.position || update.style.position=='absolute') {
-          update.style.position = 'absolute';
+    this.options.onShow       = this.options.onShow || 
+    function(element, update){ 
+      if(!update.style.position || update.style.position=='absolute') {
+        update.style.position = 'absolute';
           var offsets = Position.cumulativeOffset(element);
           update.style.left = offsets[0] + 'px';
           update.style.top  = (offsets[1] + element.offsetHeight) + 'px';
           update.style.width = element.offsetWidth + 'px';
-        }
-        new Effect.Appear(update,{duration:0.3});
-      };
+      }
+      new Effect.Appear(update,{duration:0.15});
+    };
     this.options.onHide = this.options.onHide || 
-      function(element, update){ new Effect.Fade(update,{duration:0.3}) };
-    
+    function(element, update){ new Effect.Fade(update,{duration:0.15}) };
     
     if(this.options.indicator)
       this.indicator = $(this.options.indicator);
+
+    if (typeof(this.options.tokens) == 'string') 
+      this.options.tokens = new Array(this.options.tokens);
        
     this.observer = null;
     
@@ -81,14 +109,14 @@ Ajax.Autocompleter.prototype = (new Ajax.Base()).extend({
     Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this));
     Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this));
   },
-  
+
   show: function() {
     if(this.update.style.display=='none') this.options.onShow(this.element, this.update);
     if(!this.iefix && (navigator.appVersion.indexOf('MSIE')>0) && this.update.style.position=='absolute') {
       new Insertion.After(this.update, 
        '<iframe id="' + this.update.id + '_iefix" '+
-       'style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(apacity=0);" ' +
-       'src="javascript:;" frameborder="0" scrolling="no"></iframe>');
+       'style="display:none;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
       this.iefix = $(this.update.id+'_iefix');
     }
     if(this.iefix) {
@@ -111,51 +139,7 @@ Ajax.Autocompleter.prototype = (new Ajax.Base()).extend({
   stopIndicator: function() {
     if(this.indicator) Element.hide(this.indicator);
   },
-  
-  onObserverEvent: function() {
-    this.changed = false;   
-    if(this.element.value.length>=this.options.min_chars) {
-      this.startIndicator();
-      this.options.parameters = this.options.callback ?
-        this.options.callback(this.element, Form.Element.getValue(this.element)) :
-          Form.Element.serialize(this.element);
-      new Ajax.Request(this.url, this.options);
-    } else {
-      this.active = false;
-      this.hide();
-    }
-  },
-  
-  addObservers: function(element) {
-    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
-    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
-  },
-  
-  onComplete: function(request) {
-    if(!this.changed && this.has_focus) {
-      this.update.innerHTML = request.responseText;
-      Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.firstChild);
 
-      if(this.update.firstChild && this.update.firstChild.childNodes) {
-        this.entry_count = 
-          this.update.firstChild.childNodes.length;
-        for (var i = 0; i < this.entry_count; i++) {
-          entry = this.get_entry(i);
-          entry.autocompleteIndex = i;
-          this.addObservers(entry);
-        }
-      } else { 
-        this.entry_count = 0;
-      }
-      
-      this.stopIndicator();
-      
-      this.index = 0;
-      this.render();
-    }
-  },
-  
   onKeyPress: function(event) {
     if(this.active)
       switch(event.keyCode) {
@@ -255,7 +239,208 @@ Ajax.Autocompleter.prototype = (new Ajax.Base()).extend({
   select_entry: function() {
     this.active = false;
     value = Element.collectTextNodesIgnoreClass(this.get_current_entry(), 'informal').unescapeHTML();
-    this.element.value = value;
+    this.updateElement(value);
     this.element.focus();
+  },
+
+  updateElement: function(value) {
+    var last_token_pos = this.findLastToken();
+    if (last_token_pos != -1) {
+      var new_value = this.element.value.substr(0, last_token_pos + 1);
+      var whitespace = this.element.value.substr(last_token_pos + 1).match(/^\s+/);
+      if (whitespace)
+        new_value += whitespace[0];
+      this.element.value = new_value + value;
+    } else {
+      this.element.value = value;
+    } 
+  },
+  
+  updateChoices: function(choices) {
+    if(!this.changed && this.has_focus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.firstChild);
+
+      if(this.update.firstChild && this.update.firstChild.childNodes) {
+        this.entry_count = 
+          this.update.firstChild.childNodes.length;
+        for (var i = 0; i < this.entry_count; i++) {
+          entry = this.get_entry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else { 
+        this.entry_count = 0;
+      }
+      
+      this.stopIndicator();
+      
+      this.index = 0;
+      this.render();
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;   
+    if(this.getEntry().length>=this.options.min_chars) {
+      this.startIndicator();
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+
+  getEntry: function() {
+    var token_pos = this.findLastToken();
+    if (token_pos != -1)
+      var ret = this.element.value.substr(token_pos + 1).replace(/^\s+/,'').replace(/\s+$/,'');
+    else
+      var ret = this.element.value;
+    
+    return /\n/.test(ret) ? '' : ret;
+  },
+
+  findLastToken: function() {
+    var last_token_pos = -1;
+
+    for (var i=0; i<this.options.tokens.length; i++) {
+      var this_token_pos = this.element.value.lastIndexOf(this.options.tokens[i]);
+      if (this_token_pos > last_token_pos)
+        last_token_pos = this_token_pos;
+    }
+    return last_token_pos;
+  }
+}
+
+Ajax.Autocompleter = Class.create();
+Ajax.Autocompleter.prototype = Object.extend(new Autocompleter.Base(), 
+Object.extend(new Ajax.Base(), {
+  initialize: function(element, update, url, options) {
+	  this.base_initialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this)
+    this.options.method        = 'post';
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+  
+  getUpdatedChoices: function() {
+    entry = encodeURIComponent(this.element.name) + '=' + 
+      encodeURIComponent(this.getEntry());
+      
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+        
+    if(this.options.defaultParams) 
+      this.options.parameters += '&' + this.options.defaultParams;
+    
+    new Ajax.Request(this.url, this.options);
+  },
+  
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+
+}));
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partial_search - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the 
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option full_search to true (default: off).
+//
+// - full_search - Search anywhere in autocomplete array strings.
+//
+// - partial_chars - How many characters to enter before triggering
+//                   a partial match (unlike min_chars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignore_case - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector' 
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create();
+Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
+  initialize: function(element, update, array, options) {
+    this.base_initialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partial_search: true,
+      partial_chars: 2,
+      ignore_case: true,
+      full_search: false,
+      selector: function(instance) {
+        var ret       = new Array(); // Beginning matches
+        var partial   = new Array(); // Inside matches
+        var entry     = instance.getEntry();
+        var count     = 0;
+        
+        for (var i = 0; i < instance.options.array.length &&  
+            ret.length < instance.options.choices ; i++) { 
+          var elem = instance.options.array[i];
+          var found_pos = instance.options.ignore_case ? 
+            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+            elem.indexOf(entry);
+
+          while (found_pos != -1) {
+            if (found_pos == 0 && elem.length != entry.length) { 
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partial_chars && 
+              instance.options.partial_search && found_pos != -1) {
+              if (instance.options.full_search || /\s/.test(elem.substr(found_pos-1,1))) {
+                partial.push("<li>" + elem.substr(0, found_pos) + "<strong>" +
+                  elem.substr(found_pos, entry.length) + "</strong>" + elem.substr(
+                  found_pos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            found_pos = instance.options.ignore_case ? 
+              elem.toLowerCase().indexOf(entry.toLowerCase(), found_pos + 1) : 
+              elem.indexOf(entry, found_pos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || {});
   }
-});
+});