inflections 3.3.0 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963ae3a1b63118f9ef1e7126f4ef139b0defbf4b
-  data.tar.gz: 6cd643e148a42e3d5dfd0e672d0347c46f292db1
+  metadata.gz: e2acbe516c4c7093e03e0a6107d6ae84d2e08a10
+  data.tar.gz: a2a35cb0666b7c59731b860be9dbf8d8454ef188
 SHA512:
-  metadata.gz: b5ee812bbc4eaea06feea9d72714749713f11f5353b9c7dbea92d691d895bdd79d45a6988d383c2f9d0a23ff98473e6bc76bd6b5929691c77a4f9c3bdfdc66fe
-  data.tar.gz: 06b8d6cea38a213e3e8d718ab0d870b13900e4a9d2f74377dc89668936b69029ce83ae6abffdf9bff0dd9db5603e4ec20e82db8b08ce04c418dd939afae77391
+  metadata.gz: bfa96dfbda73265a7290fdd1db2404cb43e65f0e9a4ed52708314485a5d6585a65e4226d11f14bcd94f0f0e88e1588da01351e6b96d11ec346623e01ba13234d
+  data.tar.gz: a9cf7136d9bc73ceef4afdef06ae72b7c80cb78b9b39e155d2b82da121bf8a7eb9a2f040ab056da8ad24d10380396ec01deed6699a495da56c77af2061580afc

data/.travis.yml

@@ -1,8 +1,8 @@
 # See http://about.travis-ci.org/docs/user/languages/ruby/
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode
   - rbx-19mode
+

data/CHANGELOG.markdown

