Changeset 6022

Timestamp:

01/23/07 05:32:08 (2 years ago)

Author:

rick

Message:

Added test coverage for Inflector.inflections.clear. Closes #7179. [Rich Collins]. Remove unused code from Duration#inspect. Closes #7180. [Rich Collins]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/duration.rb (modified) (1 diff)
• trunk/activesupport/test/inflector_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Remove unused code from Duration#inspect.  Closes #7180.  [Rich Collins]
+
+* Added test coverage for Inflector.inflections.clear.  Closes #7179. [Rich Collins]
+
+* ActiveSupport::Multibyte::Handlers::UTF8Handler should raise when a range and an integer are passed in (just like the native implementation).  Closes #7176 [Rich Collins]
-
-* A couple extra tests for #classify.  Closes #7273. [Josh Susser]

trunk/activesupport/lib/active_support/duration.rb

@@ -56 +56 @@
-    def inspect #:nodoc:
-      consolidated = parts.inject(Hash.new(0)) { |h,part| h[part.first] += part.last; h }
-hours, :
+
-        n = consolidated[length]
-        "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?

trunk/activesupport/test/inflector_test.rb

@@ -328 +328 @@
-    end
-  end
+  
+  %w{plurals singulars uncountables}.each do |inflection_type|
+    class_eval "
+      def test_clear_#{inflection_type}
+        cached_values = Inflector.inflections.#{inflection_type}
+        Inflector.inflections.clear :#{inflection_type}
+        assert Inflector.inflections.#{inflection_type}.empty?, \"#{inflection_type} inflections should be empty after clear :#{inflection_type}\"
+        Inflector.inflections.instance_variable_set :@#{inflection_type}, cached_values
+      end
+    "
+  end
+  
+  def test_clear_all
+    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
+    Inflector.inflections.clear :all
+    assert Inflector.inflections.plurals.empty?
+    assert Inflector.inflections.singulars.empty?
+    assert Inflector.inflections.uncountables.empty?
+    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+  end
+  
+  def test_clear_with_default
+    cached_values = Inflector.inflections.plurals, Inflector.inflections.singulars, Inflector.inflections.uncountables
+    Inflector.inflections.clear
+    assert Inflector.inflections.plurals.empty?
+    assert Inflector.inflections.singulars.empty?
+    assert Inflector.inflections.uncountables.empty?
+    Inflector.inflections.instance_variable_set :@plurals, cached_values[0]
+    Inflector.inflections.instance_variable_set :@singulars, cached_values[1]
+    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
+  end
-end