aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-06-17 10:37:39 -0500
committerJoshua Peek <josh@joshpeek.com>2009-06-17 10:37:39 -0500
commit1c4d28ba314c8cdd0039becf3bc9e678219b8f46 (patch)
tree67a4b6db06cc9c26145de94f06f3fe8e1adf7953 /activesupport
parent85f2f34d5ec8ccdea4755740b810ac514d9f3dd9 (diff)
downloadrails-1c4d28ba314c8cdd0039becf3bc9e678219b8f46.tar.gz
rails-1c4d28ba314c8cdd0039becf3bc9e678219b8f46.tar.bz2
rails-1c4d28ba314c8cdd0039becf3bc9e678219b8f46.zip
Move model naming into ActiveModel
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/module.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/module/model_naming.rb25
-rw-r--r--activesupport/test/core_ext/module/model_naming_test.rb28
3 files changed, 0 insertions, 54 deletions
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index 215c47b114..fbe89fe07c 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -7,5 +7,4 @@ require 'active_support/core_ext/module/attr_internal'
require 'active_support/core_ext/module/attr_accessor_with_default'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/module/loading'
-require 'active_support/core_ext/module/model_naming'
require 'active_support/core_ext/module/synchronization'
diff --git a/activesupport/lib/active_support/core_ext/module/model_naming.rb b/activesupport/lib/active_support/core_ext/module/model_naming.rb
deleted file mode 100644
index 13420bab07..0000000000
--- a/activesupport/lib/active_support/core_ext/module/model_naming.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'active_support/inflector'
-
-module ActiveSupport
- class ModelName < String
- attr_reader :singular, :plural, :element, :collection, :partial_path
- alias_method :cache_key, :collection
-
- def initialize(name)
- super
- @singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
- @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
- @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
- @collection = ActiveSupport::Inflector.tableize(self).freeze
- @partial_path = "#{@collection}/#{@element}".freeze
- end
- end
-end
-
-class Module
- # Returns an ActiveSupport::ModelName object for module. It can be
- # used to retrieve all kinds of naming-related information.
- def model_name
- @model_name ||= ActiveSupport::ModelName.new(name)
- end
-end
diff --git a/activesupport/test/core_ext/module/model_naming_test.rb b/activesupport/test/core_ext/module/model_naming_test.rb
deleted file mode 100644
index 37119f378a..0000000000
--- a/activesupport/test/core_ext/module/model_naming_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/module/model_naming'
-
-class ModelNamingTest < Test::Unit::TestCase
- def setup
- @model_name = ActiveSupport::ModelName.new('Post::TrackBack')
- end
-
- def test_singular
- assert_equal 'post_track_back', @model_name.singular
- end
-
- def test_plural
- assert_equal 'post_track_backs', @model_name.plural
- end
-
- def test_element
- assert_equal 'track_back', @model_name.element
- end
-
- def test_collection
- assert_equal 'post/track_backs', @model_name.collection
- end
-
- def test_partial_path
- assert_equal 'post/track_backs/track_back', @model_name.partial_path
- end
-end