activesupport 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+*1.0.1* (7th March, 2005)
+
+* Fixed Hash#indifferent_access to also deal with include? and fetch and nested hashes #726 [Nicholas Seckar]
+
+* Added Object#blank? -- see http://redhanded.hobix.com/inspect/objectBlank.html #783 [_why the lucky stiff]
+
+* Added inflection rules for "sh" words, like "wish" and "fish" #755 [phillip@pjbsoftware.com]
+
+* Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 [Tobias Luetke]
+
+* Added String#to_time and String#to_date for wrapping ParseDate
+
+
 *1.0.0* (24th February, 2005)
 
 * Added TimeZone as the first of a number of value objects that among others Active Record can use rich value objects using composed_of #688 [Jamis Buck]

data/lib/active_support.rb

@@ -23,6 +23,10 @@
 
 $:.unshift(File.dirname(__FILE__))
 
+require 'active_support/class_attribute_accessors'
+require 'active_support/class_inheritable_attributes'
+require 'active_support/inflector'
+
 require 'active_support/core_ext'
 require 'active_support/clean_logger'
 require 'active_support/misc'

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

@@ -1,8 +1,9 @@
+# This implementation is HODEL-HASH-9600 compliant
 class HashWithIndifferentAccess < Hash
-  def initialize(constructor)
+  def initialize(constructor = {})
     if constructor.is_a?(Hash)
       super()
-      update(constructor.symbolize_keys)
+      update(constructor.stringify_keys)
     else
       super(constructor)
     end
@@ -12,7 +13,7 @@ class HashWithIndifferentAccess < Hash
   
   def [](key)
     case key
-      when Symbol: regular_reader(key) || regular_reader(key.to_s)
+      when Symbol: regular_reader(key.to_s) || regular_reader(key)
       when String: regular_reader(key) || regular_reader(key.to_sym)
       else regular_reader(key)
     end
@@ -21,8 +22,35 @@ class HashWithIndifferentAccess < Hash
   alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
   
   def []=(key, value)
-    regular_writer(key.is_a?(String) ? key.to_sym : key, value)
+    regular_writer(convert_key(key), convert_value(value))
   end
+  def update(hash)
+    hash.each {|key, value| self[key] = value}
+  end
+
+  def key?(key)
+    super(convert_key(key))
+  end
+
+  alias_method :include?, :key?
+  alias_method :has_key?, :key?
+  alias_method :member?, :key?
+
+  def fetch(key, *extras)
+    super(convert_key(key), *extras)
+  end
+
+  def values_at(*indices)
+    indices.collect {|key| self[convert_key(key)]}
+  end
+
+  protected
+    def convert_key(key)
+      key.kind_of?(Symbol) ? key.to_s : key
+    end
+    def convert_value(value)
+      value.is_a?(Hash) ? value.with_indifferent_access : value
+    end
 end
 
 module ActiveSupport #:nodoc:

data/lib/active_support/core_ext/object_and_class.rb

@@ -11,6 +11,16 @@ class Object #:nodoc:
     end
     subclasses
   end
+
+  def blank?
+    if respond_to? :empty?
+      empty?
+    elsif respond_to? :zero?
+      zero?
+    else
+      !self
+    end
+  end
 end
 
 class Class #:nodoc:

data/lib/active_support/core_ext/string.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/string/inflections'
+require File.dirname(__FILE__) + '/string/conversions'
 
 class String #:nodoc:
   include ActiveSupport::CoreExtensions::String::Inflections
+  include ActiveSupport::CoreExtensions::String::Conversions
 end

data/lib/active_support/core_ext/string/conversions.rb

@@ -0,0 +1,19 @@
+require 'parsedate'
+
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Converting strings to other objects
+      module Conversions
+        # Form can be either :utc (default) or :local.
+        def to_time(form = :utc)
+          ::Time.send(form, *ParseDate.parsedate(self))
+        end
+
+        def to_date
+          ::Date.new(*ParseDate.parsedate(self)[0..2])
+        end
+      end
+    end
+  end
+end

data/lib/active_support/dependencies.rb

@@ -36,7 +36,8 @@ module Dependencies
   end
   
   def require_or_load(file_name)
-    load? ? load("#{file_name}.rb") : require(file_name)
+    file_name = "#{file_name}.rb" unless ! load? || /\.rb$/ =~ file_name
+    load? ? load(file_name) : require(file_name)
   end
   
   def remove_subclasses_for(*classes)
@@ -62,6 +63,7 @@ module Dependencies
       @root = root
     end
     
+    def root?() self.root == self end
     def load_paths() self.root.load_paths end
     
     # Load missing constants if possible.
@@ -78,10 +80,19 @@ module Dependencies
         next unless fs_path
 
         if File.directory?(fs_path)
-          self.const_set name, LoadingModule.new(self.root, self.path + [name])
+          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) 
+          end
           break
         elsif File.file?(fs_path)
           self.root.load_file!(fs_path)
+          
+          # Import the loaded constant from Object provided we are the root node.
+          self.const_set(name, Object.const_get(name)) if self.root? && Object.const_defined?(name)
           break
         end
       end
@@ -109,17 +120,13 @@ module Dependencies
     
     # Load the source file at the given file path
     def load_file!(file_path)
-      begin root.module_eval(IO.read(file_path), file_path, 1)
-      rescue Object => exception
-        exception.blame_file! file_path
-        raise
-      end
+      require_dependency(file_path)
     end
 
     # Erase all items in this module
     def clear!
       constants.each do |name|
-        Object.send(:remove_const, name) if Object.const_defined?(name) && self.path.empty?
+        Object.send(:remove_const, name) if Object.const_defined?(name)
         self.send(:remove_const, name)
       end
     end

data/lib/active_support/inflector.rb

@@ -57,6 +57,7 @@ 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'],
@@ -74,7 +75,8 @@ module Inflector
 
     def singular_rules #:doc:
       [
-        [/(x|ch|ss)es$/, '\1'],
+        [/fish$/, 'fish'],
+        [/(x|ch|ss|sh)es$/, '\1'],
         [/movies$/, 'movie'],
         [/series$/, 'series'],
         [/([^aeiouy]|qu)ies$/, '\1y'],

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-02-24
+  version: 1.0.1
+date: 2005-03-07
 summary: Support and utility classes used by the Rails framework.
 require_paths: 
   - lib
@@ -58,6 +58,7 @@ files:
   - lib/active_support/core_ext/hash/keys.rb
   - lib/active_support/core_ext/numeric/bytes.rb
   - lib/active_support/core_ext/numeric/time.rb
+  - lib/active_support/core_ext/string/conversions.rb
   - lib/active_support/core_ext/string/inflections.rb
   - lib/active_support/core_ext/time/calculations.rb
   - lib/active_support/core_ext/time/conversions.rb