Merge pull request #47 from fieldbook/criterion-criteria

Add special case for criterion/criteria

Author: ben-lin

lib/inflection.js

@@ -376,6 +376,7 @@
       geese     : new RegExp( '^geese$'                 , 'gi' ),
       quizzes   : new RegExp( '(quiz)zes$'              , 'gi' ),
       whereases : new RegExp( '^(whereas)es$'           , 'gi' ),
+      criteria  : new RegExp( '^(criteri)a$'            , 'gi' ),
       ss        : new RegExp( 'ss$'                     , 'gi' ),
       s         : new RegExp( 's$'                      , 'gi' )
     },
@@ -405,6 +406,7 @@
       goose   : new RegExp( '^goose$'               , 'gi' ),
       quiz    : new RegExp( '(quiz)$'               , 'gi' ),
       whereas : new RegExp( '^(whereas)$'           , 'gi' ),
+      criterion : new RegExp( '^(criteri)on$'       , 'gi' ),
       s       : new RegExp( 's$'                    , 'gi' ),
       common  : new RegExp( '$'                     , 'gi' )
     }
@@ -441,6 +443,7 @@
     [ regex.plural.geese     ],
     [ regex.plural.quizzes   ],
     [ regex.plural.whereases ],
+    [ regex.plural.criteria  ],
 
     // original rule
     [ regex.singular.man    , '$1en' ],
@@ -467,6 +470,7 @@
     [ regex.singular.goose  , 'geese' ],
     [ regex.singular.quiz   , '$1zes' ],
     [ regex.singular.whereas, '$1es' ],
+    [ regex.singular.criterion, '$1a' ],
 
     [ regex.singular.s     , 's' ],
     [ regex.singular.common, 's' ]
@@ -502,11 +506,13 @@
     [ regex.singular.goose   ],
     [ regex.singular.quiz    ],
     [ regex.singular.whereas ],
+    [ regex.singular.criterion ],
 
     // original rule
     [ regex.plural.men      , '$1an' ],
     [ regex.plural.people   , '$1rson' ],
     [ regex.plural.children , '$1' ],
+    [ regex.plural.criteria, '$1on'],
     [ regex.plural.tia      , '$1um' ],
     [ regex.plural.analyses , '$1$2sis' ],
     [ regex.plural.hives    , '$1ve' ],

test/inflection.js

@@ -45,6 +45,8 @@ describe( 'test .pluralize', function (){
     inflection.pluralize( 'matrix' ).should.equal( 'matrices' );
     inflection.pluralize( 'vertex' ).should.equal( 'vertices' );
     inflection.pluralize( 'canvas' ).should.equal( 'canvases' );
+    inflection.pluralize( 'criterion' ).should.equal( 'criteria' );
+    inflection.pluralize( 'criteria' ).should.equal( 'criteria' );
   });
 });
 
@@ -80,6 +82,8 @@ describe( 'test .singularize', function (){
     inflection.singularize( 'matrices' ).should.equal( 'matrix' );
     inflection.singularize( 'vertices' ).should.equal( 'vertex' );
     inflection.singularize( 'canvases' ).should.equal( 'canvas' );
+    inflection.singularize( 'criteria' ).should.equal( 'criterion' );
+    inflection.singularize( 'criterion' ).should.equal( 'criterion' );
 
   });
 });