From 03f4de5703c02f6b56cffb71b38cba75e7706630 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Fri, 11 Aug 2006 02:53:59 +0000 Subject: [PATCH] Upgrade to rails 1.1.6. Clean up a couple of minor errors/warnings. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@307 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/helpers/deferred_helper.rb | 2 + .../app/views/shared/_add_new_item_form.rhtml | 6 +-- .../app/views/shared/_new_action_form.rhtml | 2 +- tracks/vendor/rails/actionmailer/CHANGELOG | 5 ++ .../actionmailer/lib/action_mailer/version.rb | 2 +- tracks/vendor/rails/actionmailer/rakefile | 2 +- tracks/vendor/rails/actionpack/CHANGELOG | 5 ++ tracks/vendor/rails/actionpack/README | 4 -- tracks/vendor/rails/actionpack/filler.txt | 50 +++++++++++++++++++ .../lib/action_controller/routing.rb | 10 ++-- .../actionpack/lib/action_pack/version.rb | 2 +- tracks/vendor/rails/actionpack/rakefile | 2 +- .../vendor/rails/actionwebservice/CHANGELOG | 5 ++ tracks/vendor/rails/actionwebservice/Rakefile | 2 +- .../lib/action_web_service/version.rb | 2 +- tracks/vendor/rails/railties/CHANGELOG | 5 ++ tracks/vendor/rails/railties/Rakefile | 6 +-- .../rails/railties/lib/rails/version.rb | 2 +- 18 files changed, 89 insertions(+), 25 deletions(-) create mode 100644 tracks/app/helpers/deferred_helper.rb create mode 100644 tracks/vendor/rails/actionpack/filler.txt diff --git a/tracks/app/helpers/deferred_helper.rb b/tracks/app/helpers/deferred_helper.rb new file mode 100644 index 00000000..506ce1f1 --- /dev/null +++ b/tracks/app/helpers/deferred_helper.rb @@ -0,0 +1,2 @@ +module DeferredHelper +end diff --git a/tracks/app/views/shared/_add_new_item_form.rhtml b/tracks/app/views/shared/_add_new_item_form.rhtml index b6a08b00..42c7f663 100644 --- a/tracks/app/views/shared/_add_new_item_form.rhtml +++ b/tracks/app/views/shared/_add_new_item_form.rhtml @@ -6,15 +6,15 @@ @selected_project = nil when "project" add_string = "Add a next action in this project »" - @selected_context = @contexts[0].id + @selected_context = @contexts[0].id unless @contexts.empty? @selected_project = @project.id when "deferred" add_string = "Add a deferred action »" - @selected_context = @contexts[0].id + @selected_context = @contexts[0].id unless @contexts.empty? @selected_project = nil else add_string = "Add a next action »" - @selected_context = @contexts[0].id + @selected_context = @contexts[0].id unless @contexts.empty? @selected_project = nil end %> diff --git a/tracks/app/views/shared/_new_action_form.rhtml b/tracks/app/views/shared/_new_action_form.rhtml index 8c387321..6bbd7777 100644 --- a/tracks/app/views/shared/_new_action_form.rhtml +++ b/tracks/app/views/shared/_new_action_form.rhtml @@ -1,5 +1,5 @@ <% - @selected_context = @contexts[0].id + @selected_context = @contexts[0].id unless @contexts.empty? @selected_project = nil case controller.controller_name when "context" diff --git a/tracks/vendor/rails/actionmailer/CHANGELOG b/tracks/vendor/rails/actionmailer/CHANGELOG index d7c11e79..34d1ac4b 100644 --- a/tracks/vendor/rails/actionmailer/CHANGELOG +++ b/tracks/vendor/rails/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*1.2.5* (August 10th, 2006) + +* Depend on Action Pack 1.12.5 + + *1.2.4* (August 8th, 2006) * Backport of documentation enhancements. [Kevin Clark, Marcel Molina Jr] diff --git a/tracks/vendor/rails/actionmailer/lib/action_mailer/version.rb b/tracks/vendor/rails/actionmailer/lib/action_mailer/version.rb index 8ecf6509..21bc3f6a 100644 --- a/tracks/vendor/rails/actionmailer/lib/action_mailer/version.rb +++ b/tracks/vendor/rails/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 4 + TINY = 5 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/tracks/vendor/rails/actionmailer/rakefile b/tracks/vendor/rails/actionmailer/rakefile index df1dd144..6095c6dc 100644 --- a/tracks/vendor/rails/actionmailer/rakefile +++ b/tracks/vendor/rails/actionmailer/rakefile @@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/tracks/vendor/rails/actionpack/CHANGELOG b/tracks/vendor/rails/actionpack/CHANGELOG index 61eedcd9..be0d4064 100644 --- a/tracks/vendor/rails/actionpack/CHANGELOG +++ b/tracks/vendor/rails/actionpack/CHANGELOG @@ -1,3 +1,8 @@ +*1.12.5* (August 10th, 2006) + +* Updated security fix + + *1.12.4* (August 8th, 2006) * Documentation fix: integration test scripts don't require integration_test. #4914 [Frederick Ros ] diff --git a/tracks/vendor/rails/actionpack/README b/tracks/vendor/rails/actionpack/README index 13ea9d1e..dc475a66 100644 --- a/tracks/vendor/rails/actionpack/README +++ b/tracks/vendor/rails/actionpack/README @@ -469,7 +469,3 @@ And as Jim from Rake says: For other information, feel free to ask on the ruby-talk mailing list (which is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com. - - - -... diff --git a/tracks/vendor/rails/actionpack/filler.txt b/tracks/vendor/rails/actionpack/filler.txt new file mode 100644 index 00000000..48a142c2 --- /dev/null +++ b/tracks/vendor/rails/actionpack/filler.txt @@ -0,0 +1,50 @@ +abCdefGhIjklmNopQrstuVWxyz +abcdeFGHIjklmnOpqrstuvwXyz +abcdeFghijKlmNopqrStUVWxYz +AbCdefghIJklmNopQRsTUvwXyz +abCdefgHijkLmnopqrstuVWxyZ +abCDEfgHijklMNOpQrStUVWXyZ +AbCdefGhiJklmNOpQRsTuvwxyz +abcdefGhijKlMnopQrsTUVwxyz +abcdEfgHiJkLmnopQrStUVwXyz +abcdefghijklMNopqRStuvWxyz +AbcDeFghIJkLmnopQrsTuvwXyZ +abcdefGhiJKLmNOpQRSTuvwXYz +AbcdefghijKlmnOpqrStuvWXyZ +abcDEfghIJklMnOpqrstuvWxyz +abcdefGhijklMnopqrstuvwxYz +abcDeFGhijKlmnoPqRstuVwXyz +AbcDefghijklmnopQrsTUvWXYz +abcdefGhijKlmnOpqrstUvWxyz +aBCdEfGhiJklmnOpqrstuvwXYZ +aBcdefGhijklMnOpQrStuvwxYZ +abcdeFghijklMnopqrStuvwxYZ +aBcdefghiJklmnOPqrstuvwxyz +abcDEFghijKLmNoPqrsTUvwxYz +aBCdEfghijKlmNOpqrstUvwxyz +abCDEfghijklMnopqrstuvwXYz +aBcDeFghijklmnopqRstuvwxyz +abcdEfghIjkLMNOpqRstuvwxYz +ABcDefGHijKlmNopQrstUvwxYz +abcDefGhijklMnOPQrstuVwXyZ +AbcdefghijKlmNoPqrsTuvwXYZ +AbcdeFGhiJklmnopQrsTuvWxYz +AbCdEfgHiJKlMNoPQrsTUVwXyz +aBcDefGhijkLMnOpqrsTuVwxyz +abcdeFGhijKlmNOPqrStuVWxyz +AbCdEfghijKlmnopqrstuvwxyz +AbcdefGHijkLmnOPQRSTuVwXyZ +aBcdeFghiJkLMnoPqrSTuvwxyZ +abCDeFghijKlmnOpqRstUvwxyz +aBcDefghIjKLMnoPQrStuVwXyz +abcDEfgHijkLmNopqrstUVwXyz +AbCDeFghijKLmnopQrStuvwxyz +abcDefGhIjKlmnOPQrsTuvWxyz +ABCdEfghijklmnopqrSTuVwxYz +ABcdEfGhijKlmnOpqRsTUVWxyZ +ABCdeFgHIjklMNOpqrstUvwxYz +aBcdefghiJkLMNopqrstuVWxYz +abCdEFgHIjKlmnopqrsTUVwXYZ +AbcdefGhijklmnopQRsTuVwxYZ +abcdeFgHijklMNopQrstuvWxyz +abCdeFgHijKlmnOpqrsTuvwXyz diff --git a/tracks/vendor/rails/actionpack/lib/action_controller/routing.rb b/tracks/vendor/rails/actionpack/lib/action_controller/routing.rb index ac40c63e..e0b9b845 100644 --- a/tracks/vendor/rails/actionpack/lib/action_controller/routing.rb +++ b/tracks/vendor/rails/actionpack/lib/action_controller/routing.rb @@ -218,11 +218,7 @@ module ActionController expr = "::#{controller.split('/').collect {|c| c.camelize}.join('::')}Controller" g.result :controller, expr, true end - - def file_kinds(kind) - ((@file_kinds ||= []) << kind).uniq! || @file_kinds - end - + def traverse_to_controller(segments, start_at = 0) mod = ::Object length = segments.length @@ -232,7 +228,6 @@ module ActionController return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index]) index += 1 - file_kinds :app mod_name = segment.camelize controller_name = "#{mod_name}Controller" path_suffix = File.join(segments[start_at..(index - 1)]) @@ -273,7 +268,8 @@ module ActionController $LOAD_PATH.select do |base| base = File.expand_path(base) extended_root = File.expand_path(RAILS_ROOT) - base.match(/\A#{Regexp.escape(extended_root)}\/*#{file_kinds(:lib) * '|'}/) || base =~ %r{rails-[\d.]+/builtin} + # Exclude all paths that are not nested within app, lib, or components. + base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin} end else $LOAD_PATH diff --git a/tracks/vendor/rails/actionpack/lib/action_pack/version.rb b/tracks/vendor/rails/actionpack/lib/action_pack/version.rb index 6002b9c2..91e916df 100644 --- a/tracks/vendor/rails/actionpack/lib/action_pack/version.rb +++ b/tracks/vendor/rails/actionpack/lib/action_pack/version.rb @@ -2,7 +2,7 @@ module ActionPack #:nodoc: module VERSION #:nodoc: MAJOR = 1 MINOR = 12 - TINY = 4 + TINY = 5 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/tracks/vendor/rails/actionpack/rakefile b/tracks/vendor/rails/actionpack/rakefile index 7cf36692..56aacf26 100644 --- a/tracks/vendor/rails/actionpack/rakefile +++ b/tracks/vendor/rails/actionpack/rakefile @@ -77,7 +77,7 @@ spec = Gem::Specification.new do |s| s.require_path = 'lib' s.autorequire = 'action_controller' - s.files = [ "filler", "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ] + s.files = [ "Rakefile", "install.rb", "filler.txt", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ] dist_dirs.each do |dir| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end diff --git a/tracks/vendor/rails/actionwebservice/CHANGELOG b/tracks/vendor/rails/actionwebservice/CHANGELOG index 962bc635..9d6b63da 100644 --- a/tracks/vendor/rails/actionwebservice/CHANGELOG +++ b/tracks/vendor/rails/actionwebservice/CHANGELOG @@ -1,3 +1,8 @@ +*1.1.6* (August 10th, 2006) + +* Rely on Action Pack 1.12.5 + + *1.1.5* (August 8th, 2006) * Rely on Action Pack 1.12.4 and Active Record 1.14.4 diff --git a/tracks/vendor/rails/actionwebservice/Rakefile b/tracks/vendor/rails/actionwebservice/Rakefile index 8207f2e1..a257735e 100644 --- a/tracks/vendor/rails/actionwebservice/Rakefile +++ b/tracks/vendor/rails/actionwebservice/Rakefile @@ -71,7 +71,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "aws" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD) s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD) s.has_rdoc = true diff --git a/tracks/vendor/rails/actionwebservice/lib/action_web_service/version.rb b/tracks/vendor/rails/actionwebservice/lib/action_web_service/version.rb index 4f82a6e1..cc1db831 100644 --- a/tracks/vendor/rails/actionwebservice/lib/action_web_service/version.rb +++ b/tracks/vendor/rails/actionwebservice/lib/action_web_service/version.rb @@ -2,7 +2,7 @@ module ActionWebService module VERSION #:nodoc: MAJOR = 1 MINOR = 1 - TINY = 5 + TINY = 6 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/tracks/vendor/rails/railties/CHANGELOG b/tracks/vendor/rails/railties/CHANGELOG index 238b4a30..d6947a29 100644 --- a/tracks/vendor/rails/railties/CHANGELOG +++ b/tracks/vendor/rails/railties/CHANGELOG @@ -1,3 +1,8 @@ +*1.1.6* (August 10th, 2006) + +* Additional security patch + + *1.1.5* (August 8th, 2006) * Mention in docs that config.frameworks doesn't work when getting Rails via Gems. #4857 [Alisdair McDiarmid] diff --git a/tracks/vendor/rails/railties/Rakefile b/tracks/vendor/rails/railties/Rakefile index aea1e449..3560fafc 100644 --- a/tracks/vendor/rails/railties/Rakefile +++ b/tracks/vendor/rails/railties/Rakefile @@ -280,9 +280,9 @@ spec = Gem::Specification.new do |s| s.add_dependency('rake', '>= 0.7.1') s.add_dependency('activesupport', '= 1.3.1' + PKG_BUILD) s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD) - s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD) - s.add_dependency('actionmailer', '= 1.2.4' + PKG_BUILD) - s.add_dependency('actionwebservice', '= 1.1.5' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.12.5' + PKG_BUILD) + s.add_dependency('actionmailer', '= 1.2.5' + PKG_BUILD) + s.add_dependency('actionwebservice', '= 1.1.6' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false diff --git a/tracks/vendor/rails/railties/lib/rails/version.rb b/tracks/vendor/rails/railties/lib/rails/version.rb index 53ae16a3..3bad3f04 100644 --- a/tracks/vendor/rails/railties/lib/rails/version.rb +++ b/tracks/vendor/rails/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 1 MINOR = 1 - TINY = 5 + TINY = 6 STRING = [MAJOR, MINOR, TINY].join('.') end