activesupport 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,14 @@
+*1.0.4* (19th April, 2005)
+
+* Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar]
+
+* Fixed inflection of perspectives and similar words #1045 [thijs@vandervossen.net]
+
+* Added Fixnum#even? and Fixnum#odd?
+
+* Fixed problem with classes being required twice. Object#const_missing now uses require_dependency to load files. It used to use require_or_load which would cause models to be loaded twice, which was not good for validations and other class methods #971 [Nicholas Seckar]
+
+
 *1.0.3* (27th March, 2005)
 
 * Fixed Inflector.pluralize to handle capitalized words #932 [bitsweat]

data/lib/active_support/core_ext/fixnum.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/fixnum/even_odd'
+
+class Fixnum #:nodoc:
+  include ActiveSupport::CoreExtensions::Fixnum::EvenOdd
+end

data/lib/active_support/core_ext/fixnum/even_odd.rb

@@ -0,0 +1,20 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Fixnum #:nodoc:
+      # For checking if a fixnum is even or odd. 
+      # * 1.even? # => false
+      # * 1.odd?  # => true
+      # * 2.even? # => true
+      # * 2.odd? # => false
+      module EvenOdd
+        def even?
+          self % 2 == 0
+        end
+        
+        def odd?
+          !even?
+        end
+      end
+    end
+  end
+end

data/lib/active_support/core_ext/kernel.rb

@@ -10,7 +10,7 @@ module Kernel
   #
   #   foo # => ['bar', 'baz']
   #
-  def returning(value) #:nodoc:
+  def returning(value)
     yield
     value
   end

data/lib/active_support/dependencies.rb

@@ -55,7 +55,7 @@ module Dependencies
     def self.root(*load_paths)
       RootLoadingModule.new(*load_paths)
     end
-            
+    
     def initialize(root, path=[])
       @path = path.clone.freeze
       @root = root
@@ -81,9 +81,11 @@ module Dependencies
           new_module = LoadingModule.new(self.root, self.path + [name])
           self.const_set name, new_module
           if self.root?
-            raise NameError, "Cannot load controller module named #{name}: An object of type #{Object.const_get(name).class.to_s} already exists." \
-              if Object.const_defined?(name)
-            Object.const_set(name, new_module) 
+            if Object.const_defined?(name)
+              msg = "Cannot load module #{name}: Object::#{name} is set to #{Object.const_get(name).inspect}"
+              raise NameError, msg
+            end
+            Object.const_set(name, new_module)
           end
           break
         elsif File.file?(fs_path)
@@ -94,7 +96,7 @@ module Dependencies
           break
         end
       end
-
+      
       return self.const_defined?(name)
     end
     
@@ -124,7 +126,7 @@ module Dependencies
     # Erase all items in this module
     def clear!
       constants.each do |name|
-        Object.send(:remove_const, name) if Object.const_defined?(name)
+        Object.send(:remove_const, name) if Object.const_defined?(name) && Object.const_get(name).object_id == self.const_get(name).object_id
         self.send(:remove_const, name)
       end
     end
@@ -175,7 +177,7 @@ class Object #:nodoc:
       end
 
       begin
-        require_or_load(class_id.to_s.demodulize.underscore)
+        require_dependency(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 => e
         raise NameError.new("uninitialized constant #{class_id}").copy_blame!(e)

data/lib/active_support/inflector.rb

@@ -81,6 +81,7 @@ module Inflector
         [/(s)eries$/i, '\1\2eries'],
         [/([^aeiouy]|qu)ies$/i, '\1y'],
         [/([lr])ves$/i, '\1f'],
+        [/(tive)s$/i, '\1'],
         [/([^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'],

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2005-03-27
+  version: 1.0.4
+date: 2005-04-19
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
   - lib
@@ -44,6 +44,8 @@ files:
   - lib/active_support/values
   - lib/active_support/core_ext/date
   - lib/active_support/core_ext/date.rb
+  - lib/active_support/core_ext/fixnum
+  - lib/active_support/core_ext/fixnum.rb
   - lib/active_support/core_ext/hash
   - lib/active_support/core_ext/hash.rb
   - lib/active_support/core_ext/kernel.rb
@@ -56,6 +58,7 @@ files:
   - lib/active_support/core_ext/time
   - lib/active_support/core_ext/time.rb
   - lib/active_support/core_ext/date/conversions.rb
+  - lib/active_support/core_ext/fixnum/even_odd.rb
   - lib/active_support/core_ext/hash/indifferent_access.rb
   - lib/active_support/core_ext/hash/keys.rb
   - lib/active_support/core_ext/numeric/bytes.rb