activesupport 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.3.1* (April 6th, 2005)
+
+* Clean paths inside of exception messages and traces. [Nicholas Seckar]
+
+* Add Pathname.clean_within for cleaning all the paths inside of a string. [Nicholas Seckar]
+
+* provide an empty Dependencies::LoadingModule.load which prints deprecation warnings.  Lets 1.0 applications function with .13-style environment.rb.
+
+
 *1.3.0* (March 27th, 2005)
 
 * When possible, avoid incorrectly obtaining constants from parent modules. Fixes #4221. [Nicholas Seckar]

data/lib/active_support/core_ext/exception.rb

@@ -1,25 +1,30 @@
-class Exception
-  alias :clean_message :message
+class Exception # :nodoc:
+  def clean_message
+    Pathname.clean_within message
+  end
   
   TraceSubstitutions = []
-  FrameworkRegexp = /generated_code|vendor|dispatch|ruby|script\/\w+/
+  FrameworkRegexp = /generated|vendor|dispatch|ruby|script\/\w+/
   
   def clean_backtrace
     backtrace.collect do |line|
-      TraceSubstitutions.inject(line) do |line, (regexp, sub)|
+      Pathname.clean_within(TraceSubstitutions.inject(line) do |line, (regexp, sub)|
         line.gsub regexp, sub
-      end
+      end)
     end
   end
   
   def application_backtrace
     before_application_frame = true
     
-    clean_backtrace.reject do |line|
-      non_app_frame = !! (line =~ FrameworkRegexp)
+    trace = clean_backtrace.reject do |line|
+      non_app_frame = (line =~ FrameworkRegexp)
       before_application_frame = false unless non_app_frame
       non_app_frame && ! before_application_frame
     end
+    
+    # If we didn't find any application frames, return an empty app trace.
+    before_application_frame ? [] : trace
   end
   
   def framework_backtrace

data/lib/active_support/core_ext/hash/conversions.rb.rej

@@ -0,0 +1,28 @@
+***************
+*** 21,33 ****
+            options[:builder].instruct! unless options.delete(:skip_instruct)
+  
+            options[:builder].__send__(options[:root]) do
+-             for key in keys
+-               value = self[key]
+  
+-               case value.class.to_s # TODO: Figure out why I have to to_s the class to do comparisons in order for tests to run
+-                 when "Hash"
+                    value.to_xml(options.merge({ :root => key, :skip_instruct => true }))
+-                 when "Array"
+                    value.to_xml(options.merge({ :root => key, :children => key.to_s.singularize, :skip_instruct => true}))
+                  else
+                    type_name = XML_TYPE_NAMES[value.class.to_s]
+--- 21,32 ----
+            options[:builder].instruct! unless options.delete(:skip_instruct)
+  
+            options[:builder].__send__(options[:root]) do
++             each do |key, value|
+  
++               case value
++                 when ::Hash
+                    value.to_xml(options.merge({ :root => key, :skip_instruct => true }))
++                 when ::Array
+                    value.to_xml(options.merge({ :root => key, :children => key.to_s.singularize, :skip_instruct => true}))
+                  else
+                    type_name = XML_TYPE_NAMES[value.class.to_s]

data/lib/active_support/core_ext/hash/indifferent_access.rb

@@ -76,4 +76,4 @@ module ActiveSupport #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_support/core_ext/pathname.rb

@@ -0,0 +1,7 @@
+require 'pathname'
+require File.dirname(__FILE__) + '/pathname/clean_within'
+
+class Pathname#:nodoc:
+  extend ActiveSupport::CoreExtensions::Pathname::CleanWithin
+end
+

data/lib/active_support/core_ext/pathname/clean_within.rb

@@ -0,0 +1,14 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Pathname #:nodoc:
+      module CleanWithin
+        # Clean the paths contained in the provided string.
+        def clean_within(string)
+          string.gsub(%r{[\w. ]+(/[\w. ]+)+(\.rb)?(\b|$)}) do |path|
+            new(path).cleanpath
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/symbol.rb

@@ -1,4 +1,11 @@
-class Symbol #:nodoc:
+class Symbol
+  # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
+  #
+  #   # The same as people.collect { |p| p.name }
+  #   people.collect(&:name)
+  #
+  #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
+  #   people.select(&:manager?).collect(&:salary)
   def to_proc
     Proc.new { |obj, *args| obj.send(self, *args) }
   end

data/lib/active_support/dependencies.rb

@@ -68,6 +68,17 @@ module Dependencies #:nodoc:
     # Record history *after* loading so first load gets warnings.
     history << file_name
   end
+  
+  class LoadingModule
+    # Old style environment.rb referenced this method directly.  Please note, it doesn't
+    # actualy *do* anything any more.
+    def self.root(*args)
+      if defined?(RAILS_DEFAULT_LOGGER)
+        RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases."
+        RAILS_DEFAULT_LOGGER.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19"
+      end
+    end
+  end
 end
 
 Object.send(:define_method, :require_or_load)     { |file_name| Dependencies.require_or_load(file_name) } unless Object.respond_to?(:require_or_load)

data/lib/active_support/version.rb

@@ -2,7 +2,7 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
-date: 2006-03-27 00:00:00 -06:00
+  version: 1.3.1
+date: 2006-04-06 00:00:00 -05:00
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
 - lib
@@ -74,6 +74,8 @@ files:
 - lib/active_support/core_ext/numeric.rb
 - lib/active_support/core_ext/object
 - lib/active_support/core_ext/object.rb
+- lib/active_support/core_ext/pathname
+- lib/active_support/core_ext/pathname.rb
 - lib/active_support/core_ext/proc.rb
 - lib/active_support/core_ext/range
 - lib/active_support/core_ext/range.rb
@@ -89,6 +91,7 @@ files:
 - lib/active_support/core_ext/class/removal.rb
 - lib/active_support/core_ext/date/conversions.rb
 - lib/active_support/core_ext/hash/conversions.rb
+- lib/active_support/core_ext/hash/conversions.rb.rej
 - lib/active_support/core_ext/hash/diff.rb
 - lib/active_support/core_ext/hash/indifferent_access.rb
 - lib/active_support/core_ext/hash/keys.rb
@@ -108,6 +111,7 @@ files:
 - lib/active_support/core_ext/numeric/time.rb
 - lib/active_support/core_ext/object/extending.rb
 - lib/active_support/core_ext/object/misc.rb
+- lib/active_support/core_ext/pathname/clean_within.rb
 - lib/active_support/core_ext/range/conversions.rb
 - lib/active_support/core_ext/string/access.rb
 - lib/active_support/core_ext/string/conversions.rb