Update rails to 1.2.1.

Major new features:
- RESTful flavor with new encouragement for resource-oriented
  architectures.
- multibyte-safe UTF-8 wrangling.

4 files changed, 62 insertions, 20 deletions

diff --git a/www/rails/Makefile b/www/rails/Makefile
index 351d3224664..a3a5d0c492e 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2006/10/12 08:45:34 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/28 05:45:09 minskim Exp $
 
-DISTNAME=	rails-1.1.6
+DISTNAME=	rails-1.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://rubyforge.org/frs/download.php/12323/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/16560/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Framework for developing database-backed web applications
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.3.1:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.14.4:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.12.5:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.2.5:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.1.6:../../www/ruby-actionwebservice
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.0:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.1:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.1:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.3.1:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.2.1:../../www/ruby-actionwebservice
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rails/vendor/rails/railties
diff --git a/www/rails/PLIST b/www/rails/PLIST
index b8f9b9451a1..0394ab732ed 100644
--- a/www/rails/PLIST
+++ b/www/rails/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/10/12 08:36:22 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/28 05:45:09 minskim Exp $
 bin/rails
 ${RUBY_SITELIBDIR}/binding_of_caller.rb
 ${RUBY_SITELIBDIR}/breakpoint.rb
@@ -15,12 +15,15 @@ ${RUBY_SITELIBDIR}/commands/ncgi/tracker
 ${RUBY_SITELIBDIR}/commands/performance/benchmarker.rb
 ${RUBY_SITELIBDIR}/commands/performance/profiler.rb
 ${RUBY_SITELIBDIR}/commands/plugin.rb
+${RUBY_SITELIBDIR}/commands/process/inspector.rb
 ${RUBY_SITELIBDIR}/commands/process/reaper.rb
 ${RUBY_SITELIBDIR}/commands/process/spawner.rb
 ${RUBY_SITELIBDIR}/commands/process/spinner.rb
 ${RUBY_SITELIBDIR}/commands/runner.rb
 ${RUBY_SITELIBDIR}/commands/server.rb
+${RUBY_SITELIBDIR}/commands/servers/base.rb
 ${RUBY_SITELIBDIR}/commands/servers/lighttpd.rb
+${RUBY_SITELIBDIR}/commands/servers/mongrel.rb
 ${RUBY_SITELIBDIR}/commands/servers/webrick.rb
 ${RUBY_SITELIBDIR}/commands/update.rb
 ${RUBY_SITELIBDIR}/console_app.rb
@@ -33,6 +36,7 @@ ${RUBY_SITELIBDIR}/rails/version.rb
 ${RUBY_SITELIBDIR}/rails_generator.rb
 ${RUBY_SITELIBDIR}/rails_generator/base.rb
 ${RUBY_SITELIBDIR}/rails_generator/commands.rb
+${RUBY_SITELIBDIR}/rails_generator/generated_attribute.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/applications/app/USAGE
 ${RUBY_SITELIBDIR}/rails_generator/generators/applications/app/app_generator.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/controller/USAGE
