Skip to content
Browse files

Sync with wycats/rails/master

  • Loading branch information...
2 parents 89e9895 + d77deb8 commit 12bff2af4081c25682d0466b1d7380b702c27417 @michaelklishin michaelklishin committed Dec 28, 2008
View
7 actionpack/lib/action_controller/mime_responds.rb
@@ -109,16 +109,13 @@ def respond_to(*types, &block)
end
class Responder #:nodoc:
+
def initialize(controller)
@controller = controller
@request = controller.request
@response = controller.response
- if ActionController::Base.use_accept_header
- @mime_type_priority = Array(Mime::Type.lookup_by_extension(@request.parameters[:format]) || @request.accepts)
- else
- @mime_type_priority = [@request.format]
- end
+ @mime_type_priority = @request.formats
@order = []
@responses = {}
View
10 actionpack/lib/action_controller/mime_type.rb
@@ -5,6 +5,10 @@ module Mime
EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? }
LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? }
+ def self.[](type)
+ Type.lookup_by_extension(type)
+ end
+
# Encapsulates the notion of a mime type. Can be used at render time, for example, with:
#
# class PostsController < ActionController::Base
@@ -187,17 +191,13 @@ def =~(mime_type)
# Returns true if Action Pack should check requests using this Mime Type for possible request forgery. See
# ActionController::RequestForgeryProtection.
def verify_request?
- browser_generated?
+ @@browser_generated_types.include?(to_sym)
end
def html?
@@html_types.include?(to_sym) || @string =~ /html/
end
- def browser_generated?
- @@browser_generated_types.include?(to_sym)
- end
-
private
def method_missing(method, *args)
if method.to_s =~ /(\w+)\?$/
View
23 actionpack/lib/action_controller/request.rb
@@ -152,24 +152,33 @@ def fresh?(response)
end
end
+ ONLY_ALL = [Mime::ALL].freeze
+
# Returns the Mime type for the \format used in the request.
#
# GET /posts/5.xml | request.format => Mime::XML
# GET /posts/5.xhtml | request.format => Mime::HTML
# GET /posts/5 | request.format => Mime::HTML or MIME::JS, or request.accepts.first depending on the value of <tt>ActionController::Base.use_accept_header</tt>
+
def format
@format ||=
if parameters[:format]
- Mime::Type.lookup_by_extension(parameters[:format])
- elsif ActionController::Base.use_accept_header
- accepts.first
- elsif xhr?
- Mime::Type.lookup_by_extension("js")
- else
- Mime::Type.lookup_by_extension("html")
+ Mime[parameters[:format]]
+ elsif Base.use_accept_header && !(accepts == ONLY_ALL)
+ accepts.first
+ elsif xhr? then Mime::JS
+ else Mime::HTML
end
end
+ def formats
+ @formats =
+ if Base.use_accept_header
+ Array(Mime[parameters[:format]] || accepts)
+ else
+ [format]
+ end
+ end
# Sets the \format by string extension, which can be used to force custom formats
# that are not controlled by the extension.
View
2 actionpack/lib/action_view/base.rb
@@ -266,7 +266,7 @@ def template_format
if defined? @template_format
@template_format
elsif controller && controller.respond_to?(:request)
- @template_format = controller.request.template_format.to_sym
+ @template_format = controller.request.format.to_sym
else
@template_format = :html
end
View
16 activesupport/lib/active_support/buffered_logger.rb
@@ -67,14 +67,14 @@ def add(severity, message = nil, progname = nil, &block)
end
for severity in Severity.constants
- class_eval <<-EOT, __FILE__, __LINE__
- def #{severity.downcase}(message = nil, progname = nil, &block)
- add(#{severity}, message, progname, &block)
- end
-
- def #{severity.downcase}?
- #{severity} >= @level
- end
+ class_eval <<-EOT, __FILE__, __LINE__ + 1
+ def #{severity.downcase}(message = nil, progname = nil, &block) # def debug(message = nil, progname = nil, &block)
+ add(#{severity}, message, progname, &block) # add(DEBUG, message, progname, &block)
+ end # end
+
+ def #{severity.downcase}? # def debug?
+ #{severity} >= @level # DEBUG >= @level
+ end # end
EOT
end
View
28 activesupport/lib/active_support/callbacks.rb
@@ -209,21 +209,21 @@ def self.included(base)
module ClassMethods
def define_callbacks(*callbacks)
callbacks.each do |callback|
- class_eval <<-"end_eval"
- def self.#{callback}(*methods, &block)
- callbacks = CallbackChain.build(:#{callback}, *methods, &block)
- (@#{callback}_callbacks ||= CallbackChain.new).concat callbacks
- end
+ class_eval <<-"end_eval", __FILE__, __LINE__ + 1
+ def self.#{callback}(*methods, &block) # def self.validate_on_create(*methods, &block)
+ callbacks = CallbackChain.build(:#{callback}, *methods, &block) # callbacks = CallbackChain.build(:validate_on_create, *methods, &block)
+ (@#{callback}_callbacks ||= CallbackChain.new).concat callbacks # (@validate_on_create_callbacks ||= CallbackChain.new).concat callbacks
+ end # end
- def self.#{callback}_callback_chain
- @#{callback}_callbacks ||= CallbackChain.new
-
- if superclass.respond_to?(:#{callback}_callback_chain)
- CallbackChain.new(superclass.#{callback}_callback_chain + @#{callback}_callbacks)
- else
- @#{callback}_callbacks
- end
- end
+ def self.#{callback}_callback_chain # def self.validate_on_create_callback_chain
+ @#{callback}_callbacks ||= CallbackChain.new # @validate_on_create_callbacks ||= CallbackChain.new
+ #
+ if superclass.respond_to?(:#{callback}_callback_chain) # if superclass.respond_to?(:validate_on_create_callback_chain)
+ CallbackChain.new(superclass.#{callback}_callback_chain + @#{callback}_callbacks) # CallbackChain.new(superclass.validate_on_create_callback_chain + @validate_on_create_callbacks)
+ else # else
+ @#{callback}_callbacks # @validate_on_create_callbacks
+ end # end
+ end # end
end_eval
end
end
View
46 activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -10,38 +10,38 @@ class Class
def cattr_reader(*syms)
syms.flatten.each do |sym|
next if sym.is_a?(Hash)
- class_eval(<<-EOS, __FILE__, __LINE__)
- unless defined? @@#{sym}
- @@#{sym} = nil
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ unless defined? @@#{sym} # unless defined @@property
+ @@#{sym} = nil # @@property = nil
+ end # end
- def self.#{sym}
- @@#{sym}
- end
+ def self.#{sym} # def self.property
+ @@#{sym} # @@property
+ end # end
- def #{sym}
- @@#{sym}
- end
+ def #{sym} # def property
+ @@#{sym} # @@property
+ end # end
EOS
end
end
def cattr_writer(*syms)
options = syms.extract_options!
syms.flatten.each do |sym|
- class_eval(<<-EOS, __FILE__, __LINE__)
- unless defined? @@#{sym}
- @@#{sym} = nil
- end
-
- def self.#{sym}=(obj)
- @@#{sym} = obj
- end
-
- #{"
- def #{sym}=(obj)
- @@#{sym} = obj
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ unless defined? @@#{sym} # unless defined? @@property
+ @@#{sym} = nil # @@property = nil
+ end # end
+
+ def self.#{sym}=(obj) # def self.property=(obj)
+ @@#{sym} = obj # @@property
+ end # end
+
+ #{"
+ def #{sym}=(obj) # def property=(obj)
+ @@#{sym} = obj # @@property = obj
+ end # end
" unless options[:instance_writer] == false }
EOS
end
View
42 activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -8,33 +8,33 @@ class Class
def superclass_delegating_reader(*names)
class_name_to_stop_searching_on = self.superclass.name.blank? ? "Object" : self.superclass.name
names.each do |name|
- class_eval <<-EOS
- def self.#{name}
- if defined?(@#{name})
- @#{name}
- elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name})
- superclass.#{name}
- end
- end
- def #{name}
- self.class.#{name}
- end
- def self.#{name}?
- !!#{name}
- end
- def #{name}?
- !!#{name}
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{name} # def self.property
+ if defined?(@#{name}) # if defined?(@property)
+ @#{name} # @property
+ elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name}) # elseif superclass < Object && superclass.respond_to?(:property)
+ superclass.#{name} # superclass.property
+ end # end
+ end # end
+ def #{name} # def property
+ self.class.#{name} # self.class.property
+ end # end
+ def self.#{name}? # def self.property?
+ !!#{name} # !!property
+ end # end
+ def #{name}? # def property?
+ !!#{name} # !!property
+ end # end
EOS
end
end
def superclass_delegating_writer(*names)
names.each do |name|
- class_eval <<-EOS
- def self.#{name}=(value)
- @#{name} = value
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{name}=(value) # def self.property=(value)
+ @#{name} = value # @property = value
+ end # end
EOS
end
end
View
58 activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -10,30 +10,30 @@ class Class # :nodoc:
def class_inheritable_reader(*syms)
syms.each do |sym|
next if sym.is_a?(Hash)
- class_eval <<-EOS
- def self.#{sym}
- read_inheritable_attribute(:#{sym})
- end
-
- def #{sym}
- self.class.#{sym}
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{sym} # def self.after_add
+ read_inheritable_attribute(:#{sym}) # read_inheritable_attribute(:after_add)
+ end # end
+
+ def #{sym} # def after_add
+ self.class.#{sym} # self.class.after_add
+ end # end
EOS
end
end
def class_inheritable_writer(*syms)
options = syms.extract_options!
syms.each do |sym|
- class_eval <<-EOS
- def self.#{sym}=(obj)
- write_inheritable_attribute(:#{sym}, obj)
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{sym}=(obj) # def self.property=(obj)
+ write_inheritable_attribute(:#{sym}, obj) # write_inheritable_attribute(:property, obj)
+ end # end
#{"
- def #{sym}=(obj)
- self.class.#{sym} = obj
- end
+ def #{sym}=(obj) # def property=(obj)
+ self.class.#{sym} = obj # self.class.property = obj
+ end # end
" unless options[:instance_writer] == false }
EOS
end
@@ -42,15 +42,15 @@ def #{sym}=(obj)
def class_inheritable_array_writer(*syms)
options = syms.extract_options!
syms.each do |sym|
- class_eval <<-EOS
- def self.#{sym}=(obj)
- write_inheritable_array(:#{sym}, obj)
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{sym}=(obj) # def self.property=(obj)
+ write_inheritable_array(:#{sym}, obj) # write_inheritable_array(:property, obj)
+ end # end
#{"
- def #{sym}=(obj)
- self.class.#{sym} = obj
- end
+ def #{sym}=(obj) # def property=(obj)
+ self.class.#{sym} = obj # self.class.property = obj
+ end # end
" unless options[:instance_writer] == false }
EOS
end
@@ -59,15 +59,15 @@ def #{sym}=(obj)
def class_inheritable_hash_writer(*syms)
options = syms.extract_options!
syms.each do |sym|
- class_eval <<-EOS
- def self.#{sym}=(obj)
- write_inheritable_hash(:#{sym}, obj)
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def self.#{sym}=(obj) # def self.property=(obj)
+ write_inheritable_hash(:#{sym}, obj) # write_inheritable_hash(:property, obj)
+ end # end
#{"
- def #{sym}=(obj)
- self.class.#{sym} = obj
- end
+ def #{sym}=(obj) # def property=(obj)
+ self.class.#{sym} = obj # self.class.property = obj
+ end # end
" unless options[:instance_writer] == false }
EOS
end
View
46 activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -14,38 +14,38 @@ class Module
def mattr_reader(*syms)
syms.each do |sym|
next if sym.is_a?(Hash)
- class_eval(<<-EOS, __FILE__, __LINE__)
- unless defined? @@#{sym}
- @@#{sym} = nil
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ unless defined? @@#{sym} # unless defined? @@property
+ @@#{sym} = nil # @@ property = nil
+ end # end
- def self.#{sym}
- @@#{sym}
- end
+ def self.#{sym} # def self.property
+ @@#{sym} # @@property
+ end # end
- def #{sym}
- @@#{sym}
- end
+ def #{sym} # def property
+ @@#{sym} # @@property
+ end # end
EOS
end
end
def mattr_writer(*syms)
options = syms.extract_options!
syms.each do |sym|
- class_eval(<<-EOS, __FILE__, __LINE__)
- unless defined? @@#{sym}
- @@#{sym} = nil
- end
-
- def self.#{sym}=(obj)
- @@#{sym} = obj
- end
-
- #{"
- def #{sym}=(obj)
- @@#{sym} = obj
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ unless defined? @@#{sym} # unless defined? @@property
+ @@#{sym} = nil # @@ property = nil
+ end # end
+
+ def self.#{sym}=(obj) # def self.property=(obj)
+ @@#{sym} = obj # @@property = obj
+ end # end
+
+ #{"
+ def #{sym}=(obj) # def property=(obj)
+ @@#{sym} = obj # @@property = obj
+ end # end
" unless options[:instance_writer] == false }
EOS
end
View
6 activesupport/lib/active_support/core_ext/proc.rb
@@ -3,9 +3,9 @@ def bind(object)
block, time = self, Time.now
(class << object; self end).class_eval do
method_name = "__bind_#{time.to_i}_#{time.usec}"
- define_method(method_name, &block)
- method = instance_method(method_name)
- remove_method(method_name)
+ define_method(method_name, &block) # define_method("__bind_1230458026_720454", &block)
+ method = instance_method(method_name) # method = instance_method("__bind_1230458026_720454")
+ remove_method(method_name) # remove_method("__bind_1230458026_720454")
method
end.bind(object)
end
View
12 activesupport/lib/active_support/deprecation.rb
@@ -89,11 +89,13 @@ def deprecate(*method_names)
method_names = method_names + options.keys
method_names.each do |method_name|
alias_method_chain(method_name, :deprecation) do |target, punctuation|
- class_eval(<<-EOS, __FILE__, __LINE__)
- def #{target}_with_deprecation#{punctuation}(*args, &block)
- ::ActiveSupport::Deprecation.warn(self.class.deprecated_method_warning(:#{method_name}, #{options[method_name].inspect}), caller)
- #{target}_without_deprecation#{punctuation}(*args, &block)
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def #{target}_with_deprecation#{punctuation}(*args, &block) # def multi_with_reprecation(*args, &block)
+ ::ActiveSupport::Deprecation.warn( # ::ActiveSupport::Deprecation.warn(
+ self.class.deprecated_method_warning(:#{method_name}, #{options[method_name].inspect}), # self.class.deprecated_method_warning(:multi, "this method is deprecated, blah, blah, blah")
+ caller) # caller)
+ #{target}_without_deprecation#{punctuation}(*args, &block) # multi_without_deprecation(*args, &block)
+ end # end
EOS
end
end
View
52 activesupport/lib/active_support/memoizable.rb
@@ -58,35 +58,35 @@ def memoize(*symbols)
original_method = :"_unmemoized_#{symbol}"
memoized_ivar = ActiveSupport::Memoizable.memoized_ivar_for(symbol)
- class_eval <<-EOS, __FILE__, __LINE__
+ class_eval <<-EOS, __FILE__, __LINE__ + 1
include InstanceMethods
- raise "Already memoized #{symbol}" if method_defined?(:#{original_method})
- alias #{original_method} #{symbol}
+ raise "Already memoized #{symbol}" if method_defined?(:#{original_method}) # raise "Already memoized if_modified_since" if method_defined?(:__unmemoized_if_modified_since)
+ alias #{original_method} #{symbol} # alias __unmemoized_if_modified_since if_modified_since
- if instance_method(:#{symbol}).arity == 0
- def #{symbol}(reload = false)
- if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?
- #{memoized_ivar} = [#{original_method}.freeze]
- end
- #{memoized_ivar}[0]
- end
- else
- def #{symbol}(*args)
- #{memoized_ivar} ||= {} unless frozen?
- reload = args.pop if args.last == true || args.last == :reload
-
- if defined?(#{memoized_ivar}) && #{memoized_ivar}
- if !reload && #{memoized_ivar}.has_key?(args)
- #{memoized_ivar}[args]
- elsif #{memoized_ivar}
- #{memoized_ivar}[args] = #{original_method}(*args).freeze
- end
- else
- #{original_method}(*args)
- end
- end
- end
+ if instance_method(:#{symbol}).arity == 0 # if instance_method(:if_modified_since).arity == 0
+ def #{symbol}(reload = false) # def if_modified_since(reload = false)
+ if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty? # if reload || !defined?(@_memoized_if_modified_since) || @_memoized_if_modified_since.empty?
+ #{memoized_ivar} = [#{original_method}.freeze] # @_memoized_if_modified_since = [__unmemoized_if_modified_since.freeze]
+ end # end
+ #{memoized_ivar}[0] # @_memoized_if_modified_since[0]
+ end # end
+ else # else
+ def #{symbol}(*args) # def if_modified_since(*args)
+ #{memoized_ivar} ||= {} unless frozen? # @_memoized_if_modified_since ||= {} unless frozen?
+ reload = args.pop if args.last == true || args.last == :reload # reload = args.pop if args.last == true || args.last == :reload
+ #
+ if defined?(#{memoized_ivar}) && #{memoized_ivar} # if defined?(@_memoized_if_modified_since) && @_memoized_if_modified_since
+ if !reload && #{memoized_ivar}.has_key?(args) # if !reload && @_memoized_if_modified_since.has_key?(args)
+ #{memoized_ivar}[args] # @_memoized_if_modified_since[args]
+ elsif #{memoized_ivar} # elsif @_memoized_if_modified_since
+ #{memoized_ivar}[args] = #{original_method}(*args).freeze # @_memoized_if_modified_since[args] = __unmemoized_if_modified_since(*args).freeze
+ end # end
+ else # else
+ #{original_method}(*args) # __unmemoized_if_modified_since(*args)
+ end # end
+ end # end
+ end # end
EOS
end
end
View
15 activesupport/lib/active_support/minimalistic.rb
@@ -0,0 +1,15 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
+require "core_ext/blank"
+# whole object.rb pulls up rare used introspection extensions
+require "core_ext/object/metaclass"
+require 'core_ext/array'
+require 'core_ext/hash'
+require 'core_ext/module/attribute_accessors'
+require 'multibyte'
+require 'core_ext/string/multibyte'
+require 'core_ext/string/inflections'
+
+class String
+ include ActiveSupport::CoreExtensions::String::Multibyte
+end
View
10 activesupport/lib/active_support/multibyte/unicode_database.rb
@@ -23,11 +23,11 @@ def initialize
# Lazy load the Unicode database so it's only loaded when it's actually used
ATTRIBUTES.each do |attr_name|
- class_eval(<<-EOS, __FILE__, __LINE__)
- def #{attr_name}
- load
- @#{attr_name}
- end
+ class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+ def #{attr_name} # def codepoints
+ load # load
+ @#{attr_name} # @codepoints
+ end # end
EOS
end
View
8 activesupport/lib/active_support/time_with_zone.rb
@@ -233,10 +233,10 @@ def advance(options)
end
%w(year mon month day mday wday yday hour min sec to_date).each do |method_name|
- class_eval <<-EOV
- def #{method_name}
- time.#{method_name}
- end
+ class_eval <<-EOV, __FILE__, __LINE__ + 1
+ def #{method_name} # def month
+ time.#{method_name} # time.month
+ end # end
EOV
end

0 comments on commit 12bff2a

Please sign in to comment.
Something went wrong with that request. Please try again.