deprecation.rb in activesupport-2.3.6

- old
+ new

@@ -50,11 +50,12 @@
 
 
       private
         def deprecation_message(callstack, message = nil)
           message ||= "You are using deprecated behavior which will be removed from the next major or minor release."
-          "DEPRECATION WARNING: #{message}. #{deprecation_caller_message(callstack)}"
+          message += '.' unless message =~ /\.$/
+          "DEPRECATION WARNING: #{message} #{deprecation_caller_message(callstack)}"
         end
 
         def deprecation_caller_message(callstack)
           file, line, method = extract_callstack(callstack)
           if file
@@ -87,10 +88,10 @@
       def deprecate(*method_names)
         options = method_names.extract_options!
         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__)
+            class_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def #{target}_with_deprecation#{punctuation}(*args, &block)          # def generate_secret_with_deprecation(*args, &block)
                 ::ActiveSupport::Deprecation.warn(                                 #   ::ActiveSupport::Deprecation.warn(
                   self.class.deprecated_method_warning(                            #     self.class.deprecated_method_warning(
                     :#{method_name},                                               #       :generate_secret,
                     #{options[method_name].inspect}),                              #       "You should use ActiveSupport::SecureRandom.hex(64)"),