aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/core_ext/hash/indifferent_access.rb10
-rw-r--r--activesupport/lib/core_ext/string/inflections.rb4
-rw-r--r--activesupport/lib/dependencies.rb67
-rw-r--r--activesupport/lib/inflector.rb12
4 files changed, 9 insertions, 84 deletions
diff --git a/activesupport/lib/core_ext/hash/indifferent_access.rb b/activesupport/lib/core_ext/hash/indifferent_access.rb
index 2353cfaf3b..3fe0999866 100644
--- a/activesupport/lib/core_ext/hash/indifferent_access.rb
+++ b/activesupport/lib/core_ext/hash/indifferent_access.rb
@@ -8,17 +8,17 @@ class HashWithIndifferentAccess < Hash
end
end
- alias_method :regular_reader, :[] unless method_defined?(:regular_reader)
+ alias_method :regular_read, :[]
def [](key)
case key
- when Symbol: regular_reader(key) || regular_reader(key.to_s)
- when String: regular_reader(key) || regular_reader(key.to_sym)
- else regular_reader(key)
+ when Symbol: regular_read(key) || regular_read(key.to_s)
+ when String: regular_read(key) || regular_read(key.to_sym)
+ else regular_read(key)
end
end
- alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+ alias_method :regular_writer, :[]=
def []=(key, value)
regular_writer(key.is_a?(String) ? key.to_sym : key, value)
diff --git a/activesupport/lib/core_ext/string/inflections.rb b/activesupport/lib/core_ext/string/inflections.rb
index aa4ff3a74d..5d1070b00a 100644
--- a/activesupport/lib/core_ext/string/inflections.rb
+++ b/activesupport/lib/core_ext/string/inflections.rb
@@ -39,10 +39,6 @@ module ActiveSupport #:nodoc:
def foreign_key(separate_class_name_and_id_with_underscore = true)
Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)
end
-
- def constantize
- Inflector.constantize(self)
- end
end
end
end
diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb
index 0a9b8e1d3d..7f53998e7a 100644
--- a/activesupport/lib/dependencies.rb
+++ b/activesupport/lib/dependencies.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/module_attribute_accessors'
module Dependencies
extend self
-
+
@@loaded = [ ]
mattr_accessor :loaded
@@ -41,68 +41,6 @@ module Dependencies
def remove_subclasses_for(*classes)
classes.each { |klass| klass.remove_subclasses }
end
-
- # LoadingModules implement namespace-safe dynamic loading.
- # They support automatic loading via const_missing, allowing contained items to be automatically
- # loaded when required. No extra syntax is required, as expressions such as Controller::Admin::UserController
- # load the relavent files automatically.
- #
- # Ruby-style modules are supported, as a folder named 'submodule' will load 'submodule.rb' when available.
- class LoadingModule < Module
- attr_reader :path
-
- def initialize(filesystem_root, path=[])
- @path = path
- @filesystem_root = filesystem_root
- end
-
- # The path to this module in the filesystem.
- # Any subpath provided is taken to be composed of filesystem names.
- def filesystem_path(subpath=[])
- File.join(@filesystem_root, self.path, subpath)
- end
-
- # Load missing constants if possible.
- def const_missing(name)
- return const_get(name) if const_defined?(name) == false && const_load!(name)
- super(name)
- end
-
- # Load the controller class or a parent module.
- def const_load!(name)
- name = name.to_s if name.kind_of? Symbol
-
- if File.directory? filesystem_path(name.underscore)
- # Is it a submodule? If so, create a new LoadingModule *before* loading it.
- # This ensures that subitems will be loadable
- new_module = LoadingModule.new(@filesystem_root, self.path + [name.underscore])
- const_set(name, new_module)
- Object.const_set(name, new_module) if @path.empty?
- end
-
- source_file = filesystem_path("#{(name == 'ApplicationController' ? 'Application' : name).underscore}.rb")
- self.load_file(source_file) if File.file?(source_file)
- self.const_defined?(name.camelize)
- end
-
- # Is this name present or loadable?
- # This method is used by Routes to find valid controllers.
- def const_available?(name)
- name = name.to_s unless name.kind_of? String
- File.directory?(filesystem_path(name.underscore)) || File.file?(filesystem_path("#{name.underscore}.rb"))
- end
-
- def clear
- constants.each do |name|
- Object.send(:remove_const, name) if Object.const_defined?(name) && @path.empty?
- self.send(:remove_const, name)
- end
- end
-
- def load_file(file_path)
- Controllers.module_eval(IO.read(file_path), file_path, 1) # Hard coded Controller line here!!!
- 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)
@@ -114,9 +52,6 @@ class Object #:nodoc:
# Use const_missing to autoload associations so we don't have to
# require_association when using single-table inheritance.
def const_missing(class_id)
- if Object.const_defined?(:Controllers) and Object::Controllers.const_available?(class_id)
- return Object::Controllers.const_get(class_id)
- end
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
diff --git a/activesupport/lib/inflector.rb b/activesupport/lib/inflector.rb
index a9b2f87be4..065fad3762 100644
--- a/activesupport/lib/inflector.rb
+++ b/activesupport/lib/inflector.rb
@@ -20,11 +20,11 @@ module Inflector
end
def camelize(lower_case_and_underscored_word)
- lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+ lower_case_and_underscored_word.to_s.gsub(/(^|_)(.)/){$2.upcase}
end
def underscore(camel_cased_word)
- camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
+ camel_cased_word.to_s.gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
end
def humanize(lower_case_and_underscored_word)
@@ -47,13 +47,7 @@ module Inflector
Inflector.underscore(Inflector.demodulize(class_name)) +
(separate_class_name_and_id_with_underscore ? "_id" : "id")
end
-
- def constantize(camel_cased_word)
- camel_cased_word.split("::").inject(Object) do |final_type, part|
- final_type = final_type.const_get(part)
- end
- end
-
+
private
def plural_rules #:doc:
[