inflections 4.0.0.beta1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2acbe516c4c7093e03e0a6107d6ae84d2e08a10
-  data.tar.gz: a2a35cb0666b7c59731b860be9dbf8d8454ef188
+  metadata.gz: 3ac993d430f556418fbee44d79c1f5b11fc31653
+  data.tar.gz: d6b997e6d402a2beaf57cecc36ed9c3392b181a8
 SHA512:
-  metadata.gz: bfa96dfbda73265a7290fdd1db2404cb43e65f0e9a4ed52708314485a5d6585a65e4226d11f14bcd94f0f0e88e1588da01351e6b96d11ec346623e01ba13234d
-  data.tar.gz: a9cf7136d9bc73ceef4afdef06ae72b7c80cb78b9b39e155d2b82da121bf8a7eb9a2f040ab056da8ad24d10380396ec01deed6699a495da56c77af2061580afc
+  metadata.gz: b850277bbcbeadb2c51022f4587131d4808ce100d8ea2d6fd35889d71e9addeda4ffdf45d6a01c6bf68be2c25f86b2c9e38e13d99824cf738811187cfb0cb935
+  data.tar.gz: 1c1422da8bffccab323b8ae27f8a75f03ef74f42df3d41b260ad9c1a59b1e4382f1d1d27e345bb98b069c658016e53e895cbad054b2f8c991642bbfe022dde02

data/CHANGELOG.markdown

@@ -1,5 +1,17 @@
-3.2.9.20121206 (current version)
-================================
+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
+==============
 * Support for Kazakh (thanks to [Galymzhan Kozhayev](https://github.com/galymzhan))
 
 3.2.9

data/README.markdown

@@ -24,36 +24,46 @@ $ 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.
+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/en' # Replace 'en' with your preferred locale.
+require 'inflections'
+
+# Or require specific locales
+# require 'inflections/en'
+# require 'inflections/es'
 ```
 
 Define your own additional rules as such:
 
 ```ruby
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.singular /(phase)s$/i, '\1' 
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.singular /(phase)s$/i, '\1'
   inflect.plural /(shel|kni)fe/, '\1ves'
   inflect.irregular 'foot', 'feet'
-  inflect.uncountable %w( money )
+  inflect.uncountable %w[money fish]
 end
 ```
 
-### Edge
+# Rails < 4.0.0
+
+If you're not using ActiveSupport 4.0, the multilingual Inflector won't be supported. You'll have to choose which locale you use. [Read more about the multilingual Inflector](http://davidcelis.com/blog/2012/07/31/edge-rails-a-multilingual-inflector/).
 
-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/).
+```ruby
+# Require the old version and choose your locale
+gem 'inflections', '~> 3.2', require: 'inflections/en'
+```
 
 ## Languages Currently Supported
 
 * English (en)
 * British English (en-GB)
 * Spanish (es)
+* French (fr)
 * Kazakh (kk)
 * Norwegian Bokmål (nb)
 * Turkish (tr)

data/lib/inflections.rb

@@ -1,6 +1,7 @@
 require 'inflections/en'
 require 'inflections/en-GB'
 require 'inflections/es'
+require 'inflections/fr'
 require 'inflections/kk'
 require 'inflections/nb'
-require 'inflections/tr'
+require 'inflections/tr'

data/lib/inflections/fr.rb

@@ -0,0 +1,31 @@
+# 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(:fr) 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/version.rb

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

data/test/fr_test.rb

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

data/test/test_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inflections
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,7 @@ files:
 - 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/tr.rb
@@ -79,6 +80,7 @@ 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/test_helper.rb
@@ -97,12 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sane inflection rules for ActiveSupport.
@@ -110,6 +112,8 @@ 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: