Changeset 5555

Timestamp:

11/18/06 18:49:29 (3 years ago)

Author:

david

Message:

Merged [5546] and [5547] from trunk

Files:

• branches/1-2-pre-release/activesupport/lib/active_support/core_ext/exception.rb (modified) (1 diff)
• branches/1-2-pre-release/activesupport/lib/active_support/deprecation.rb (modified) (2 diffs)

branches/1-2-pre-release/activesupport/lib/active_support/core_ext/exception.rb

@@ -29 +29 @@
-  
-  def framework_backtrace
-select {|line| line =~ FrameworkRegexp}
+grep FrameworkRegexp
-  end
-end

branches/1-2-pre-release/activesupport/lib/active_support/deprecation.rb

@@ -38 +38 @@
-      end
-
-
-
+
-      def silence
- # We could have done behavior = nil...
+
-        yield
-      ensure
@@ -154 +153 @@
-
-      private
+        def method_missing(called, *args, &block)
+          warn caller, called, args
+          target.__send__(called, *args, &block)
+        end
+
+        def target
+          @instance.__send__(@method)
+        end
+
-        def warn(callstack, called, args)
-          ActiveSupport::Deprecation.warn("#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}. Args: #{args.inspect}", callstack)
-        end
-
-        def method_missing(called, *args, &block)
-          warn caller, called, args
-          @instance.__send__(@method).__send__(called, *args, &block)
-        end
-    end