Ticket #6989: humanize_inflections_rev3.diff

activesupport/test/inflector_test.rb

@@ -306 +306 @@
-    end
-  end
-
+  def test_humanize_by_rule
+    Inflector.inflections do |inflect|
+      inflect.human(/_cnt$/i, '\1_count')
+      inflect.human(/^prefx_/i, '\1')
+    end
+    assert_equal("Jargon count", Inflector.humanize("jargon_cnt"))
+    assert_equal("Request", Inflector.humanize("prefx_request"))
+  end
+
+  def test_humanize_by_string
+    Inflector.inflections do |inflect|
+      inflect.human("col_rpted_bugs" => "Reported bugs")
+    end
+    assert_equal("Reported bugs", Inflector.humanize("col_rpted_bugs"))
+    assert_equal("Col rpted bugs", Inflector.humanize("COL_rpted_bugs"))
+  end
+
+  def test_clear_humans
+    Inflector.inflections do |inflect|
+      inflect.human("test","clear")
+    end
+    assert_equal("clear", "test".humanize)
+    Inflector.inflections.clear(:humans)
+    assert_equal("Test","test".humanize)
+  end
+
-  def test_constantize
-    assert_nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("Ace::Base::Case") }
-    assert_nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("::Ace::Base::Case") }

activesupport/lib/active_support/inflector.rb

@@ -22 +22 @@
-  class Inflections
-    include Singleton
-
-
+, :humans, :human_strings
-
-    def initialize
- = [], [], []
+, @humans, @human_strings = [], [], [], [], {}
-    end
-
-    # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression.
@@ -61 +61 @@
-      (@uncountables << words).flatten!
-    end
-
+    # Specifies a humanized form of a string by a regular expression rule or by a string mapping.
+    # When using a regular expression based replacement, the normal humanize formatting is called after the replacement.
+    # When a string is used, the human form should be specified as desired (example: 'The name', not 'the_name')
+    #
+    # Examples:
+    #   human /_cnt$/i, '\1_count'
+    #   human "legacy_col_person_name", "Name"
+    #   human "strt_dt" => "Start date",
+    #         "upd_dt"  => "Updated date"
+    def human(first, last = nil)
+      case first
+        when Hash
+          @human_strings.merge!(first)
+        when String
+          @human_strings[first] = last
+        else
+          @humans.insert(0, [first, last])
+      end
+    end
+
-    # Clears the loaded inflections within a given scope (default is :all). Give the scope as a symbol of the inflection type,
-
+, :humans
-    #
-    # Examples:
-    #   clear :all
@@ -70 +90 @@
-    def clear(scope = :all)
-      case scope
-        when :all
- = [], [], []
+, @humans, @human_strings = [], [], [], [], {}
-        else
-          instance_variable_set "@#{scope}", []
+          @human_strings = {} if scope == :humans
-      end
-    end
-  end
@@ -188 +209 @@
-  #   "employee_salary" #=> "Employee salary"
-  #   "author_id" #=> "Author"
-  def humanize(lower_case_and_underscored_word)
-
+
+
+
+
+
+
+
-  end
-
-  # Removes the module part from the expression in the string