activesupport 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,4 +1,17 @@
-*1.0.2*
+*1.0.3* (27th March, 2005)
+
+* Fixed Inflector.pluralize to handle capitalized words #932 [bitsweat]
+
+* Added Object#suppress which allows you to make a saner choice around with exceptions to swallow #980. Example:
+
+    suppress(ZeroDivisionError) { 1/0 }
+  
+  ...instead of:
+  
+    1/0 rescue nil # BAD, EVIL, DIRTY.
+
+
+*1.0.2* (22th March, 2005)
 
 * Added Kernel#returning -- a Ruby-ized realization of the K combinator, courtesy of Mikael Brockman.
 

data/lib/active_support/core_ext/load_error.rb

@@ -0,0 +1,38 @@
+class MissingSourceFile < LoadError
+  attr_reader :path
+  def initialize(message, path)
+    super(message)
+    @path = path
+  end
+
+  def is_missing?(path)
+    path.gsub(/\.rb$/, '') == self.path.gsub(/\.rb$/, '')
+  end
+  
+  def self.from_message(message)
+    REGEXPS.each do |regexp, capture|
+      match = regexp.match(message)
+      return MissingSourceFile.new(message, match[capture]) unless match.nil?
+    end
+    nil
+  end
+  
+  REGEXPS = [
+    [/^no such file to load -- (.+)$/i, 1],
+    [/^Missing \w+ (file\s*)?([^\s]+.rb)$/i, 2],
+    [/^Missing API definition file in (.+)$/i, 1]
+  ]
+end
+
+module ActiveSupport
+  module CoreExtensions
+    module LoadErrorExtensions
+      module LoadErrorClassMethods
+        def new(*args)
+          (self == LoadError && MissingSourceFile.from_message(args.first)) || super
+        end
+      end
+      ::LoadError.extend(LoadErrorClassMethods)
+    end
+  end
+end

data/lib/active_support/core_ext/object_and_class.rb

@@ -21,6 +21,13 @@ class Object #:nodoc:
       !self
     end
   end
+    
+  def suppress(*exception_classes)
+    begin yield
+    rescue Exception => e
+      raise unless exception_classes.any? {|cls| e.kind_of? cls}
+    end
+  end
 end
 
 class Class #:nodoc:

data/lib/active_support/dependencies.rb

@@ -21,8 +21,6 @@ module Dependencies
         require_or_load(file_name)
       rescue LoadError
         raise unless swallow_load_errors
-      rescue Object => e
-        raise ScriptError, "#{e.message}"
       end
     end
   end
@@ -179,8 +177,8 @@ class Object #:nodoc:
       begin
         require_or_load(class_id.to_s.demodulize.underscore)
         if Object.const_defined?(class_id) then return Object.const_get(class_id) else raise LoadError end
-      rescue LoadError
-        raise NameError, "uninitialized constant #{class_id}"
+      rescue LoadError => e
+        raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)
       end
     end
   end
@@ -216,4 +214,9 @@ class Exception
     return nil if blamed_files.empty?
     "This error occured while loading the following files:\n   #{blamed_files.join "\n   "}"
   end
+
+  def copy_blame!(exc)
+    @blamed_files = exc.blamed_files.clone
+    self
+  end
 end

data/lib/active_support/inflector.rb

@@ -57,39 +57,39 @@ module Inflector
   private
     def plural_rules #:doc:
       [
-        [/fish$/, 'fish'],               # fish
-        [/(x|ch|ss|sh)$/, '\1es'],               # search, switch, fix, box, process, address
-        [/series$/, '\1series'],
-        [/([^aeiouy]|qu)ies$/, '\1y'],
-        [/([^aeiouy]|qu)y$/, '\1ies'],        # query, ability, agency
-        [/(?:([^f])fe|([lr])f)$/, '\1\2ves'], # half, safe, wife
-        [/sis$/, 'ses'],                      # basis, diagnosis
-        [/([ti])um$/, '\1a'],                 # datum, medium
-        [/person$/, 'people'],                # person, salesperson
-        [/man$/, 'men'],                      # man, woman, spokesman
-        [/child$/, 'children'],               # child
-        [/s$/, 's'],                          # no change (compatibility)
+        [/(fish)$/i, '\1\2'],                 # fish
+        [/(x|ch|ss|sh)$/i, '\1es'],           # search, switch, fix, box, process, address
+        [/(series)$/i, '\1\2'],
+        [/([^aeiouy]|qu)ies$/i, '\1y'],
+        [/([^aeiouy]|qu)y$/i, '\1ies'],       # query, ability, agency
+        [/(?:([^f])fe|([lr])f)$/i, '\1\2ves'], # half, safe, wife
+        [/sis$/i, 'ses'],                     # basis, diagnosis
+        [/([ti])um$/i, '\1a'],                # datum, medium
+        [/(p)erson$/i, '\1\2eople'],          # person, salesperson
+        [/(m)an$/i, '\1\2en'],                # man, woman, spokesman
+        [/(c)hild$/i, '\1\2hildren'],         # child
+        [/s$/i, 's'],                         # no change (compatibility)
         [/$/, 's']
       ]
     end
 
     def singular_rules #:doc:
       [
-        [/fish$/, 'fish'],
-        [/(x|ch|ss|sh)es$/, '\1'],
-        [/movies$/, 'movie'],
-        [/series$/, 'series'],
-        [/([^aeiouy]|qu)ies$/, '\1y'],
-        [/([lr])ves$/, '\1f'],
-        [/([^f])ves$/, '\1fe'],
-        [/(analy|ba|diagno|parenthe|progno|synop|the)ses$/, '\1sis'],
-        [/([ti])a$/, '\1um'],
-        [/people$/, 'person'],
-        [/men$/, 'man'],
-        [/status$/, 'status'],
-        [/children$/, 'child'],
-        [/news$/, 'news'],
-        [/s$/, '']
+        [/(f)ish$/i, '\1\2ish'],
+        [/(x|ch|ss|sh)es$/i, '\1'],
+        [/(m)ovies$/i, '\1\2ovie'],
+        [/(s)eries$/i, '\1\2eries'],
+        [/([^aeiouy]|qu)ies$/i, '\1y'],
+        [/([lr])ves$/i, '\1f'],
+        [/([^f])ves$/i, '\1fe'],
+        [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'],
+        [/([ti])a$/i, '\1um'],
+        [/(p)eople$/i, '\1\2erson'],
+        [/(m)en$/i, '\1\2an'],
+        [/(s)tatus$/i, '\1\2tatus'],
+        [/(c)hildren$/i, '\1\2hild'],
+        [/(n)ews$/i, '\1\2ews'],
+        [/s$/i, '']
       ]
     end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2005-03-22
+  version: 1.0.3
+date: 2005-03-27
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
   - lib
@@ -47,6 +47,7 @@ files:
   - lib/active_support/core_ext/hash
   - lib/active_support/core_ext/hash.rb
   - lib/active_support/core_ext/kernel.rb
+  - lib/active_support/core_ext/load_error.rb
   - lib/active_support/core_ext/numeric
   - lib/active_support/core_ext/numeric.rb
   - lib/active_support/core_ext/object_and_class.rb