Changeset 6075

Timestamp:

01/28/07 15:52:45 (2 years ago)

Author:

bitsweat

Message:

Full test coverage for Inflector. Closes #7228.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/inflector.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/string_ext_test.rb (modified) (3 diffs)
• trunk/activesupport/test/inflector_test.rb (modified) (7 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Full test coverage for Inflector.  #7228 [Dan Kubb]
-
-* :db format for Date#to_s [Jeremy Kemper]

trunk/activesupport/lib/active_support/inflector.rb

@@ -244 +244 @@
-  #   "Class".constantize #=> Class
-  def constantize(camel_cased_word)
-^(::)?([A-Z]\w*)(::[A-Z]\w*)*$
+\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z
-      raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
-    end
-
-
-
+
-  end
-

trunk/activesupport/test/core_ext/string_ext_test.rb

@@ -17 +17 @@
-  end
-
+  def test_titleize
+    InflectorTest::MixtureToTitleCase.each do |before, titleized|
+      assert_equal(titleized, before.titleize)
+    end
+  end
+
-  def test_camelize
-    InflectorTest::CamelToUnderscore.each do |camel, underscore|
@@ -32 +38 @@
-  end
-
+  def test_underscore_to_lower_camel
+    InflectorTest::UnderscoreToLowerCamel.each do |underscored, lower_camel|
+      assert_equal(lower_camel, underscored.camelize(:lower))
+    end
+  end
+
-  def test_demodulize
-Inflector.demodulize("MyApplication::Billing::Account")
+"MyApplication::Billing::Account".demodulize
-  end
-
@@ -55 +67 @@
-    InflectorTest::ClassNameToTableName.each do |class_name, table_name|
-      assert_equal(class_name, table_name.classify)
+    end
+  end
+
+  def test_humanize
+    InflectorTest::UnderscoreToHuman.each do |underscore, human|
+      assert_equal(human, underscore.humanize)
-    end
-  end

trunk/activesupport/test/inflector_test.rb

@@ -71 +71 @@
-    "perspective" => "perspectives",
-
-
-
-
-
-
-
+         
+      
+    
+     
+      
+        
-    "information" => "information",
-
-
-
+  
+        
+     
-    "status_code" => "status_codes",
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+      
+
+      
+      
+    
+      
+      
+  
+
+     
+     
+
+       
+     
+     
+
+       
+       
+
+      
+      
+       
-  }
-
@@ -191 +191 @@
-    "104" => "104th",
-    "110" => "110th",
+    "111" => "111th",
+    "112" => "112th",
+    "113" => "113th",
-    "1000" => "1000th",
-    "1001" => "1001st"
@@ -201 +204 @@
-  }
-
+  Irregularities = {
+    'person' => 'people',
+    'man'    => 'men',
+    'child'  => 'children',
+    'sex'    => 'sexes',
+    'move'   => 'moves',
+  }
+
-  def test_pluralize_plurals
-    assert_equal "plurals", Inflector.pluralize("plurals")
@@ -220 +231 @@
-  end
-
-_cas
-'test_titlecase'
-_cas
+iz
+"test_titleize_#{before}"
+iz
-    end
-  end
@@ -286 +297 @@
-  end
-
+  def test_classify_with_leading_schema_name
+    assert_equal 'FooBar', Inflector.classify('schema.foo_bar')
+  end
+
-  def test_humanize
-    UnderscoreToHuman.each do |underscore, human|
@@ -293 +308 @@
-
-  def test_constantize
-equal Ace::Base::Case, Inflector.constantize("Ace::Base::Case")
-equal Ace::Base::Case, Inflector.constantize("::Ace::Base::Case")
-equal InflectorTest, Inflector.constantize("InflectorTest")
-equal InflectorTest, Inflector.constantize("::InflectorTest")
+nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("Ace::Base::Case") }
+nothing_raised { assert_equal Ace::Base::Case, Inflector.constantize("::Ace::Base::Case") }
+nothing_raised { assert_equal InflectorTest, Inflector.constantize("InflectorTest") }
+nothing_raised { assert_equal InflectorTest, Inflector.constantize("::InflectorTest") }
-    assert_raises(NameError) { Inflector.constantize("UnknownClass") }
-    assert_raises(NameError) { Inflector.constantize("An invalid string") }
+    assert_raises(NameError) { Inflector.constantize("InvalidClass\n") }
-  end
-
@@ -361 +377 @@
-    Inflector.inflections.instance_variable_set :@uncountables, cached_values[2]
-  end
+
+  Irregularities.each do |irregularity|
+    singular, plural = *irregularity
+    Inflector.inflections do |inflect|
+      define_method("test_irregularity_between_#{singular}_and_#{plural}") do
+        inflect.irregular(singular, plural)
+        assert_equal singular, Inflector.singularize(plural)
+        assert_equal plural, Inflector.pluralize(singular)
+      end
+    end
+  end
+
+  [ :all, [] ].each do |scope|
+    Inflector.inflections do |inflect|
+      define_method("test_clear_inflections_with_#{scope.kind_of?(Array) ? "no_arguments" : scope}") do
+        # save all the inflections
+        singulars, plurals, uncountables = inflect.singulars, inflect.plurals, inflect.uncountables
+
+        # clear all the inflections
+        inflect.clear(*scope)
+
+        assert_equal [], inflect.singulars
+        assert_equal [], inflect.plurals
+        assert_equal [], inflect.uncountables
+
+        # restore all the inflections
+        singulars.reverse.each { |singular| inflect.singular(*singular) }
+        plurals.reverse.each   { |plural|   inflect.plural(*plural) }
+        inflect.uncountable(uncountables)
+
+        assert_equal singulars, inflect.singulars
+        assert_equal plurals, inflect.plurals
+        assert_equal uncountables, inflect.uncountables
+      end
+    end
+  end
+
+  { :singulars => :singular, :plurals => :plural, :uncountables => :uncountable }.each do |scope, method|
+    Inflector.inflections do |inflect|
+      define_method("test_clear_inflections_with_#{scope}") do
+        # save the inflections
+        values = inflect.send(scope)
+
+        # clear the inflections
+        inflect.clear(scope)
+
+        assert_equal [], inflect.send(scope)
+
+        # restore the inflections
+        if scope == :uncountables
+          inflect.send(method, values)
+        else
+          values.reverse.each { |value| inflect.send(method, *value) }
+        end
+
+        assert_equal values, inflect.send(scope)
+      end
+    end
+  end
-end