@@ -59,6 +63,10 @@ ${RUBY_SITELIBDIR}/rails_generator/generators/components/model/templates/fixture
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/model/templates/migration.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/model/templates/model.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/model/templates/unit_test.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/observer/USAGE
+${RUBY_SITELIBDIR}/rails_generator/generators/components/observer/observer_generator.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/observer/templates/observer.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/observer/templates/unit_test.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/USAGE
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/plugin_generator.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/README
@@ -69,7 +77,17 @@ ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/init.r
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/install.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/plugin.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/tasks.rake
+${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/uninstall.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates/unit_test.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/resource_generator.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/USAGE
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/controller.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/fixtures.yml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/functional_test.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/helper.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/migration.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/model.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates/unit_test.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/USAGE
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/scaffold_generator.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates/controller.rb
@@ -83,6 +101,21 @@ ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates/view
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates/view_list.rhtml
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates/view_new.rhtml
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates/view_show.rhtml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/USAGE
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/controller.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/fixtures.yml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/functional_test.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/helper.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/migration.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/model.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/style.css
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/unit_test.rb
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml
+${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/session_migration/USAGE
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/session_migration/session_migration_generator.rb
 ${RUBY_SITELIBDIR}/rails_generator/generators/components/session_migration/templates/migration.rb
@@ -126,6 +159,7 @@ share/rails/bin/generate
 share/rails/bin/performance/benchmarker
 share/rails/bin/performance/profiler
 share/rails/bin/plugin
+share/rails/bin/process/inspector
 share/rails/bin/process/reaper
 share/rails/bin/process/spawner
 share/rails/bin/rails
@@ -136,6 +170,7 @@ share/rails/builtin/rails_info/rails/info_controller.rb
 share/rails/builtin/rails_info/rails/info_helper.rb
 share/rails/builtin/rails_info/rails_info_controller.rb
 share/rails/configs/apache.conf
+share/rails/configs/databases/frontbase.yml
 share/rails/configs/databases/mysql.yml
 share/rails/configs/databases/oracle.yml
 share/rails/configs/databases/postgresql.yml
@@ -190,10 +225,16 @@ share/rails/html/robots.txt
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/web_service
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/session_migration/templates
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/session_migration
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource/templates
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold_resource
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold/templates
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/scaffold
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/resource/templates
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/resource
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin/templates
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/plugin
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/observer/templates
+@dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/observer
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/model/templates
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/model
 @dirrm ${RUBY_SITELIBDIR}/rails_generator/generators/components/migration/templates
diff --git a/www/rails/distinfo b/www/rails/distinfo
index 40bd0eb7671..913f8674f22 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/10/12 08:36:21 minskim Exp $
+$NetBSD: distinfo,v 1.2 2007/01/28 05:45:09 minskim Exp $
 
-SHA1 (rails-1.1.6.tgz) = 33b0ccb2fb95a2d7e6bde4496468752d0597f46c
-RMD160 (rails-1.1.6.tgz) = 11b3147bc194acc80c211254c4bde9d9570bde00
-Size (rails-1.1.6.tgz) = 1817814 bytes
+SHA1 (rails-1.2.1.tgz) = 131ac7aedcdfd115e36609b592410343723313e0
+RMD160 (rails-1.2.1.tgz) = ef6e2c92fcbd10b8ed0c2483f16bbec13d1a6f91
+Size (rails-1.2.1.tgz) = 2286678 bytes
 SHA1 (patch-aa) = 7a3d4f4b435c0de22f00f665092ccff046387170
-SHA1 (patch-ab) = 25a9411f4983db533469a6d8e84fa86a6b91e4e3
+SHA1 (patch-ab) = cab06b8633c8ee1ff0510960a4e8f5758ea7fb33
diff --git a/www/rails/patches/patch-ab b/www/rails/patches/patch-ab
index 00099cf915c..f5347655c29 100644
--- a/www/rails/patches/patch-ab
+++ b/www/rails/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/10/12 08:36:22 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2007/01/28 05:45:09 minskim Exp $
 
---- environments/boot.rb.orig	2006-08-10 10:34:33.000000000 -0700
+--- environments/boot.rb.orig	2007-01-18 13:37:44.000000000 -0800
 +++ environments/boot.rb
-@@ -15,29 +15,7 @@ unless defined?(Rails::Initializer)
+@@ -15,30 +15,7 @@ unless defined?(Rails::Initializer)
    if File.directory?("#{RAILS_ROOT}/vendor/rails")
      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
    else
@@ -13,13 +13,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/10/12 08:36:22 minskim Exp $
 -    rails_gem_version = $1
 -
 -    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
--      rails_gem = Gem.cache.search('rails', "=#{version}").first
+-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
+-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
 -
 -      if rails_gem
--        require_gem "rails", "=#{version}"
+-        require_gem "rails", "=#{rails_gem.version.version}"
 -        require rails_gem.full_gem_path + '/lib/initializer'
 -      else
--        STDERR.puts %(Cannot find gem for Rails =#{version}:
+-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
 -    Install the missing gem with 'gem install -v=#{version} rails', or
 -    change environment.rb to define RAILS_GEM_VERSION with your desired version.
 -  )