Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Some merge cleanup

  • Loading branch information...
commit 44cdf0c5fe080d470429ab0640af25e927244907 1 parent 3030bc9
@wycats wycats authored
View
4 actionpack/lib/action_controller/base/base.rb
@@ -862,7 +862,7 @@ def complete_request_uri
end
def close_session
- @_session.close if @_session && @_session.respond_to?(:close)
+ # @_session.close if @_session && @_session.respond_to?(:close)
end
def default_template(action_name = self.action_name)
@@ -895,7 +895,7 @@ def process_cleanup
Base.class_eval do
[ Filters, Layout, Renderer, Redirector, Responder, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
Cookies, Caching, Verification, Streaming, SessionManagement,
- HttpAuthentication::Basic::ControllerMethods, RecordIdentifier,
+ HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, RecordIdentifier,
RequestForgeryProtection, Translation
].each do |mod|
include mod
View
21 actionpack/lib/action_dispatch/http/request.rb
@@ -94,25 +94,26 @@ def content_type
end
end
end
-
+
# Returns the accepted MIME type for the request.
def accepts
@accepts ||= begin
header = @env['HTTP_ACCEPT'].to_s.strip
- fallback = xhr? ? Mime::JS : Mime::HTML
+ fallback = xhr? ? Mime::JS : Mime::HTML
- if header.empty?
- [content_type, fallback, Mime::ALL].compact
- else
- ret = Mime::Type.parse(header)
- if ret.last == Mime::ALL
- ret.insert(-2, fallback)
+ if header.empty?
+ [content_type, fallback, Mime::ALL].compact
+ else
+ ret = Mime::Type.parse(header)
+ if ret.last == Mime::ALL
+ ret.insert(-2, fallback)
+ end
+ ret
end
- ret
end
end
-
+
def if_modified_since
if since = env['HTTP_IF_MODIFIED_SINCE']
Time.rfc2822(since) rescue nil
View
2  actionpack/test/controller/session/cookie_store_test.rb
@@ -177,7 +177,7 @@ def test_persistent_session_id
end
def test_session_store_with_expire_after
- app = ActionController::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours)
+ app = ActionDispatch::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours)
@integration_session = open_session(app)
with_test_route_set do
View
2  actionpack/test/dispatch/rack_test.rb
@@ -62,7 +62,7 @@ def set_content_data(data)
class RackRequestTest < BaseRackTest
test "proxy request" do
- assert_equal 'glu.ttono.us', @request.host_with_port(true)
+ assert_equal 'glu.ttono.us', @request.host_with_port
end
test "http host" do
View
2  actionpack/test/dispatch/request_test.rb
@@ -255,7 +255,7 @@ def teardown
end
test "server software" do
- assert_equal nil, @request.server_software(true)
+ assert_equal nil, @request.server_software
@request.env['SERVER_SOFTWARE'] = 'Apache3.422'
assert_equal 'apache', @request.server_software
View
121 activesupport/test/new_callbacks_test.rb
@@ -0,0 +1,121 @@
+# require 'abstract_unit'
+require 'test/unit'
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'active_support'
+
+class Record
+ include ActiveSupport::Callbacks
+ define_callbacks :save
+end
+
+class AroundPerson < Record
+ attr_reader :history
+
+ save_callback :before, :nope, :if => :no
+ save_callback :before, :nope, :unless => :yes
+ save_callback :after, :tweedle
+ save_callback :before, "tweedle_dee"
+ save_callback :before, proc {|m| m.history << "yup" }
+ save_callback :before, :nope, :if => proc { false }
+ save_callback :before, :nope, :unless => proc { true }
+ save_callback :before, :yup, :if => proc { true }
+ save_callback :before, :yup, :unless => proc { false }
+ save_callback :around, :tweedle_dum
+ save_callback :around, :w0tyes, :if => :yes
+ save_callback :around, :w0tno, :if => :no
+ save_callback :around, :tweedle_deedle
+
+ def no; false; end
+ def yes; true; end
+
+ def nope
+ @history << "boom"
+ end
+
+ def yup
+ @history << "yup"
+ end
+
+ def w0tyes
+ @history << "w0tyes before"
+ yield
+ @history << "w0tyes after"
+ end
+
+ def w0tno
+ @history << "boom"
+ yield
+ end
+
+ def tweedle_dee
+ @history << "tweedle dee"
+ end
+
+ def tweedle_dum
+ @history << "tweedle dum pre"
+ yield
+ @history << "tweedle dum post"
+ end
+
+ def tweedle
+ @history << "tweedle"
+ end
+
+ def tweedle_deedle
+ @history << "tweedle deedle pre"
+ yield
+ @history << "tweedle deedle post"
+ end
+
+ def initialize
+ @history = []
+ end
+
+ def save
+ _run_save_callbacks do
+ @history << "running"
+ end
+ end
+end
+
+class Foo
+ include ActiveSupport::Callbacks
+ define_callbacks :save
+end
+
+class Bar < Foo
+ save_callback(:before) {|s| puts "Before" }
+end
+
+class Baz < Bar
+ save_callback(:after) {|s| puts "After"}
+end
+
+class Bat < Baz
+ def inside
+ _run_save_callbacks do
+ puts "Inside"
+ end
+ end
+end
+
+Bat.new.inside
+
+# class AroundCallbacksTest < Test::Unit::TestCase
+# def test_save_around
+# around = AroundPerson.new
+# around.save
+# assert_equal [
+# "tweedle dee",
+# "yup", "yup", "yup",
+# "tweedle dum pre",
+# "w0tyes before",
+# "tweedle deedle pre",
+# "running",
+# "tweedle deedle post",
+# "w0tyes after",
+# "tweedle dum post",
+# "tweedle"
+# ], around.history
+# end
+# end
Please sign in to comment.
Something went wrong with that request. Please try again.