Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into custom_paths_for_resource_names

  • Loading branch information...
commit 60be4b09f51d2560802ebd744893bb6f737ef57c 2 parents 063c393 + 35904e2
@NZKoz NZKoz authored
View
13 actionpack/lib/action_controller/components.rb
@@ -39,12 +39,7 @@ def self.included(base) #:nodoc:
base.class_eval do
include InstanceMethods
extend ClassMethods
-
- helper do
- def render_component(options)
- @controller.send!(:render_component_as_string, options)
- end
- end
+ helper HelperMethods
# If this controller was instantiated to process a component request,
# +parent_controller+ points to the instantiator of this controller.
@@ -67,6 +62,12 @@ def process_with_components(request, response, parent_controller = nil) #:nodoc:
end
end
+ module HelperMethods
+ def render_component(options)
+ @controller.send!(:render_component_as_string, options)
+ end
+ end
+
module InstanceMethods
# Extracts the action_name from the request parameters and performs that action.
def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc:
View
2  actionpack/test/controller/dispatcher_test.rb
@@ -41,7 +41,7 @@ def test_failsafe_response
CGI.expects(:new).raises('some multipart parsing failure')
ActionController::Routing::Routes.stubs(:reload)
- Dispatcher.stubs(:log_failsafe_exception)
+ Dispatcher.any_instance.stubs(:log_failsafe_exception)
assert_nothing_raised { dispatch }
View
15 railties/lib/tasks/framework.rake
@@ -38,14 +38,17 @@ namespace :rails do
end
end
- desc 'Lock to latest Edge Rails'
+ desc 'Lock to latest Edge Rails, for a specific release use RELEASE=1.2.0'
task :edge do
require 'open-uri'
+ version = ENV["RELEASE"] || "edge"
+ target = "rails_#{version}.zip"
+ url = "http://dev.rubyonrails.org/archives/#{target}"
chdir 'vendor' do
- puts 'Downloading Rails'
- File.open('rails_edge.zip', 'wb') do |dst|
- open 'http://dev.rubyonrails.org/archives/rails_edge.zip' do |src|
+ puts "Downloading Rails from #{url}"
+ File.open('rails.zip', 'wb') do |dst|
+ open url do |src|
while chunk = src.read(4096)
dst << chunk
end
@@ -54,8 +57,8 @@ namespace :rails do
puts 'Unpacking Rails'
rm_rf 'rails'
- `unzip rails_edge.zip`
- %w(rails_edge.zip rails/Rakefile rails/cleanlogs.sh rails/pushgems.rb rails/release.rb).each do |goner|
+ `unzip rails.zip`
+ %w(rails.zip rails/Rakefile rails/cleanlogs.sh rails/pushgems.rb rails/release.rb).each do |goner|
rm_f goner
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.