inflections 3.2.12.20130314 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5293b97cee4b290687b85d5d702f262e371603f
-  data.tar.gz: f597126bf476f1e315086b9f53b0fcfe501b7d06
+  metadata.gz: 963ae3a1b63118f9ef1e7126f4ef139b0defbf4b
+  data.tar.gz: 6cd643e148a42e3d5dfd0e672d0347c46f292db1
 SHA512:
-  metadata.gz: fc17556b22722943c30ed8ede6bee2861d4a677b17e833cbdb04b73f3c77dcbf38071f37a5cf970af6568f684add62e14f0f6b73071a06da446409c1e8f919cb
-  data.tar.gz: 3701cd02320031edfdc91ebf9602db393ebbf03461b32b40c5ce3ded3a9cba511d43bb47097106f74f350c81563d9cf2d1019980e63acf5dd791e9e460860616
+  metadata.gz: b5ee812bbc4eaea06feea9d72714749713f11f5353b9c7dbea92d691d895bdd79d45a6988d383c2f9d0a23ff98473e6bc76bd6b5929691c77a4f9c3bdfdc66fe
+  data.tar.gz: 06b8d6cea38a213e3e8d718ab0d870b13900e4a9d2f74377dc89668936b69029ce83ae6abffdf9bff0dd9db5603e4ec20e82db8b08ce04c418dd939afae77391

data/README.markdown

@@ -1,17 +1,25 @@
 # Inflections [![Build Status](https://secure.travis-ci.org/davidcelis/inflections.png)](http://travis-ci.org/davidcelis/inflections)
 
-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.
+Inflections is a repository containing non-English singularization and pluralization rules for Rails.
 
-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.
+## Languages Currently Supported
+
+* English (en)
+* British English (en-GB)
+* Spanish (es)
+* French (fr)
+* Kazakh (kk)
+* Norwegian Bokmål (nb)
+* Turkish (tr)
 
-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")?
+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.
 
 ## Installation
 
 Add the following to your application's Gemfile:
 
 ```ruby
-gem 'inflections'
+gem 'inflections', '~> 3.2'
 ```
 
 And then execute:
@@ -27,15 +35,17 @@ $ bundle
 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/en'
+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.
+
 ### Otherwise
 
 Wherever you need 'em:
 
 ```ruby
-require 'inflections/en' # Replace 'en' with your preferred locale.
+require 'inflections/es' # Replace 'es' with your preferred locale.
 ```
 
 Define your own defaults as such:
@@ -49,18 +59,6 @@ ActiveSupport::Inflector.inflections do |inflect|
 end
 ```
 
-## Languages Currently Supported
-
-* 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.
-
 ## 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/lib/inflections/es.rb

@@ -3,7 +3,7 @@
 module Inflections
   ActiveSupport::Inflector.inflections do |inflect|
     inflect.clear
-    
+
     inflect.plural(/$/, 's')
     inflect.plural(/([^aeéiou])$/i, '\1es')
     inflect.plural(/([aeiou]s)$/i, '\1')
@@ -16,7 +16,7 @@ module Inflections
 
     inflect.singular(/s$/, '')
     inflect.singular(/es$/, '')
-    
+
     inflect.irregular('el', 'los')
   end
 end

data/lib/inflections/railtie.rb

@@ -8,7 +8,6 @@ module Inflections
           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)."
-          require 'inflections/en'
         end
       end
     end

data/lib/inflections/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: inflections
 version: !ruby/object:Gem::Version
-  version: 3.2.12.20130314
+  version: 3.3.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2015-06-18 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: A better set of singularization and pluralization rules for Ruby/Rails
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - LICENSE
@@ -69,8 +69,6 @@ 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
@@ -78,8 +76,6 @@ files:
 - 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
@@ -95,23 +91,21 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 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

data/lib/inflections/en-GB.rb

@@ -1,22 +0,0 @@
-module Inflections
-  ActiveSupport::Inflector.inflections 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

@@ -1,22 +0,0 @@
-module Inflections
-  ActiveSupport::Inflector.inflections 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/test/en-GB_test.rb

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

data/test/en_test.rb

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