From b4f4d038b9b240c2a388bbe3fbfb885170930f99 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 7 Dec 2004 11:15:41 +0000
Subject: Fixed the Inflector to handle the movie/movies pair correctly #261
 [Scott Baron]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@60 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/CHANGELOG                              | 2 ++
 activerecord/lib/active_record/support/inflector.rb | 1 +
 activerecord/test/inflector_test.rb                 | 1 +
 3 files changed, 4 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0b0c0048e9..e19c9e23fa 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *CVS*
 
+* Fixed the Inflector to handle the movie/movies pair correctly #261 [Scott Baron]
+
 * Added bind-style variable interpolation for the condition arrays that uses the adapter's quote method [Michael Koziarski]
 
   Before:
diff --git a/activerecord/lib/active_record/support/inflector.rb b/activerecord/lib/active_record/support/inflector.rb
index 05ff4fede9..b41f85188b 100644
--- a/activerecord/lib/active_record/support/inflector.rb
+++ b/activerecord/lib/active_record/support/inflector.rb
@@ -63,6 +63,7 @@ module Inflector
     def singular_rules #:doc:
       [
           [/(x|ch|ss)es$/, '\1'],
+          [/movies$/, 'movie'],
           [/([^aeiouy]|qu)ies$/, '\1y'],
           [/([lr])ves$/, '\1f'],
           [/([^f])ves$/, '\1fe'],
diff --git a/activerecord/test/inflector_test.rb b/activerecord/test/inflector_test.rb
index 4665558e74..e9684fc515 100644
--- a/activerecord/test/inflector_test.rb
+++ b/activerecord/test/inflector_test.rb
@@ -15,6 +15,7 @@ class InflectorTest < Test::Unit::TestCase
     "query"       => "queries",
     "ability"     => "abilities",
     "agency"      => "agencies",
+    "movie"       => "movies",
 
     "wife"        => "wives",
     "safe"        => "saves",
-- 
cgit v1.2.3