activesupport 1.4.0 → 1.4.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.4.1* (February 5th, 2007)
+
+* Optimize Class Inheritable Attributes so that unnecessary hashes are not created. [Bruce Perens]
+
+* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick] 
+
+* Full test coverage for Inflector.  #7228 [Dan Kubb]
+
+
 *1.4.0* (January 16th, 2007)
 
 * Document Inflector.ordinalize and merge docs from String inflections.  #7023 [smeade]

data/lib/active_support/core_ext/class/attribute_accessors.rb

@@ -3,6 +3,7 @@
 class Class # :nodoc:
   def cattr_reader(*syms)
     syms.flatten.each do |sym|
+      next if sym.is_a?(Hash)
       class_eval(<<-EOS, __FILE__, __LINE__)
         unless defined? @@#{sym}
           @@#{sym} = nil
@@ -20,6 +21,7 @@ class Class # :nodoc:
   end
 
   def cattr_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
     syms.flatten.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
         unless defined? @@#{sym}
@@ -30,9 +32,11 @@ class Class # :nodoc:
           @@#{sym} = obj
         end
 
+        #{"
         def #{sym}=(obj)
           @@#{sym} = obj
         end
+        " unless options[:instance_writer] == false }
       EOS
     end
   end

data/lib/active_support/core_ext/class/inheritable_attributes.rb

@@ -9,6 +9,7 @@ end
 class Class # :nodoc:
   def class_inheritable_reader(*syms)
     syms.each do |sym|
+      next if sym.is_a?(Hash)
       class_eval <<-EOS
         def self.#{sym}
           read_inheritable_attribute(:#{sym})
@@ -22,43 +23,52 @@ class Class # :nodoc:
   end
 
   def class_inheritable_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
     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 }
       EOS
     end
   end
 
   def class_inheritable_array_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
     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 }
       EOS
     end
   end
 
   def class_inheritable_hash_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
     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 }
       EOS
     end
   end
@@ -79,10 +89,13 @@ class Class # :nodoc:
   end
 
   def inheritable_attributes
-    @inheritable_attributes ||= {}
+    @inheritable_attributes ||= EMPTY_INHERITABLE_ATTRIBUTES
   end
   
   def write_inheritable_attribute(key, value)
+    if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
+      @inheritable_attributes = {}
+    end
     inheritable_attributes[key] = value
   end
   
@@ -101,15 +114,22 @@ class Class # :nodoc:
   end
   
   def reset_inheritable_attributes
-    inheritable_attributes.clear
+    @inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
   end
 
-  private 
+  private
+    # Prevent this constant from being created multiple times
+    EMPTY_INHERITABLE_ATTRIBUTES = {}.freeze unless const_defined?(:EMPTY_INHERITABLE_ATTRIBUTES)
+
     def inherited_with_inheritable_attributes(child)
       inherited_without_inheritable_attributes(child) if respond_to?(:inherited_without_inheritable_attributes)
       
-      new_inheritable_attributes = inheritable_attributes.inject({}) do |memo, (key, value)|
-        memo.update(key => (value.dup rescue value))
+      if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
+        new_inheritable_attributes = EMPTY_INHERITABLE_ATTRIBUTES
+      else
+        new_inheritable_attributes = inheritable_attributes.inject({}) do |memo, (key, value)|
+          memo.update(key => (value.dup rescue value))
+        end
       end
       
       child.instance_variable_set('@inheritable_attributes', new_inheritable_attributes)

data/lib/active_support/core_ext/module/attribute_accessors.rb

@@ -3,6 +3,7 @@
 class Module # :nodoc:
   def mattr_reader(*syms)
     syms.each do |sym|
+      next if sym.is_a?(Hash)
       class_eval(<<-EOS, __FILE__, __LINE__)
         unless defined? @@#{sym}
           @@#{sym} = nil
@@ -20,6 +21,7 @@ class Module # :nodoc:
   end
   
   def mattr_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
     syms.each do |sym|
       class_eval(<<-EOS, __FILE__, __LINE__)
         unless defined? @@#{sym}
