rails 0.11.0 → 0.11.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+*0.11.1* (27th March, 2005)
+
+* Fixed the dispatch.fcgi use of a logger
+
+* Upgraded to Active Record 1.9.1, Action Pack 1.7.0, Action Mailer 0.8.1, Action Web Service 0.6.2, Active Support 1.0.3
+
+
 *0.11.0* (22th March, 2005)
 
 * Removed SCRIPT_NAME from the WEBrick environment to prevent conflicts with PATH_INFO #896 [Nicholas Seckar]

data/README

@@ -67,30 +67,30 @@ goes through FCGI (or mod_ruby) that requires restart to show changes.
 
 == Example for lighttpd conf (with FastCGI)
 
-server.port = 8080
-server.bind = "127.0.0.1"
-# server.event-handler = "freebsd-kqueue" # needed on OS X
-
-server.modules = ( "mod_rewrite", "mod_fastcgi" )
-
-url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
-server.error-handler-404 = "/dispatch.fcgi"
-
-server.document-root = "/path/application/public"
-server.errorlog      = "/path/application/log/server.log"
-
-fastcgi.server = ( ".fcgi" =>
-  ( "localhost" =>
-      (
-        "min-procs" => 1, 
-        "max-procs" => 5,
-        "socket"   => "/tmp/application.fcgi.socket",
-        "bin-path" => "/path/application/public/dispatch.fcgi",
-        "bin-environment" => ( "RAILS_ENV" => "development" )
-      )
+  server.port = 8080
+  server.bind = "127.0.0.1"
+  # server.event-handler = "freebsd-kqueue" # needed on OS X
+  
+  server.modules = ( "mod_rewrite", "mod_fastcgi" )
+  
+  url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+  server.error-handler-404 = "/dispatch.fcgi"
+  
+  server.document-root = "/path/application/public"
+  server.errorlog      = "/path/application/log/server.log"
+  
+  fastcgi.server = ( ".fcgi" =>
+    ( "localhost" =>
+        (
+          "min-procs" => 1, 
+          "max-procs" => 5,
+          "socket"   => "/tmp/application.fcgi.socket",
+          "bin-path" => "/path/application/public/dispatch.fcgi",
+          "bin-environment" => ( "RAILS_ENV" => "development" )
+        )
+    )
   )
-)
-
+  
 
 == Debugging Rails
 
@@ -139,7 +139,8 @@ Finally, when you're ready to resume execution, you press CTRL-D
 You can interact with the domain model by starting the console through script/console. 
 Here you'll have all parts of the application configured, just like it is when the
 application is running. You can inspect domain models, change values, and save to the
-database. Start the script without arguments to see the options.
+database. Start the script without arguments will launch it in the development environment.
+Passing an argument will specify a different environment, like <tt>console production</tt>.
 
 
 == Description of contents

data/Rakefile

@@ -9,10 +9,15 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.11.0' + PKG_BUILD
+PKG_VERSION     = '0.11.1' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+RUBY_FORGE_PROJECT = "rails"
+RUBY_FORGE_USER    = "webster132"
+
 
 BASE_DIRS   = %w( app config/environments components db doc log lib public script test vendor )
 APP_DIRS    = %w( apis models controllers helpers views views/layouts )
@@ -121,8 +126,7 @@ task :copy_dispatches do
 end
 
 task :copy_html_files do
-  cp HTML_FILES.map { |dir| File.join('html', dir) },
-     File.join(PKG_DESTINATION, 'public')
+  HTML_FILES.each { |file| cp File.join('html', file), File.join(PKG_DESTINATION, 'public', file) }
 end
 
 task :copy_application do
@@ -234,12 +238,12 @@ spec = Gem::Specification.new do |s|
     on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates.
   EOF
 
-  s.add_dependency('rake', '>= 0.4.15')
-  s.add_dependency('activesupport',    '= 1.0.2' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.9.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.6.0' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 0.8.0' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 0.6.1' + PKG_BUILD)
+  s.add_dependency('rake', '>= 0.5.0')
+  s.add_dependency('activesupport',    '= 1.0.3' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.9.1' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.7.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 0.8.1' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 0.6.2' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -260,9 +264,125 @@ end
 Rake::GemPackageTask.new(spec) do |pkg|
 end
 
-# Publish beta gem
+
+# Publishing -------------------------------------------------------
 desc "Publish the API documentation"
 task :pgem => [:gem] do 
   Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh davidhh@comox.textdrive.com './gemupdate.sh'`
+end
+
+desc "Publish the release files to RubyForge."
+task :release => [:package] do
+  files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
+
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
+    end
+
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => RELEASE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
 end

data/dispatches/dispatch.fcgi

@@ -1,12 +1,11 @@
 #!/usr/local/bin/ruby
 
-FASTCGI_CRASH_LOG_PATH = "#{RAILS_ROOT}/log/fastcgi.crash.log"
-
-def dispatcher_error(e, msg = "")
-  error_message = "[#{Time.now}] Dispatcher failed to catch: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}\n#{msg}"
-  Logger.new(FASTCGI_CRASH_LOG_PATH).fatal(error_message)
+def dispatcher_error(path,e,msg="")
+  error_message =
+    "[#{Time.now}] Dispatcher failed to catch: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}\n#{msg}"
+  Logger.new(path).fatal(error_message)
 rescue Object => log_error
-  STDERR << "Couldn't write to #{FASTCGI_CRASH_LOG_PATH} (#{e} [#{e.class}])\n" << error_message
+  STDERR << "Couldn't write to #{path} (#{e} [#{e.class}])\n" << error_message
 end
 
 begin
@@ -14,13 +13,15 @@ begin
   require 'dispatcher'
   require 'fcgi'
 
+  log_file_path = "#{RAILS_ROOT}/log/fastcgi.crash.log"
+
   FCGI.each_cgi do |cgi| 
     begin
       Dispatcher.dispatch(cgi)
     rescue Object => rails_error
-      dispatcher_error(rails_error)
+      dispatcher_error(log_file_path, rails_error)
     end
   end
 rescue Object => fcgi_error
-  dispatcher_error(fcgi_error, "FCGI process #{$$} killed by this error\n")
+  dispatcher_error(log_file_path, fcgi_error, "FCGI process #{$$} killed by this error\n")
 end

data/fresh_rakefile

@@ -71,6 +71,7 @@ Rake::RDocTask.new("appdoc") { |rdoc|
 desc "Generate documentation for the Rails framework"
 Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_dir = 'doc/api'
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.title    = "Rails Framework Documentation"
   rdoc.options << '--line-numbers --inline-source'
   rdoc.rdoc_files.include('README')
@@ -89,9 +90,17 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_files.include('vendor/rails/actionmailer/CHANGELOG')
   rdoc.rdoc_files.include('vendor/rails/actionmailer/lib/action_mailer/base.rb')
   rdoc.rdoc_files.include('vendor/rails/actionwebservice/README')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/ChangeLog')
-  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/**/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/api/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/client/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/container/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/dispatcher/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/protocol/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/support/*.rb')
   rdoc.rdoc_files.include('vendor/rails/activesupport/README')
+  rdoc.rdoc_files.include('vendor/rails/activesupport/CHANGELOG')
   rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
 }
 

data/html/javascripts/prototype.js

@@ -5,11 +5,11 @@
  *  For details, see http://prototype.conio.net/
  */
 
-Prototype = {
-  Version: '1.0.1'
+var Prototype = {
+  Version: '1.1.0'
 }
 
-Class = {
+var Class = {
   create: function() {
     return function() { 
       this.initialize.apply(this, arguments);
@@ -17,7 +17,7 @@ Class = {
   }
 }
 
-Abstract = new Object();
+var Abstract = new Object();
 
 Object.prototype.extend = function(object) {
   for (property in object) {
@@ -40,7 +40,13 @@ Function.prototype.bindAsEventListener = function(object) {
   }
 }
 
-Try = {
+Number.prototype.toColorPart = function() {
+  var digits = this.toString(16);
+  if (this < 16) return '0' + digits;
+  return digits;
+}
+
+var Try = {
   these: function() {
     var returnValue;
     
@@ -56,10 +62,10 @@ Try = {
   }
 }
 
-Toggle = {
+var Toggle = {
   display: function() {
-    for (var i = 0; i < elements.length; i++) {
-      var element = $(elements[i]);
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
       element.style.display = 
         (element.style.display == 'none' ? '' : 'none');
     }
@@ -85,8 +91,8 @@ function $() {
   return elements;
 }
 
-function getElementsByClassName(className, element) {
-  var children = (element || document).getElementsByTagName('*');
+function getElementsByClassName(className) {
+  var children = document.getElementsByTagName('*') || document.all;
   var elements = new Array();
   
   for (var i = 0; i < children.length; i++) {
@@ -105,7 +111,7 @@ function getElementsByClassName(className, element) {
 
 /*--------------------------------------------------------------------------*/
 
-Ajax = {
+var Ajax = {
   getTransport: function() {
     return Try.these(
       function() {return new ActiveXObject('Msxml2.XMLHTTP')},
@@ -191,14 +197,22 @@ Ajax.Updater.prototype = (new Ajax.Base()).extend({
   },
   
   updateContent: function() {
-    this.container.innerHTML = this.request.transport.responseText;
-    if (this.onComplete) this.onComplete(this.request);
+    if (!this.options.insertion) {
+      this.container.innerHTML = this.request.transport.responseText;
+    } else {
+      new this.options.insertion(this.container,
+        this.request.transport.responseText);
+    }
+
+    if (this.onComplete) {
+      setTimeout((function() {this.onComplete(this.request)}).bind(this), 10);
+    }
   }
 });
 
 /*--------------------------------------------------------------------------*/
 
-Field = {
+var Field = {
   clear: function() {
     for (var i = 0; i < arguments.length; i++)
       $(arguments[i]).value = '';
@@ -217,7 +231,7 @@ Field = {
 
 /*--------------------------------------------------------------------------*/
 
-Form = {
+var Form = {
   serialize: function(form) {
     var elements = Form.getElements($(form));
     var queryComponents = new Array();
@@ -269,12 +283,14 @@ Form.Element.Serializers = {
   input: function(element) {
     switch (element.type.toLowerCase()) {
       case 'hidden':
+      case 'password':
       case 'text':
         return Form.Element.Serializers.textarea(element);
       case 'checkbox':  
       case 'radio':
         return Form.Element.Serializers.inputSelector(element);
     }
+    return false;
   },
 
   inputSelector: function(element) {
@@ -334,3 +350,105 @@ Form.Observer.prototype = (new Abstract.TimedObserver()).extend({
   }
 });
 
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.Insertion = function(adjacency) {
+  this.adjacency = adjacency;
+}
+
+Abstract.Insertion.prototype = {
+  initialize: function(element, content) {
+    this.element = $(element);
+    this.content = content;
+    
+    if (this.adjacency && this.element.insertAdjacentHTML) {
+      this.element.insertAdjacentHTML(this.adjacency, this.content);
+    } else {
+      this.range = this.element.ownerDocument.createRange();
+      if (this.initializeRange) this.initializeRange();
+      this.fragment = this.range.createContextualFragment(this.content);
+      this.insertContent();
+    }
+  }
+}
+
+var Insertion = new Object();
+
+Insertion.Before = Class.create();
+Insertion.Before.prototype = (new Abstract.Insertion('beforeBegin')).extend({
+  initializeRange: function() {
+    this.range.setStartBefore(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.parentNode.insertBefore(this.fragment, this.element);
+  }
+});
+
+Insertion.Top = Class.create();
+Insertion.Top.prototype = (new Abstract.Insertion('afterBegin')).extend({
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(true);
+  },
+  
+  insertContent: function() {  
+    this.element.insertBefore(this.fragment, this.element.firstChild);
+  }
+});
+
+Insertion.Bottom = Class.create();
+Insertion.Bottom.prototype = (new Abstract.Insertion('beforeEnd')).extend({
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.appendChild(this.fragment);
+  }
+});
+
+Insertion.After = Class.create();
+Insertion.After.prototype = (new Abstract.Insertion('afterEnd')).extend({
+  initializeRange: function() {
+    this.range.setStartAfter(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.parentNode.insertBefore(this.fragment, 
+      this.element.nextSibling);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = new Object();
+
+Effect.Highlight = Class.create();
+Effect.Highlight.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+    this.start  = 153;
+    this.finish = 255;
+    this.current = this.start;
+    this.fade();
+  },
+  
+  fade: function() {
+    if (this.isFinished()) return;
+    if (this.timer) clearTimeout(this.timer);
+    this.highlight(this.element, this.current);
+    this.current += 17;
+    this.timer = setTimeout(this.fade.bind(this), 250);
+  },
+  
+  isFinished: function() {
+    return this.current > this.finish;
+  },
+  
+  highlight: function(element, current) {
+    element.style.backgroundColor = "#ffff" + current.toColorPart();
+  }
+}

data/lib/rails_generator/generators/components/mailer/templates/mailer.rb

@@ -1,12 +1,12 @@
 class <%= class_name %> < ActionMailer::Base
 <% for action in actions -%>
 
-  def <%= action %>(sent_on = Time.now)
+  def <%= action %>(sent_at = Time.now)
     @subject    = '<%= class_name %>#<%= action %>'
     @body       = {}
     @recipients = ''
     @from       = ''
-    @sent_on    = sent_on
+    @sent_on    = sent_at
     @headers    = {}
   end
 <% end -%>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
-date: 2005-03-22
+  version: 0.11.1
+date: 2005-03-27
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -40,7 +40,6 @@ files:
   - html
   - lib
   - MIT-LICENSE
-  - pkg
   - Rakefile
   - README
   - test
@@ -163,7 +162,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.4.15
+            version: 0.5.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -173,7 +172,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.2
+            version: 1.0.3
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -183,7 +182,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.9.0
+            version: 1.9.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -193,7 +192,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.6.0
+            version: 1.7.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -203,7 +202,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.8.0
+            version: 0.8.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionwebservice
@@ -213,5 +212,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.6.1
+            version: 0.6.2
       version: