actionpack 1.12.1 → 1.12.2

data/CHANGELOG

@@ -1,4 +1,11 @@
-*1.12.1* (April 6th, 2005)
+*1.12.2* (June 27th, 2006)
+
+* Refinement to avoid exceptions in traverse_to_controller.
+
+* (Hackish) Fix loading of arbitrary files in Ruby's load path by traverse_to_controller. [Nicholas Seckar]
+
+
+*1.12.1* (April 6th, 2006)
 
 * Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]
 
@@ -30,7 +37,7 @@
   This can be used by deployment managers to set the asset id by application revision
 
 
-*1.12.0* (March 27th, 2005)
+*1.12.0* (March 27th, 2006)
 
 * Add documentation for respond_to. [Jamis Buck]
 

data/{rakefile → Rakefile}

@@ -73,7 +73,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
 
-  s.files = [ "rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
+  s.files = [ "Rakefile", "install.rb", "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
@@ -136,116 +136,12 @@ task :pdoc => [:rdoc] do
 end
 
 desc "Publish the release files to RubyForge."
-task :release => [:package] do
-  files = ["gem", "tgz", "zip"].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
+task :release => [ :package ] do
+  `rubyforge login`
 
-    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
+  for ext in %w( gem tgz zip )
+    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
+    puts release_command
+    system(release_command)
   end
-end
+end

data/lib/action_controller/routing.rb

@@ -226,7 +226,7 @@ module ActionController
           mod_name = controller_name = segment = nil
           
           while index < length
-            return nil unless /^[A-Za-z][A-Za-z\d_]*$/ =~ (segment = segments[index])
+            return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index])
             index += 1
             
             mod_name = segment.camelize
@@ -245,13 +245,20 @@ module ActionController
               raise unless /^uninitialized constant .*#{controller_name}$/ =~ e.message                            
             end
             
-            begin
-              next_mod = eval("mod::#{mod_name}", nil, __FILE__, __LINE__)
-              # Check that we didn't get a module from a parent namespace
-              mod = (mod == Object || next_mod.name == "#{mod.name}::#{mod_name}") ? next_mod : nil
-            rescue NameError => e
-              raise unless /^uninitialized constant .*#{mod_name}$/ =~ e.message
+            if mod.const_defined? mod_name
+              next_mod = mod.send(:const_get, mod_name)
+              next_mod = nil unless next_mod.is_a?(Module)
+            else
+              suffix = File.join(segments[start_at..index])
+              $:.each do |base|
+                path = File.join(base, suffix)
+                next unless File.directory? path
+                next_mod = Module.new
+                mod.send(:const_set, mod_name, next_mod)
+                break
+              end
             end
+            mod = next_mod
             
             return nil unless mod
           end

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 12
-    TINY  = 1
+    TINY  = 2
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/controller/fake_controllers.rb

@@ -6,6 +6,7 @@ class NotAController
 end
 module Admin
   class << self; alias_method :const_available?, :const_defined?; end
+  SomeConstant = 10
   class UserController < Class.new(ActionController::Base); end
   class NewsFeedController < Class.new(ActionController::Base); end
 end

data/test/controller/routing_test.rb

@@ -535,7 +535,6 @@ end
 
 class RouteTests < Test::Unit::TestCase
   
-  
   def route(*args)
     @route = ::ActionController::Routing::Route.new(*args) unless args.empty?
     return @route
@@ -972,4 +971,21 @@ class RouteSetTests < Test::Unit::TestCase
   end
 end
 
+class ControllerComponentTest < Test::Unit::TestCase
+  
+  def test_traverse_to_controller_should_not_load_arbitrary_files
+    load_path = $:.dup
+    base = File.dirname(File.dirname(File.expand_path(__FILE__)))
+    $: << File.join(base, 'fixtures')
+    assert_equal nil, ActionController::Routing::ControllerComponent.traverse_to_controller(%w(dont_load pretty please))
+  ensure
+    $:[0..-1] = load_path
+  end
+  
+  def test_traverse_should_not_trip_on_non_module_constants
+    assert_equal nil, ActionController::Routing::ControllerComponent.traverse_to_controller(%w(admin some_constant a))
+  end
+  
+end
+
 end

data/test/fixtures/dont_load.rb

@@ -0,0 +1,3 @@
+# see routing/controller component tests
+
+raise Exception, "I should never be loaded"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.12.1
-date: 2006-04-06 00:00:00 -05:00
+  version: 1.12.2
+date: 2006-06-27 00:00:00 -05:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -28,7 +28,7 @@ cert_chain:
 authors: 
 - David Heinemeier Hansson
 files: 
-- rakefile
+- Rakefile
 - install.rb
 - README
 - RUNNING_UNIT_TESTS
@@ -186,6 +186,7 @@ files:
 - test/fixtures/developer.rb
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
+- test/fixtures/dont_load.rb
 - test/fixtures/fun
 - test/fixtures/helpers
 - test/fixtures/layout_tests