@@ -29,10 +31,12 @@ class Module # :nodoc:
         def self.#{sym}=(obj)
           @@#{sym} = obj
         end
-
+        
+        #{"
         def #{sym}=(obj)
           @@#{sym} = obj
         end
+        " unless options[:instance_writer] == false }
       EOS
     end
   end

data/lib/active_support/core_ext/name_error.rb

@@ -1,7 +1,5 @@
-
 # Add a +missing_name+ method to NameError instances.
-class NameError < StandardError
-  
+class NameError < StandardError #:nodoc:  
   # Add a method to obtain the missing name from a NameError.
   def missing_name
     $1 if /((::)?([A-Z]\w*)(::[A-Z]\w*)*)$/ =~ message
@@ -16,5 +14,4 @@ class NameError < StandardError
       missing_name == name.to_s
     end
   end
-  
 end

data/lib/active_support/dependencies.rb

@@ -47,7 +47,6 @@ module Dependencies #:nodoc:
   mattr_accessor :log_activity
   self.log_activity = false
   
-  # :nodoc:
   # An internal stack used to record which constants are loaded by any block.
   mattr_accessor :constant_watch_stack
   self.constant_watch_stack = []
@@ -382,7 +381,7 @@ module Dependencies #:nodoc:
     end
   end
   
-  class LoadingModule
+  class LoadingModule #:nodoc:
     # Old style environment.rb referenced this method directly.  Please note, it doesn't
     # actualy *do* anything any more.
     def self.root(*args)

data/lib/active_support/deprecation.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module ActiveSupport
-  module Deprecation
+  module Deprecation #:nodoc:
     mattr_accessor :debug
     self.debug = false
 
@@ -81,7 +81,7 @@ module ActiveSupport
     # Warnings are not silenced by default.
     self.silenced = false
 
-    module ClassMethods
+    module ClassMethods #:nodoc:
       # Declare that a method has been deprecated.
       def deprecate(*method_names)
         options = method_names.last.is_a?(Hash) ? method_names.pop : {}
@@ -112,7 +112,7 @@ module ActiveSupport
       end
     end
 
-    module Assertions
+    module Assertions #:nodoc:
       def assert_deprecated(match = nil, &block)
         result, warnings = collect_deprecations(&block)
         assert !warnings.empty?, "Expected a deprecation warning within the block but received none"
@@ -145,7 +145,7 @@ module ActiveSupport
 
     # Stand-in for @request, @attributes, @params, etc which emits deprecation
     # warnings on any method call (except #inspect).
-    class DeprecatedInstanceVariableProxy
+    class DeprecatedInstanceVariableProxy #:nodoc:
       instance_methods.each { |m| undef_method m unless m =~ /^__/ }
 
       def initialize(instance, method, var = "@#{method}")

data/lib/active_support/inflector.rb

@@ -243,12 +243,11 @@ module Inflector
   #   "Module".constantize #=> Module
   #   "Class".constantize #=> Class
   def constantize(camel_cased_word)
-    unless /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ camel_cased_word
+    unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
       raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
     end
 
-    camel_cased_word = "::#{camel_cased_word}" unless $1
-    Object.module_eval(camel_cased_word, __FILE__, __LINE__)
+    Object.module_eval("::#{$1}", __FILE__, __LINE__)
   end
 
   # Ordinalize turns a number into an ordinal string used to denote the

data/lib/active_support/multibyte.rb

@@ -1,4 +1,4 @@
-module ActiveSupport::Multibyte
+module ActiveSupport::Multibyte #:nodoc:
   DEFAULT_NORMALIZATION_FORM = :kc
   NORMALIZATIONS_FORMS = [:c, :kc, :d, :kd]
   UNICODE_VERSION = '5.0.0'

data/lib/active_support/multibyte/chars.rb

@@ -2,7 +2,7 @@ require 'active_support/multibyte/handlers/utf8_handler'
 require 'active_support/multibyte/handlers/passthru_handler'
 
 # Encapsulates all the functionality related to the Chars proxy.
