inflections 3.2.7.20120803 → 3.2.8

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
-0.0.5 (current version)
+3.2.8 (current version)
 =======================
+* Support for British English (thanks to [creativetags](https://github.com/creativetags))
+* Now versioning alongside ActiveSupport
+
+0.0.5
+=====
 * Rails users no longer need to specify a locale to load; inflections are automagically loaded depending on `I18n.default_locale`
 
 0.0.4

data/README.markdown

@@ -38,7 +38,7 @@ Define your own defaults 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 )
@@ -48,6 +48,7 @@ end
 ## Languages Currently Supported
 
 * English (en)
+* British English (en-GB)
 * Spanish (es)
 
 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.

data/lib/inflections/en-GB.rb

@@ -0,0 +1,22 @@
+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/railtie.rb

@@ -1,10 +1,14 @@
 module Inflections
   class Railtie < Rails::Railtie
     begin
-      require "inflections/#{config.i18n.default_locale}"
+      config.to_prepare do
+        require "inflections/#{Rails.configuration.i18n.default_locale}"
+      end
     rescue LoadError => e
-      warn "Inflections currently does not support your default_locale. Defaulting to English (en)."
-      require 'inflections/en'
+      config.to_prepare do
+        warn "Inflections currently does not support #{Rails.configuration.i18n.default_locale}. Defaulting to English (en)."
+        require 'inflections/en'
+      end
     end
   end
 end

data/lib/inflections/version.rb

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

data/test/en-GB_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
+    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

@@ -18,10 +18,6 @@ class TestEnglishInflections < MiniTest::Unit::TestCase
     assert_equal 'address', 'addresses'.singularize
 
     assert_equal 'phases', 'phase'.pluralize
-    # Can't assume whether words that end with 'es' remove the 'es' or just 's'
-    # So I went with the case that seemed more reasonable given sibilant sounds
-    #
-    # assert_equal 'phase', 'phases'.singularize
 
     assert_equal 'buzzes', 'buzz'.pluralize
     assert_equal 'buzz', 'buzzes'.singularize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inflections
 version: !ruby/object:Gem::Version
-  version: 3.2.7.20120803
+  version: 3.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,10 +76,12 @@ files:
 - Rakefile
 - inflections.gemspec
 - lib/inflections.rb
+- lib/inflections/en-GB.rb
 - lib/inflections/en.rb
 - lib/inflections/es.rb
 - lib/inflections/railtie.rb
 - lib/inflections/version.rb
+- test/en-GB_test.rb
 - test/en_test.rb
 - test/es_test.rb
 - test/test_helper.rb
@@ -108,5 +110,6 @@ signing_key:
 specification_version: 3
 summary: Sane inflection rules for ActiveSupport.
 test_files:
+- test/en-GB_test.rb
 - test/en_test.rb
 - test/es_test.rb