@@ -1,17 +1,5 @@
-3.2.12.20130314 (Current release)
-=================================
-* Support for French (thanks to [Olivier Laviale](https://github.com/olvlvl) of [ICanBoogie](https://github.com/ICanBoogie/Inflector))
-
-3.2.12.20130305
-===============
-* Fix #9 - a bug that was causing all strings to pluralize and singularize in Turkish.
-
-3.2.12
-======
-* Support for Turkish (thanks to [Ferhat Elmas](https://github.com/ferhatelmas))
-
-3.2.9.20121206
-==============
+3.2.9.20121206 (current version)
+================================
 * Support for Kazakh (thanks to [Galymzhan Kozhayev](https://github.com/galymzhan))
 
 3.2.9
@@ -20,7 +8,6 @@
 
 3.2.8
 =====
->>>>>>> 6a241a8... Update docs to reflect Kazakh support
 * Support for British English (thanks to [creativetags](https://github.com/creativetags))
 * Now versioning alongside ActiveSupport
 

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in inflections.gemspec
 gemspec

data/README.markdown

@@ -1,25 +1,17 @@
 # Inflections [![Build Status](https://secure.travis-ci.org/davidcelis/inflections.png)](http://travis-ci.org/davidcelis/inflections)
 
-Inflections is a repository containing non-English singularization and pluralization rules for Rails.
+This gem's purpose is twofold: to remove the cruft from ActiveSupport's inflections and provide a more sane set of defaults for Ruby/Rails applications in English while also providing default rules for other languages.
 
-## Languages Currently Supported
+At the time of this gem's publication, the English list of inflections in ActiveSupport is a mess. It is riddled with special cases such as a special pluralization rule for "octopus" and "virus", even though they follow a regular rule (as octopi and viri are disputed terms). Similar pluralization rules exist for "ox", "quiz", "mouse", "louse", etc.
 
-* English (en)
-* British English (en-GB)
-* Spanish (es)
-* French (fr)
-* Kazakh (kk)
-* Norwegian Bokmål (nb)
-* Turkish (tr)
-
-If you are fluent in a language not yet included in this gem, _please_ consider creating a list of inflections and submitting a pull request.
+Many of the special cases that ActiveSupport defines will not see the light of day in an application. Other rules exist that are actually gramatical exceptions, such as changing "f" to a "v" when encountered at the end of the word (which then requires even more rules to fix special words such as "drive", "safe", "hive", etc.). And, of course, who can forget the special pluralization of "cow" to the archaic term of Scottish origin, "kine" (the plural of "kye")?
 
 ## Installation
 
 Add the following to your application's Gemfile:
 
 ```ruby
-gem 'inflections', '~> 3.2'
+gem 'inflections'
 ```
 
 And then execute:
@@ -32,33 +24,42 @@ $ bundle
 
 ### Ruby on Rails
 
-If you're using Rails, you're done. The default inflections defined in ActiveSupport will be overwritten, and you can continue to define your own special cases in `config/intializers/inflections.rb`. I18n's default locale (set in `config/application.rb`) will determine which inflections are loaded. If you do not wish to use your default locale, you can require a locale manually in your Gemfile:
-
-```ruby
-gem 'inflections', require: 'inflections/es'
-```
-
-Note that this will override the default set of English rules that come with Rails. You should do this only if you plan on your constants and code itself not being in English. If you wish for your code itself to remain in English, it's recommended that you do not include this gem.
+If you're using Rails, you're done. The default inflections defined in ActiveSupport will be overwritten, and you can continue to define your own special cases in `config/intializers/inflections.rb`. I18n's default locale (set in `config/application.rb`) will determine which inflections are loaded.
 
 ### Otherwise
 
 Wherever you need 'em:
 
 ```ruby
-require 'inflections/es' # Replace 'es' with your preferred locale.
+require 'inflections/en' # Replace 'en' with your preferred locale.
 ```
 
-Define your own defaults as such:
+Define your own additional rules as such:
 
 ```ruby
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.singular /(phase)s$/i, '\1'
+  inflect.singular /(phase)s$/i, '\1' 
   inflect.plural /(shel|kni)fe/, '\1ves'
   inflect.irregular 'foot', 'feet'
   inflect.uncountable %w( money )
 end
 ```
 
+### Edge
+
+If you're using the edge version of ActiveSupport (4.0.0.beta), the multilingual Inflector will be supported. You can use each set of inflection rules without needing to require them or worry about conflicts between languages. Just point your Gemfile to this git repository; each locale's set of inflection rules will be kept separately and you can use any of them side-by-side. [Read more about the multilingual Inflector](http://davidcelis.com/blog/2012/07/31/edge-rails-a-multilingual-inflector/).
+
+## Languages Currently Supported
+
+* English (en)
+* British English (en-GB)
+* Spanish (es)
+* Kazakh (kk)
+* Norwegian Bokmål (nb)
+* Turkish (tr)
+
+If you are fluent in a language not yet included in this gem, _please_ consider creating a list of inflections and submitting a pull request.
+
 ## Contributing
 
 Please note that pull requests for already supported languages will only be accepted for rules that are in error or a potentially missed rule. If your change is an exception to an existing rule, that exception must occur _frequently_ and must involve words used more frequently than the regular plurals. If your change is an irregularity, it must be a word that is arguably _frequently_ encountered in applications that would use ActiveSupport. The default list of inflections is meant to be short.

data/Rakefile

@@ -4,14 +4,8 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 task :default => :test
-task :test do
-  Dir.glob('test/*_test.rb').each do |test_file|
-    ENV['TEST'] = test_file
-    Rake::Task['each_test'].execute
-  end
-end
 
-Rake::TestTask.new(:each_test) do |t|
+Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = Dir.glob('test/*_test.rb')
   t.verbose = true

data/inflections.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'
 
-  gem.add_dependency 'activesupport', '~> 3.2.0'
+  gem.add_dependency 'activesupport', '4.0.0.beta1'
 end

data/lib/inflections.rb

@@ -1 +1,6 @@
-require 'inflections/railtie' if defined?(Rails)
+require 'inflections/en'
+require 'inflections/en-GB'
+require 'inflections/es'
+require 'inflections/kk'
+require 'inflections/nb'
+require 'inflections/tr'

data/lib/inflections/en-GB.rb

@@ -0,0 +1,22 @@
+module Inflections
+  ActiveSupport::Inflector.inflections(:'en-GB') do |inflect|
+    inflect.clear
+
+    inflect.plural(/$/, 's')
+    inflect.plural(/([sxz]|[cs]h)$/i, '\1es')
+    inflect.plural(/([^aeiouy]o)$/i, '\1es')
+    inflect.plural(/([^aeiouy])y$/i, '\1ies')
+
+    inflect.singular(/s$/i, '')
+    inflect.singular(/(ss)$/i, '\1')
+    inflect.singular(/([sxz]|[cs]h)es$/, '\1')
+    inflect.singular(/([^aeiouy]o)es$/, '\1')
+    inflect.singular(/([^aeiouy])ies$/i, '\1y')
+
+    inflect.irregular('child', 'children')
+    inflect.irregular('person', 'people')
+    inflect.irregular('self', 'selves')
+
+    inflect.uncountable(%w(series))
+  end
+end

data/lib/inflections/en.rb

@@ -0,0 +1,22 @@
+module Inflections
+  ActiveSupport::Inflector.inflections(:en) do |inflect|
+    inflect.clear
+
+    inflect.plural(/$/, 's')
+    inflect.plural(/([sxz]|[cs]h)$/i, '\1es')
+    inflect.plural(/([^aeiouy]o)$/i, '\1es')
+    inflect.plural(/([^aeiouy])y$/i, '\1ies')
+
+    inflect.singular(/s$/i, '')
+    inflect.singular(/(ss)$/i, '\1')
+    inflect.singular(/([sxz]|[cs]h)es$/, '\1')
+    inflect.singular(/([^aeiouy]o)es$/, '\1')
+    inflect.singular(/([^aeiouy])ies$/i, '\1y')
+
+    inflect.irregular('child', 'children')
+    inflect.irregular('person', 'people')
+    inflect.irregular('self', 'selves')
+
+    inflect.uncountable(%w(series))
+  end
+end

data/lib/inflections/es.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Inflections
-  ActiveSupport::Inflector.inflections do |inflect|
+  ActiveSupport::Inflector.inflections(:es) do |inflect|
     inflect.clear
 
     inflect.plural(/$/, 's')

data/lib/inflections/kk.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Inflections
-  ActiveSupport::Inflector.inflections do |inflect|
+  ActiveSupport::Inflector.inflections(:kk) do |inflect|
     inflect.clear
 
     vowels = 'оұаыөүәіе'

data/lib/inflections/nb.rb

@@ -1,5 +1,5 @@
 module Inflections
-  ActiveSupport::Inflector.inflections do |inflect|
+  ActiveSupport::Inflector.inflections(:nb) do |inflect|
     inflect.clear
 
     inflect.plural(/$/, 'er')

data/lib/inflections/tr.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 module Inflections
-  ActiveSupport::Inflector.inflections do |inflect|
+  ActiveSupport::Inflector.inflections(:tr) do |inflect|
     inflect.clear
 
     inflect.plural(/([aoıu][^aoıueöiü]{,6})$/, '\1lar')

data/lib/inflections/version.rb

@@ -1,7 +1,8 @@
 module Inflections
-  MAJOR = 3
-  MINOR = 3
+  MAJOR = 4
+  MINOR = 0
   PATCH = 0
+  PRE   = 'beta1'
 
-  VERSION = [MAJOR, MINOR, PATCH].compact.join '.'
+  VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join '.'
 end

data/test/en-GB_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require 'inflections/en-GB'
+
+class TestEnglishInflections < MiniTest::Unit::TestCase
+  def test_regular_plurals
+    assert_equal 'dogs', 'dog'.pluralize(:'en-GB')
+    assert_equal 'dog', 'dogs'.singularize(:'en-GB')
+
+    assert_equal 'days', 'day'.pluralize(:'en-GB')
+    assert_equal 'day', 'days'.singularize(:'en-GB')
+
+    assert_equal 'tests', 'test'.pluralize(:'en-GB')
+    assert_equal 'test', 'tests'.singularize(:'en-GB')
+  end
+
+  def test_sibilant_sounds
+    assert_equal 'addresses', 'address'.pluralize(:'en-GB')
+    assert_equal 'address', 'addresses'.singularize(:'en-GB')
+
+    assert_equal 'phases', 'phase'.pluralize(:'en-GB')
+
+    assert_equal 'buzzes', 'buzz'.pluralize(:'en-GB')
+    assert_equal 'buzz', 'buzzes'.singularize(:'en-GB')
+
+    assert_equal 'boxes', 'box'.pluralize(:'en-GB')
+    assert_equal 'box', 'boxes'.singularize(:'en-GB')
+
+    assert_equal 'benches', 'bench'.pluralize(:'en-GB')
+    assert_equal 'bench', 'benches'.singularize(:'en-GB')
+
+    assert_equal 'dishes', 'dish'.pluralize(:'en-GB')
+    assert_equal 'dish', 'dishes'.singularize(:'en-GB')
+  end
+
+  def test_oes_rule
+    assert_equal 'heroes', 'hero'.pluralize(:'en-GB')
+    assert_equal 'hero', 'heroes'.singularize(:'en-GB')
+
+    assert_equal 'igloos', 'igloo'.pluralize(:'en-GB')
+    assert_equal 'igloo', 'igloos'.singularize(:'en-GB')
+  end
+
+  def test_ies_rule
+    assert_equal 'berries', 'berry'.pluralize(:'en-GB')
+    assert_equal 'berry', 'berries'.singularize(:'en-GB')
+
+    assert_equal 'days', 'day'.pluralize(:'en-GB')
+    assert_equal 'day', 'days'.singularize(:'en-GB')
+  end
+
+  def test_irregulars
+    assert_equal 'children', 'child'.pluralize(:'en-GB')
+    assert_equal 'child', 'children'.singularize(:'en-GB')
+
+    assert_equal 'people', 'person'.pluralize(:'en-GB')
+    assert_equal 'person', 'people'.singularize(:'en-GB')
+
+    assert_equal 'selves', 'self'.pluralize(:'en-GB')
+    assert_equal 'self', 'selves'.singularize(:'en-GB')
+  end
+
+  def test_uncountables
+    assert_equal 'series', 'series'.pluralize(:'en-GB')
+    assert_equal 'series', 'series'.singularize(:'en-GB')
+  end
+
+  def test_stupid_inflections_removed
+    assert_equal 'cows', 'cow'.pluralize(:'en-GB')
+  end
+end

data/test/en_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require 'inflections/en'
+
+class TestEnglishInflections < MiniTest::Unit::TestCase
+  def test_regular_plurals
+    assert_equal 'dogs', 'dog'.pluralize(:en)
+    assert_equal 'dog', 'dogs'.singularize(:en)
+
+    assert_equal 'days', 'day'.pluralize(:en)
+    assert_equal 'day', 'days'.singularize(:en)
+
+    assert_equal 'tests', 'test'.pluralize(:en)
+    assert_equal 'test', 'tests'.singularize(:en)
+  end
+
+  def test_sibilant_sounds
+    assert_equal 'addresses', 'address'.pluralize(:en)
+    assert_equal 'address', 'addresses'.singularize(:en)
+
+    assert_equal 'phases', 'phase'.pluralize(:en)
+
+    assert_equal 'buzzes', 'buzz'.pluralize(:en)
+    assert_equal 'buzz', 'buzzes'.singularize(:en)
+
+    assert_equal 'boxes', 'box'.pluralize(:en)
+    assert_equal 'box', 'boxes'.singularize(:en)
+
+    assert_equal 'benches', 'bench'.pluralize(:en)
+    assert_equal 'bench', 'benches'.singularize(:en)
+
+    assert_equal 'dishes', 'dish'.pluralize(:en)
+    assert_equal 'dish', 'dishes'.singularize(:en)
+  end
+
+  def test_oes_rule
+    assert_equal 'heroes', 'hero'.pluralize(:en)
+    assert_equal 'hero', 'heroes'.singularize(:en)
+
+    assert_equal 'igloos', 'igloo'.pluralize(:en)
+    assert_equal 'igloo', 'igloos'.singularize(:en)
+  end
+
+  def test_ies_rule
+    assert_equal 'berries', 'berry'.pluralize(:en)
+    assert_equal 'berry', 'berries'.singularize(:en)
+
+    assert_equal 'days', 'day'.pluralize(:en)
+    assert_equal 'day', 'days'.singularize(:en)
+  end
+
+  def test_irregulars
+    assert_equal 'children', 'child'.pluralize(:en)
+    assert_equal 'child', 'children'.singularize(:en)
+
+    assert_equal 'people', 'person'.pluralize(:en)
+    assert_equal 'person', 'people'.singularize(:en)
+
+    assert_equal 'selves', 'self'.pluralize(:en)
+    assert_equal 'self', 'selves'.singularize(:en)
+  end
+
+  def test_uncountables
+    assert_equal 'series', 'series'.pluralize(:en)
+    assert_equal 'series', 'series'.singularize(:en)
+  end
+
+  def test_stupid_inflections_removed
+    assert_equal 'cows', 'cow'.pluralize(:en)
+  end
+end

data/test/es_test.rb

@@ -5,31 +5,31 @@ require 'inflections/es'
 
 class TestSpanishInflections < MiniTest::Unit::TestCase
   def test_plurales_regulares
-    assert_equal 'libros', 'libro'.pluralize
-    assert_equal 'libro', 'libros'.singularize
+    assert_equal 'libros', 'libro'.pluralize(:es)
+    assert_equal 'libro', 'libros'.singularize(:es)
 
-    assert_equal 'radios', 'radio'.pluralize
-    assert_equal 'radio', 'radios'.singularize
+    assert_equal 'radios', 'radio'.pluralize(:es)
+    assert_equal 'radio', 'radios'.singularize(:es)
 
-    assert_equal 'señores', 'señor'.pluralize
-    assert_equal 'señor', 'señores'.singularize
+    assert_equal 'señores', 'señor'.pluralize(:es)
+    assert_equal 'señor', 'señores'.singularize(:es)
 
-    assert_equal 'leyes', 'ley'.pluralize
-    assert_equal 'ley', 'leyes'.singularize
+    assert_equal 'leyes', 'ley'.pluralize(:es)
+    assert_equal 'ley', 'leyes'.singularize(:es)
   end
 
   def test_plurales_que_terminar_en_z
-    assert_equal 'meces', 'mez'.pluralize
-    assert_equal 'luces', 'luz'.pluralize
+    assert_equal 'meces', 'mez'.pluralize(:es)
+    assert_equal 'luces', 'luz'.pluralize(:es)
   end
 
   def test_plurales_que_terminar_en_n_o_s_con_acentos
-    assert_equal 'aviones', 'avión'.pluralize
-    assert_equal 'intereses', 'interés'.pluralize
+    assert_equal 'aviones', 'avión'.pluralize(:es)
+    assert_equal 'intereses', 'interés'.pluralize(:es)
   end
 
   def test_plurales_irregulares
-    assert_equal 'los', 'el'.pluralize
-    assert_equal 'el', 'los'.singularize
+    assert_equal 'los', 'el'.pluralize(:es)
+    assert_equal 'el', 'los'.singularize(:es)
   end
 end

data/test/kk_test.rb

@@ -5,43 +5,43 @@ require 'inflections/kk'
 
 class TestKazakhInflections < MiniTest::Unit::TestCase
   def test_voiceless
-    assert_equal 'сабақтар', 'сабақ'.pluralize
-    assert_equal 'сабақ', 'сабақтар'.singularize
+    assert_equal 'сабақтар', 'сабақ'.pluralize(:kk)
+    assert_equal 'сабақ', 'сабақтар'.singularize(:kk)
 
-    assert_equal 'мектептер', 'мектеп'.pluralize
-    assert_equal 'мектеп', 'мектептер'.singularize
+    assert_equal 'мектептер', 'мектеп'.pluralize(:kk)
+    assert_equal 'мектеп', 'мектептер'.singularize(:kk)
   end
 
   def test_voiced
-    assert_equal 'қағаздар', 'қағаз'.pluralize
-    assert_equal 'қағаз', 'қағаздар'.singularize
+    assert_equal 'қағаздар', 'қағаз'.pluralize(:kk)
+    assert_equal 'қағаз', 'қағаздар'.singularize(:kk)
 
-    assert_equal 'кілемдер', 'кілем'.pluralize
-    assert_equal 'кілем', 'кілемдер'.singularize
+    assert_equal 'кілемдер', 'кілем'.pluralize(:kk)
+    assert_equal 'кілем', 'кілемдер'.singularize(:kk)
 
-    assert_equal 'гүлдер', 'гүл'.pluralize
-    assert_equal 'гүл', 'гүлдер'.singularize
+    assert_equal 'гүлдер', 'гүл'.pluralize(:kk)
+    assert_equal 'гүл', 'гүлдер'.singularize(:kk)
   end
 
   def test_sonor
-    assert_equal 'балалар', 'бала'.pluralize
-    assert_equal 'бала', 'балалар'.singularize
+    assert_equal 'балалар', 'бала'.pluralize(:kk)
+    assert_equal 'бала', 'балалар'.singularize(:kk)
 
-    assert_equal 'дәрігерлер', 'дәрігер'.pluralize
-    assert_equal 'дәрігер', 'дәрігерлер'.singularize
+    assert_equal 'дәрігерлер', 'дәрігер'.pluralize(:kk)
+    assert_equal 'дәрігер', 'дәрігерлер'.singularize(:kk)
 
-    assert_equal 'үйлер', 'үй'.pluralize
-    assert_equal 'үй', 'үйлер'.singularize
+    assert_equal 'үйлер', 'үй'.pluralize(:kk)
+    assert_equal 'үй', 'үйлер'.singularize(:kk)
 
-    assert_equal 'ескертулер', 'ескерту'.pluralize
-    assert_equal 'ескерту', 'ескертулер'.singularize
+    assert_equal 'ескертулер', 'ескерту'.pluralize(:kk)
+    assert_equal 'ескерту', 'ескертулер'.singularize(:kk)
 
-    assert_equal 'аурулар', 'ауру'.pluralize
-    assert_equal 'ауру', 'аурулар'.singularize
+    assert_equal 'аурулар', 'ауру'.pluralize(:kk)
+    assert_equal 'ауру', 'аурулар'.singularize(:kk)
   end
 
   def test_looks_like_plural
-    assert_equal 'дәптерлер', 'дәптер'.pluralize
-    assert_equal 'дәптер', 'дәптерлер'.singularize
+    assert_equal 'дәптерлер', 'дәптер'.pluralize(:kk)
+    assert_equal 'дәптер', 'дәптерлер'.singularize(:kk)
   end
 end

data/test/nb_test.rb

@@ -5,35 +5,35 @@ require 'inflections/nb'
 
 class TestNorwegianBokmalInflections < MiniTest::Unit::TestCase
   def test_svake_substantiv_er
-    assert_equal 'hunder', 'hund'.pluralize
-    assert_equal 'hund', 'hunder'.singularize
+    assert_equal 'hunder', 'hund'.pluralize(:nb)
+    assert_equal 'hund', 'hunder'.singularize(:nb)
 
-    assert_equal 'dager', 'dag'.pluralize
-    assert_equal 'dag', 'dager'.singularize
+    assert_equal 'dager', 'dag'.pluralize(:nb)
+    assert_equal 'dag', 'dager'.singularize(:nb)
 
-    assert_equal 'tester', 'test'.pluralize
-    assert_equal 'test', 'tester'.singularize
+    assert_equal 'tester', 'test'.pluralize(:nb)
+    assert_equal 'test', 'tester'.singularize(:nb)
   end
 
   def test_svake_substantiv_r
-    assert_equal 'lærere', 'lærer'.pluralize
-    assert_equal 'lærer', 'lærere'.singularize
+    assert_equal 'lærere', 'lærer'.pluralize(:nb)
+    assert_equal 'lærer', 'lærere'.singularize(:nb)
 
-    assert_equal 'kalendere', 'kalender'.pluralize
-    assert_equal 'kalender', 'kalendere'.singularize
+    assert_equal 'kalendere', 'kalender'.pluralize(:nb)
+    assert_equal 'kalender', 'kalendere'.singularize(:nb)
   end
 
   def test_svake_substantiv_e
-    assert_equal 'bakker', 'bakke'.pluralize
+    assert_equal 'bakker', 'bakke'.pluralize(:nb)
     # TODO: Fix this. How do we keep this form apart from "hunder"?
-    # assert_equal 'bakke', 'bakker'.singularize
+    # assert_equal 'bakke', 'bakker'.singularize(:nb)
 
-    assert_equal 'epler', 'eple'.pluralize
-    # assert_equal 'eple', 'epler'.singularize
+    assert_equal 'epler', 'eple'.pluralize(:nb)
+    # assert_equal 'eple', 'epler'.singularize(:nb)
   end
 
   def test_sterke_verb
-    assert_equal 'konti', 'konto'.pluralize
-    assert_equal 'konto', 'konti'.singularize
+    assert_equal 'konti', 'konto'.pluralize(:nb)
+    assert_equal 'konto', 'konti'.singularize(:nb)
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,3 @@
-$LOAD_PATH.unshift File.expand_path('../cases', __FILE__)
-
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'minitest/pride'
 require 'active_support/inflector'

data/test/tr_test.rb

@@ -5,33 +5,33 @@ require 'inflections/tr'
 
 class TestTurkishInflections < MiniTest::Unit::TestCase
   def test_regular_plurals
-    assert_equal 'günler', 'gün'.pluralize
-    assert_equal 'gün', 'günler'.singularize
+    assert_equal 'günler', 'gün'.pluralize(:tr)
+    assert_equal 'gün', 'günler'.singularize(:tr)
 
-    assert_equal 'kirazlar', 'kiraz'.pluralize
-    assert_equal 'kiraz', 'kirazlar'.singularize
+    assert_equal 'kirazlar', 'kiraz'.pluralize(:tr)
+    assert_equal 'kiraz', 'kirazlar'.singularize(:tr)
 
-    assert_equal 'kitaplar', 'kitap'.pluralize
-    assert_equal 'kitap', 'kitaplar'.singularize
+    assert_equal 'kitaplar', 'kitap'.pluralize(:tr)
+    assert_equal 'kitap', 'kitaplar'.singularize(:tr)
 
-    assert_equal 'köpekler', 'köpek'.pluralize
-    assert_equal 'köpek', 'köpekler'.singularize
+    assert_equal 'köpekler', 'köpek'.pluralize(:tr)
+    assert_equal 'köpek', 'köpekler'.singularize(:tr)
     
-    assert_equal 'testler', 'test'.pluralize
-    assert_equal 'test', 'testler'.singularize
+    assert_equal 'testler', 'test'.pluralize(:tr)
+    assert_equal 'test', 'testler'.singularize(:tr)
 
-    assert_equal 'üçgenler', 'üçgen'.pluralize
-    assert_equal 'üçgen', 'üçgenler'.singularize
+    assert_equal 'üçgenler', 'üçgen'.pluralize(:tr)
+    assert_equal 'üçgen', 'üçgenler'.singularize(:tr)
   end
 
   def test_irregulars
-    assert_equal 'biz', 'ben'.pluralize
-    assert_equal 'ben', 'biz'.singularize
+    assert_equal 'biz', 'ben'.pluralize(:tr)
+    assert_equal 'ben', 'biz'.singularize(:tr)
 
-    assert_equal 'siz', 'sen'.pluralize
-    assert_equal 'sen', 'siz'.singularize
+    assert_equal 'siz', 'sen'.pluralize(:tr)
+    assert_equal 'sen', 'siz'.singularize(:tr)
 
-    assert_equal 'o', 'onlar'.singularize
-    assert_equal 'onlar', 'o'.pluralize
+    assert_equal 'o', 'onlar'.singularize(:tr)
+    assert_equal 'onlar', 'o'.pluralize(:tr)
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: inflections
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0.beta1
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0.beta1
 description: A better set of singularization and pluralization rules for Ruby/Rails
   applications using ActiveSupport.
 email:
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE
@@ -69,15 +69,16 @@ files:
 - Rakefile
 - inflections.gemspec
 - lib/inflections.rb
+- lib/inflections/en-GB.rb
+- lib/inflections/en.rb
 - lib/inflections/es.rb
-- lib/inflections/fr.rb
 - lib/inflections/kk.rb
 - lib/inflections/nb.rb
-- lib/inflections/railtie.rb
 - lib/inflections/tr.rb
 - lib/inflections/version.rb
+- test/en-GB_test.rb
+- test/en_test.rb
 - test/es_test.rb
-- test/fr_test.rb
 - test/kk_test.rb
 - test/nb_test.rb
 - test/test_helper.rb
@@ -91,24 +92,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Sane inflection rules for ActiveSupport.
 test_files:
+- test/en-GB_test.rb
+- test/en_test.rb
 - test/es_test.rb
-- test/fr_test.rb
 - test/kk_test.rb
 - test/nb_test.rb
 - test/tr_test.rb
-has_rdoc: 

data/lib/inflections/fr.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-#
-# These rules come from a port of ActiveSupport's Inflector to PHP:
-# https://github.com/ICanBoogie/Inflector/blob/master/lib/inflections/fr.php
-
-module Inflections
-  ActiveSupport::Inflector.inflections do |inflect|
-    inflect.clear
-
-    inflect.plural(/$/, 's')
-    inflect.singular(/s$/, '')
-
-    inflect.plural(/(bijou|caillou|chou|genou|hibou|joujou|pou|au|eu|eau)$/, '\1x')
-    inflect.singular(/(bijou|caillou|chou|genou|hibou|joujou|pou|au|eu|eau)x$/, '\1')
-
-    inflect.plural(/(bleu|émeu|landau|lieu|pneu|sarrau)$/, '\1s')
-    inflect.plural(/al$/, 'aux')
-    inflect.plural(/ail$/, 'ails')
-    inflect.singular(/(journ|chev)aux$/, '\1al')
-    inflect.singular(/ails$/, 'ail')
-
-    inflect.plural(/(b|cor|ém|gemm|soupir|trav|vant|vitr)ail$/, '\1aux')
-    inflect.singular(/(b|cor|ém|gemm|soupir|trav|vant|vitr)aux$/, '\1ail')
-
-    inflect.plural(/(s|x|z)$/, '\1')
-
-    inflect.irregular('monsieur', 'messieurs')
-    inflect.irregular('madame', 'mesdames')
-    inflect.irregular('mademoiselle', 'mesdemoiselles')
-  end
-end

data/lib/inflections/railtie.rb

@@ -1,15 +0,0 @@
-module Inflections
-  class Railtie < Rails::Railtie
-    initializer 'inflections.require_inflections' do
-      begin
-        require "inflections/#{Rails.configuration.i18n.default_locale}"
-      rescue LoadError => e
-        if Rails.configuration.i18n.default_locale.nil?
-          warn "Inflections: no default locale set. Defaulting to English (en)."
-        else
-          warn "Inflections: no support for #{Rails.configuration.i18n.default_locale}. Defaulting to English (en)."
-        end
-      end
-    end
-  end
-end

data/test/fr_test.rb

@@ -1,67 +0,0 @@
-# encoding: utf-8
-
-require 'test_helper'
-require 'inflections/fr'
-
-class TestFrenchInflections < MiniTest::Unit::TestCase
-  def test_regular_plurals
-    assert_equal 'amis', 'ami'.pluralize
-    assert_equal 'ami', 'amis'.singularize
-
-    assert_equal 'fidèles', 'fidèle'.pluralize
-    assert_equal 'fidèle', 'fidèles'.singularize
-
-    assert_equal 'rapports', 'rapport'.pluralize
-    assert_equal 'rapport', 'rapports'.singularize
-  end
-
-  def test_appending_x
-    # -au
-    assert_equal 'tuyaux', 'tuyau'.pluralize
-    assert_equal 'tuyau', 'tuyaux'.singularize
-
-    # -ou
-    assert_equal 'genoux', 'genou'.pluralize
-    assert_equal 'genou', 'genoux'.singularize
-
-    # -eu
-    assert_equal 'aveux', 'aveu'.pluralize
-    assert_equal 'aveu', 'aveux'.singularize
-
-    # -eau
-    assert_equal 'nouveaux', 'nouveau'.pluralize
-    assert_equal 'nouveau', 'nouveaux'.singularize
-  end
-
-  def test_exceptions_to_appending_x
-    assert_equal 'bleus', 'bleu'.pluralize
-    assert_equal 'bleu', 'bleus'.singularize
-
-    assert_equal 'landaus', 'landau'.pluralize
-    assert_equal 'landau', 'landaus'.singularize
-
-    assert_equal 'genoux', 'genou'.pluralize
-    assert_equal 'genou', 'genoux'.singularize
-  end
-
-  def test_ending_in_al
-    assert_equal 'journaux', 'journal'.pluralize
-    assert_equal 'journal', 'journaux'.singularize
-  end
-
-  def test_ending_in_ail
-    assert_equal 'détails', 'détail'.pluralize
-    assert_equal 'détail', 'détails'.singularize
-  end
-
-  def test_exceptions_to_ending_in_ail
-    assert_equal 'travaux', 'travail'.pluralize
-    assert_equal 'travail', 'travaux'.singularize
-    
-    assert_equal 'baux', 'bail'.pluralize
-    assert_equal 'bail', 'baux'.singularize
-
-    assert_equal 'émaux', 'émail'.pluralize
-    assert_equal 'émail', 'émaux'.singularize
-  end
-end