Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 96e2c827ea2d6f147fbcfc1d986f39f146df3b6e
- Author: Pratik Naik <pratiknaik@gmail.com>
- Date: Sun Dec 28 16:03:49 2008 +0000
- Revert "Revert inline docs"
- This reverts commit aaea12c497ca86a86fbda8409c226630ade22f89.
- diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb
- index 13646ae..d4c53ff 100644
- --- a/actionpack/lib/action_controller/routing/route_set.rb
- +++ b/actionpack/lib/action_controller/routing/route_set.rb
- @@ -145,10 +145,10 @@ module ActionController
- def define_hash_access(route, name, kind, options)
- selector = hash_access_name(name, kind)
- named_helper_module_eval <<-end_eval # We use module_eval to avoid leaks
- - def #{selector}(options = nil)
- - options ? #{options.inspect}.merge(options) : #{options.inspect}
- - end
- - protected :#{selector}
- + def #{selector}(options = nil) # def hash_for_users_url(options = nil)
- + options ? #{options.inspect}.merge(options) : #{options.inspect} # options ? {:only_path=>false}.merge(options) : {:only_path=>false}
- + end # end
- + protected :#{selector} # protected :hash_for_users_url
- end_eval
- helpers << selector
- end
- diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
- index 621e294..f23a0f7 100644
- --- a/actionpack/lib/action_view/helpers/form_helper.rb
- +++ b/actionpack/lib/action_view/helpers/form_helper.rb
- @@ -737,9 +737,9 @@ module ActionView
- (field_helpers - %w(label check_box radio_button fields_for)).each do |selector|
- src = <<-end_src
- - def #{selector}(method, options = {})
- - @template.send(#{selector.inspect}, @object_name, method, objectify_options(options))
- - end
- + def #{selector}(method, options = {}) # def text_field(method, options = {})
- + @template.send(#{selector.inspect}, @object_name, method, objectify_options(options)) # @template.send("text_field", @object_name, method, objectify_options(options))
- + end # end
- end_src
- class_eval src, __FILE__, __LINE__
- end
- diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
- index 5a60b13..1984f8d 100755
- --- a/activerecord/lib/active_record/associations.rb
- +++ b/activerecord/lib/active_record/associations.rb
- @@ -1216,11 +1216,11 @@ module ActiveRecord
- # callbacks will be executed after the association is wiped out.
- old_method = "destroy_without_habtm_shim_for_#{reflection.name}"
- class_eval <<-end_eval unless method_defined?(old_method)
- - alias_method :#{old_method}, :destroy_without_callbacks
- - def destroy_without_callbacks
- - #{reflection.name}.clear
- - #{old_method}
- - end
- + alias_method :#{old_method}, :destroy_without_callbacks # alias_method :destroy_without_habtm_shim_for_posts, :destroy_without_callbacks
- + def destroy_without_callbacks # def destroy_without_callbacks
- + #{reflection.name}.clear # posts.clear
- + #{old_method} # destroy_without_habtm_shim_for_posts
- + end # end
- end_eval
- add_association_callbacks(reflection.name, options)
- diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
- index 950bd72..581c889 100644
- --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
- +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
- @@ -14,12 +14,12 @@ module ActiveRecord
- def dirties_query_cache(base, *method_names)
- method_names.each do |method_name|
- base.class_eval <<-end_code, __FILE__, __LINE__
- - def #{method_name}_with_query_dirty(*args)
- - clear_query_cache if @query_cache_enabled
- - #{method_name}_without_query_dirty(*args)
- - end
- -
- - alias_method_chain :#{method_name}, :query_dirty
- + def #{method_name}_with_query_dirty(*args) # def update_with_query_dirty(*args)
- + clear_query_cache if @query_cache_enabled # clear_query_cache if @query_cache_enabled
- + #{method_name}_without_query_dirty(*args) # update_without_query_dirty(*args)
- + end # end
- + #
- + alias_method_chain :#{method_name}, :query_dirty # alias_method_chain :update, :query_dirty
- end_code
- end
- end
- diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
- index fe9cbcf..a65e8bf 100644
- --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
- +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
- @@ -476,12 +476,12 @@ module ActiveRecord
- %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
- class_eval <<-EOV
- - def #{column_type}(*args)
- - options = args.extract_options!
- - column_names = args
- -
- - column_names.each { |name| column(name, '#{column_type}', options) }
- - end
- + def #{column_type}(*args) # def string(*args)
- + options = args.extract_options! # options = args.extract_options!
- + column_names = args # column_names = args
- + #
- + column_names.each { |name| column(name, '#{column_type}', options) } # column_names.each { |name| column(name, 'string', options) }
- + end # end
- EOV
- end
- @@ -676,24 +676,24 @@ module ActiveRecord
- # t.string(:goat, :sheep)
- %w( string text integer float decimal datetime timestamp time date binary boolean ).each do |column_type|
- class_eval <<-EOV
- - def #{column_type}(*args)
- - options = args.extract_options!
- - column_names = args
- -
- - column_names.each do |name|
- - column = ColumnDefinition.new(@base, name, '#{column_type}')
- - if options[:limit]
- - column.limit = options[:limit]
- - elsif native['#{column_type}'.to_sym].is_a?(Hash)
- - column.limit = native['#{column_type}'.to_sym][:limit]
- - end
- - column.precision = options[:precision]
- - column.scale = options[:scale]
- - column.default = options[:default]
- - column.null = options[:null]
- - @base.add_column(@table_name, name, column.sql_type, options)
- - end
- - end
- + def #{column_type}(*args) # def string(*args)
- + options = args.extract_options! # options = args.extract_options!
- + column_names = args # column_names = args
- + #
- + column_names.each do |name| # column_names.each do |name|
- + column = ColumnDefinition.new(@base, name, '#{column_type}') # column = ColumnDefinition.new(@base, name, 'string')
- + if options[:limit] # if options[:limit]
- + column.limit = options[:limit] # column.limit = options[:limit]
- + elsif native['#{column_type}'.to_sym].is_a?(Hash) # elsif native['string'.to_sym].is_a?(Hash)
- + column.limit = native['#{column_type}'.to_sym][:limit] # column.limit = native['string'.to_sym][:limit]
- + end # end
- + column.precision = options[:precision] # column.precision = options[:precision]
- + column.scale = options[:scale] # column.scale = options[:scale]
- + column.default = options[:default] # column.default = options[:default]
- + column.null = options[:null] # column.null = options[:null]
- + @base.add_column(@table_name, name, column.sql_type, options) # @base.add_column(@table_name, name, column.sql_type, options)
- + end # end
- + end # end
- EOV
- end
- diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
- index 445d8ed..5794ee6 100644
- --- a/activesupport/lib/active_support/buffered_logger.rb
- +++ b/activesupport/lib/active_support/buffered_logger.rb
- @@ -68,13 +68,13 @@ module ActiveSupport
- 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
- + 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
- diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
- index 5cdcaf5..35c4f59 100644
- --- a/activesupport/lib/active_support/callbacks.rb
- +++ b/activesupport/lib/active_support/callbacks.rb
- @@ -210,20 +210,20 @@ module ActiveSupport
- 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
- -
- - 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}(*methods, &block) # def self.before_save(*methods, &block)
- + callbacks = CallbackChain.build(:#{callback}, *methods, &block) # callbacks = CallbackChain.build(:before_save, *methods, &block)
- + (@#{callback}_callbacks ||= CallbackChain.new).concat callbacks # (@before_save_callbacks ||= CallbackChain.new).concat callbacks
- + end # end
- + #
- + def self.#{callback}_callback_chain # def self.before_save_callback_chain
- + @#{callback}_callbacks ||= CallbackChain.new # @before_save_callbacks ||= CallbackChain.new
- + #
- + if superclass.respond_to?(:#{callback}_callback_chain) # if superclass.respond_to?(:before_save_callback_chain)
- + CallbackChain.new(superclass.#{callback}_callback_chain + @#{callback}_callbacks) # CallbackChain.new(superclass.before_save_callback_chain + @before_save_callbacks)
- + else # else
- + @#{callback}_callbacks # @before_save_callbacks
- + end # end
- + end # end
- end_eval
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
- index 186ca69..6b40383 100644
- --- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
- +++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
- @@ -11,17 +11,17 @@ class Class
- syms.flatten.each do |sym|
- next if sym.is_a?(Hash)
- class_eval(<<-EOS, __FILE__, __LINE__)
- - unless defined? @@#{sym}
- - @@#{sym} = nil
- - end
- -
- - def self.#{sym}
- - @@#{sym}
- - end
- -
- - def #{sym}
- - @@#{sym}
- - end
- + unless defined? @@#{sym} # unless defined? @@hair_colors
- + @@#{sym} = nil # @@hair_colors = nil
- + end # end
- + #
- + def self.#{sym} # def self.hair_colors
- + @@#{sym} # @@hair_colors
- + end # end
- + #
- + def #{sym} # def hair_colors
- + @@#{sym} # @@hair_colors
- + end # end
- EOS
- end
- end
- @@ -30,19 +30,19 @@ class Class
- 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
- - " unless options[:instance_writer] == false }
- + unless defined? @@#{sym} # unless defined? @@hair_colors
- + @@#{sym} = nil # @@hair_colors = nil
- + end # end
- + #
- + def self.#{sym}=(obj) # def self.hair_colors=(obj)
- + @@#{sym} = obj # @@hair_colors = obj
- + end # end
- + #
- + #{" #
- + def #{sym}=(obj) # def hair_colors=(obj)
- + @@#{sym} = obj # @@hair_colors = obj
- + end # end
- + " unless options[:instance_writer] == false } # # instance writer above is generated unless options[:instance_writer] == false
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
- index 368317d..e79e569 100644
- --- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
- +++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
- @@ -9,22 +9,22 @@ class Class
- 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
- + def self.#{name} # def self.only_reader
- + if defined?(@#{name}) # if defined?(@only_reader)
- + @#{name} # @only_reader
- + elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name}) # elsif superclass < Object && superclass.respond_to?(:only_reader)
- + superclass.#{name} # superclass.only_reader
- + end # end
- + end # end
- + def #{name} # def only_reader
- + self.class.#{name} # self.class.only_reader
- + end # end
- + def self.#{name}? # def self.only_reader?
- + !!#{name} # !!only_reader
- + end # end
- + def #{name}? # def only_reader?
- + !!#{name} # !!only_reader
- + end # end
- EOS
- end
- end
- @@ -32,9 +32,9 @@ class Class
- def superclass_delegating_writer(*names)
- names.each do |name|
- class_eval <<-EOS
- - def self.#{name}=(value)
- - @#{name} = value
- - end
- + def self.#{name}=(value) # def self.only_writer=(value)
- + @#{name} = value # @only_writer = value
- + end # end
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
- index e6143a2..8b4574d 100644
- --- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
- +++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
- @@ -11,13 +11,13 @@ class Class # :nodoc:
- 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
- + def self.#{sym} # def self.before_add_for_comments
- + read_inheritable_attribute(:#{sym}) # read_inheritable_attribute(:before_add_for_comments)
- + end # end
- + #
- + def #{sym} # def before_add_for_comments
- + self.class.#{sym} # self.class.before_add_for_comments
- + end # end
- EOS
- end
- end
- @@ -26,15 +26,15 @@ class Class # :nodoc:
- options = syms.extract_options!
- syms.each do |sym|
- class_eval <<-EOS
- - def self.#{sym}=(obj)
- - write_inheritable_attribute(:#{sym}, obj)
- - end
- -
- - #{"
- - def #{sym}=(obj)
- - self.class.#{sym} = obj
- - end
- - " unless options[:instance_writer] == false }
- + def self.#{sym}=(obj) # def self.color=(obj)
- + write_inheritable_attribute(:#{sym}, obj) # write_inheritable_attribute(:color, obj)
- + end # end
- + #
- + #{" #
- + def #{sym}=(obj) # def color=(obj)
- + self.class.#{sym} = obj # self.class.color = obj
- + end # end
- + " unless options[:instance_writer] == false } # # the writer above is generated unless options[:instance_writer] == false
- EOS
- end
- end
- @@ -43,15 +43,15 @@ class Class # :nodoc:
- options = syms.extract_options!
- syms.each do |sym|
- class_eval <<-EOS
- - def self.#{sym}=(obj)
- - write_inheritable_array(:#{sym}, obj)
- - end
- -
- - #{"
- - def #{sym}=(obj)
- - self.class.#{sym} = obj
- - end
- - " unless options[:instance_writer] == false }
- + def self.#{sym}=(obj) # def self.levels=(obj)
- + write_inheritable_array(:#{sym}, obj) # write_inheritable_array(:levels, obj)
- + end # end
- + #
- + #{" #
- + def #{sym}=(obj) # def levels=(obj)
- + self.class.#{sym} = obj # self.class.levels = obj
- + end # end
- + " unless options[:instance_writer] == false } # # the writer above is generated unless options[:instance_writer] == false
- EOS
- end
- end
- @@ -60,15 +60,15 @@ class Class # :nodoc:
- options = syms.extract_options!
- syms.each do |sym|
- class_eval <<-EOS
- - def self.#{sym}=(obj)
- - write_inheritable_hash(:#{sym}, obj)
- - end
- -
- - #{"
- - def #{sym}=(obj)
- - self.class.#{sym} = obj
- - end
- - " unless options[:instance_writer] == false }
- + def self.#{sym}=(obj) # def self.nicknames=(obj)
- + write_inheritable_hash(:#{sym}, obj) # write_inheritable_hash(:nicknames, obj)
- + end # end
- + #
- + #{" #
- + def #{sym}=(obj) # def nicknames=(obj)
- + self.class.#{sym} = obj # self.class.nicknames = obj
- + end # end
- + " unless options[:instance_writer] == false } # # the writer above is generated unless options[:instance_writer] == false
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
- index 24fe729..c7919a1 100644
- --- a/activesupport/lib/active_support/core_ext/logger.rb
- +++ b/activesupport/lib/active_support/core_ext/logger.rb
- @@ -3,12 +3,12 @@
- class Logger
- def self.define_around_helper(level)
- module_eval <<-end_eval
- - def around_#{level}(before_message, after_message, &block)
- - self.#{level}(before_message)
- - return_value = block.call(self)
- - self.#{level}(after_message)
- - return return_value
- - end
- + def around_#{level}(before_message, after_message, &block) # def around_debug(before_message, after_message, &block)
- + self.#{level}(before_message) # self.debug(before_message)
- + return_value = block.call(self) # return_value = block.call(self)
- + self.#{level}(after_message) # self.debug(after_message)
- + return return_value # return return_value
- + end # end
- end_eval
- end
- [:debug, :info, :error, :fatal].each {|level| define_around_helper(level) }
- diff --git a/activesupport/lib/active_support/core_ext/module/aliasing.rb b/activesupport/lib/active_support/core_ext/module/aliasing.rb
- index e640f64..b6f66b2 100644
- --- a/activesupport/lib/active_support/core_ext/module/aliasing.rb
- +++ b/activesupport/lib/active_support/core_ext/module/aliasing.rb
- @@ -64,9 +64,9 @@ module ActiveSupport
- # e.title # => "Megastars"
- def alias_attribute(new_name, old_name)
- module_eval <<-STR, __FILE__, __LINE__+1
- - def #{new_name}; self.#{old_name}; end
- - def #{new_name}?; self.#{old_name}?; end
- - def #{new_name}=(v); self.#{old_name} = v; end
- + def #{new_name}; self.#{old_name}; end # def subject; self.title; end
- + def #{new_name}?; self.#{old_name}?; end # def subject?; self.title?; end
- + def #{new_name}=(v); self.#{old_name} = v; end # def subject=(v); self.title = v; end
- STR
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb b/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
- index 683789d..b0c93ac 100644
- --- a/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
- +++ b/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
- @@ -22,10 +22,10 @@ class Module
- raise 'Default value or block required' unless !default.nil? || block
- define_method(sym, block_given? ? block : Proc.new { default })
- module_eval(<<-EVAL, __FILE__, __LINE__)
- - def #{sym}=(value)
- - class << self; attr_reader :#{sym} end
- - @#{sym} = value
- - end
- + def #{sym}=(value) # def age=(value)
- + class << self; attr_reader :#{sym} end # class << self; attr_reader :age end
- + @#{sym} = value # @age = value
- + end # end
- EVAL
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
- index 51e1c9a..56e967a 100644
- --- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
- +++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
- @@ -15,17 +15,17 @@ class Module
- syms.each do |sym|
- next if sym.is_a?(Hash)
- class_eval(<<-EOS, __FILE__, __LINE__)
- - unless defined? @@#{sym}
- - @@#{sym} = nil
- - end
- -
- - def self.#{sym}
- - @@#{sym}
- - end
- -
- - def #{sym}
- - @@#{sym}
- - end
- + unless defined? @@#{sym} # unless defined? @@pagination_options
- + @@#{sym} = nil # @@pagination_options = nil
- + end # end
- + #
- + def self.#{sym} # def self.pagination_options
- + @@#{sym} # @@pagination_options
- + end # end
- + #
- + def #{sym} # def pagination_options
- + @@#{sym} # @@pagination_options
- + end # end
- EOS
- end
- end
- @@ -34,19 +34,19 @@ class Module
- 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
- - " unless options[:instance_writer] == false }
- + unless defined? @@#{sym} # unless defined? @@pagination_options
- + @@#{sym} = nil # @@pagination_options = nil
- + end # end
- + #
- + def self.#{sym}=(obj) # def self.pagination_options=(obj)
- + @@#{sym} = obj # @@pagination_options = obj
- + end # end
- + #
- + #{" #
- + def #{sym}=(obj) # def pagination_options=(obj)
- + @@#{sym} = obj # @@pagination_options = obj
- + end # end
- + " unless options[:instance_writer] == false } # # instance writer above is generated unless options[:instance_writer] == false
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
- index 5c75bd4..b1cd9a8 100644
- --- a/activesupport/lib/active_support/core_ext/module/delegation.rb
- +++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
- @@ -112,9 +112,9 @@ class Module
- methods.each do |method|
- module_eval(<<-EOS, "(__DELEGATION__)", 1)
- - def #{prefix}#{method}(*args, &block)
- - #{allow_nil}#{to}.__send__(#{method.inspect}, *args, &block)
- - end
- + def #{prefix}#{method}(*args, &block) # def customer_name(*args, &block)
- + #{allow_nil}#{to}.__send__(#{method.inspect}, *args, &block) # client && client.__send__(:name, *args, &block)
- + end # end
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/core_ext/module/synchronization.rb b/activesupport/lib/active_support/core_ext/module/synchronization.rb
- index 2516060..ffcd068 100644
- --- a/activesupport/lib/active_support/core_ext/module/synchronization.rb
- +++ b/activesupport/lib/active_support/core_ext/module/synchronization.rb
- @@ -26,11 +26,11 @@ class Module
- end
- module_eval(<<-EOS, __FILE__, __LINE__)
- - def #{aliased_method}_with_synchronization#{punctuation}(*args, &block)
- - #{with}.synchronize do
- - #{aliased_method}_without_synchronization#{punctuation}(*args, &block)
- - end
- - end
- + def #{aliased_method}_with_synchronization#{punctuation}(*args, &block) # def expire_with_synchronization(*args, &block)
- + #{with}.synchronize do # @@lock.synchronize do
- + #{aliased_method}_without_synchronization#{punctuation}(*args, &block) # expire_without_synchronization(*args, &block)
- + end # end
- + end # end
- EOS
- alias_method_chain method, :synchronization
- diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
- index 9f2fd3a..9181173 100644
- --- a/activesupport/lib/active_support/memoizable.rb
- +++ b/activesupport/lib/active_support/memoizable.rb
- @@ -59,34 +59,34 @@ module ActiveSupport
- memoized_ivar = ActiveSupport::Memoizable.memoized_ivar_for(symbol)
- class_eval <<-EOS, __FILE__, __LINE__
- - include InstanceMethods
- -
- - raise "Already memoized #{symbol}" if method_defined?(:#{original_method})
- - alias #{original_method} #{symbol}
- -
- - 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
- + include InstanceMethods # include InstanceMethods
- + #
- + raise "Already memoized #{symbol}" if method_defined?(:#{original_method}) # raise "Already memoized mime_type" if method_defined?(:_unmemoized_mime_type)
- + alias #{original_method} #{symbol} # alias _unmemoized_mime_type mime_type
- + #
- + if instance_method(:#{symbol}).arity == 0 # if instance_method(:mime_type).arity == 0
- + def #{symbol}(reload = false) # def mime_type(reload = false)
- + if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty? # if reload || !defined?(@_memoized_mime_type) || @_memoized_mime_type.empty?
- + #{memoized_ivar} = [#{original_method}.freeze] # @_memoized_mime_type = [_unmemoized_mime_type.freeze]
- + end # end
- + #{memoized_ivar}[0] # @_memoized_mime_type[0]
- + end # end
- + else # else
- + def #{symbol}(*args) # def mime_type(*args)
- + #{memoized_ivar} ||= {} unless frozen? # @_memoized_mime_type ||= {} 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_mime_type) && @_memoized_mime_type
- + if !reload && #{memoized_ivar}.has_key?(args) # if !reload && @_memoized_mime_type.has_key?(args)
- + #{memoized_ivar}[args] # @_memoized_mime_type[args]
- + elsif #{memoized_ivar} # elsif @_memoized_mime_type
- + #{memoized_ivar}[args] = #{original_method}(*args).freeze # @_memoized_mime_type[args] = _unmemoized_mime_type(*args).freeze
- + end # end
- + else # else
- + #{original_method}(*args) # _unmemoized_mime_type(*args)
- + end # end
- + end # end
- + end # end
- EOS
- end
- end
- diff --git a/activesupport/lib/active_support/multibyte/unicode_database.rb b/activesupport/lib/active_support/multibyte/unicode_database.rb
- index 3b8cf8f..138575f 100644
- --- a/activesupport/lib/active_support/multibyte/unicode_database.rb
- +++ b/activesupport/lib/active_support/multibyte/unicode_database.rb
- @@ -24,10 +24,10 @@ module ActiveSupport #:nodoc:
- # 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
- + def #{attr_name} # def codepoints
- + load # load
- + @#{attr_name} # @codepoints
- + end # end
- EOS
- end
- diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
- index 9a2d283..6f936e9 100644
- --- a/activesupport/lib/active_support/time_with_zone.rb
- +++ b/activesupport/lib/active_support/time_with_zone.rb
- @@ -234,9 +234,9 @@ module ActiveSupport
- %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
- + def #{method_name} # def year
- + time.#{method_name} # time.year
- + end # end
- EOV
- end
Add Comment
Please, Sign In to add comment