-module ActiveSupport::Multibyte
+module ActiveSupport::Multibyte #:nodoc:
   # Chars enables you to work transparently with multibyte encodings in the Ruby String class without having extensive
   # knowledge about the encoding. A Chars object accepts a string upon initialization and proxies String methods in an
   # encoding safe manner. All the normal String methods are also implemented on the proxy.

data/lib/active_support/multibyte/handlers/passthru_handler.rb

@@ -1,6 +1,6 @@
 # Chars uses this handler when $KCODE is not set to 'UTF8'. Because this handler doesn't define any methods all call
 # will be forwarded to String.
-class ActiveSupport::Multibyte::Handlers::PassthruHandler
+class ActiveSupport::Multibyte::Handlers::PassthruHandler #:nodoc:
   
   # Return the original byteoffset
   def self.translate_offset(string, byte_offset) #:nodoc:

data/lib/active_support/multibyte/handlers/utf8_handler.rb

@@ -1,6 +1,7 @@
 # Contains all the handlers and helper classes
-module ActiveSupport::Multibyte::Handlers
-  class EncodingError < ArgumentError; end
+module ActiveSupport::Multibyte::Handlers #:nodoc:
+  class EncodingError < ArgumentError #:nodoc:
+  end
   
   class Codepoint #:nodoc:
     attr_accessor :code, :combining_class, :decomp_type, :decomp_mapping, :uppercase_mapping, :lowercase_mapping

data/lib/active_support/multibyte/handlers/utf8_handler_proc.rb

@@ -1,8 +1,7 @@
 # Methods in this handler call functions in the utf8proc ruby extension. These are significantly faster than the
 # pure ruby versions. Chars automatically uses this handler when it can load the utf8proc extension. For
 # documentation on handler methods see UTF8Handler.
-class ActiveSupport::Multibyte::Handlers::UTF8HandlerProc < ActiveSupport::Multibyte::Handlers::UTF8Handler
-  
+class ActiveSupport::Multibyte::Handlers::UTF8HandlerProc < ActiveSupport::Multibyte::Handlers::UTF8Handler #:nodoc:
   class << self
     def normalize(str, form=ActiveSupport::Multibyte::DEFAULT_NORMALIZATION_FORM) #:nodoc:
       codepoints = str.unpack('U*')

data/lib/active_support/reloadable.rb

@@ -4,9 +4,8 @@ require 'active_support/deprecation'
 # 
 # Deprecated as of Rails 1.2.
 # All autoloaded objects are now unloaded.
-module Reloadable
-  class << self
-    
+module Reloadable #:nodoc:
+  class << self    
     def included(base) #nodoc:
       unless base.ancestors.include?(Reloadable::Subclasses) # Avoid double warning
         ActiveSupport::Deprecation.warn "Reloadable has been deprecated and has no effect.", caller
@@ -37,7 +36,7 @@ module Reloadable
   # 
   # Deprecated as of Rails 1.2.
   # All autoloaded objects are now unloaded.
-  module Subclasses
+  module Subclasses #:nodoc:
     def self.included(base) #nodoc:
       base.send :include, Reloadable
       ActiveSupport::Deprecation.warn "Reloadable::Subclasses has been deprecated and has no effect.", caller
@@ -48,8 +47,7 @@ module Reloadable
     end
   end
   
-  module Deprecated
-    
+  module Deprecated #:nodoc:
     def self.included(base)
       class << base
         define_method(:reloadable?) do
@@ -58,7 +56,5 @@ module Reloadable
         end
       end
     end
-    
   end
-  
 end

data/lib/active_support/vendor/xml_simple.rb

@@ -15,7 +15,7 @@ class XmlSimple
 
   # A simple cache for XML documents that were already transformed
   # by xml_in.
-  class Cache
+  class Cache #:nodoc:
     # Creates and initializes a new Cache object.
     def initialize
       @mem_share_cache = {}

data/lib/active_support/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-01-17 00:00:00 -06:00
+  version: 1.4.1
+date: 2007-02-05 00:00:00 -06:00
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
 - lib