Changeset 2690

Timestamp:

10/19/05 20:20:11 (3 years ago)

Author:

marcel

Message:

Add title case method to String to do, e.g., 'action_web_service'.titlecase # => 'Action Web Service'.

Files:

• trunk/activesupport/CHANGELOG (modified) (2 diffs)
• trunk/activesupport/lib/active_support/core_ext/string/inflections.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/inflector.rb (modified) (1 diff)
• trunk/activesupport/test/inflector_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ +1 @@
+* Add title case method to String to do, e.g., 'action_web_service'.titlecase #  => 'Action Web Service'. [Marcel Molina Jr.]
+
-*1.2.1* (October 19th, 2005)
-
@@ -4 +6 @@
-
-* Show all framework frames in the framework trace. [Nicholas Seckar]
-
-
-*1.2.0* (October 16th, 2005)

trunk/activesupport/lib/active_support/core_ext/string/inflections.rb

@@ -16 +16 @@
-          Inflector.camelize(self)
-        end
+        alias_method :camelcase, :camelize
+
+        def titleize
+          Inflector.titleize(self)
+        end
+        alias_method :titlecase, :titleize
-
-        def underscore

trunk/activesupport/lib/active_support/inflector.rb

@@ -113 +113 @@
-    lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
-  end
+
+  def titleize(word)
+    humanize(underscore(word)).gsub(/\b([a-z])/) { $1.capitalize }
+  end
-  
-  def underscore(camel_cased_word)

trunk/activesupport/test/inflector_test.rb

@@ -145 +145 @@
-    "employee_id"     => "Employee",
-    "underground"     => "Underground"
+  }
+
+  MixtureToTitleCase = {
+    'active_record'       => 'Active Record',
+    'ActiveRecord'        => 'Active Record',
+    'action web service'  => 'Action Web Service',
+    'Action Web Service'  => 'Action Web Service',
+    'Action web service'  => 'Action Web Service',
+    'actionwebservice'    => 'Actionwebservice',
+    'Actionwebservice'    => 'Actionwebservice'
-  }
-
@@ -197 +207 @@
-  end
-
+  MixtureToTitleCase.each do |before, title_cased|
+    define_method 'test_titlecase' do
+      assert_equal(title_cased, Inflector.titleize(before))
+    end
+  end
+
-  def test_camelize
-    CamelToUnderscore.each do |camel, underscore|