amount_inflector 1.0.0 → 2.0.0

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem "rspec-rails", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
+  gem "rcov", ">= 0"
 end

data/README.md

@@ -1,8 +1,8 @@
 Amount Inflector
 ================
-This is one of those things that are kinda cool but it never seems to be enough time to implement it. The basic idea is engine that will enable you to have amounts of certain units "humanized" in your native language.
+Small gem for pluralizing year/month/week/day words in Croatian. 
 
-In English it is quite simple:
+In English it is straightforward:
 
 ```
 1 week
@@ -20,6 +20,8 @@ In some other language it is not as simple, for example "week" in Croatian:
 5 tjedana....
 ```
 
+It turns out in Croatian it is dependable on trailing digits, and rather simple (3 lines rule).
+
 Usage
 ----------
 
@@ -33,70 +35,34 @@ And then:
 
 ```
 bundle
-
-rails g amount_inflector:install
-```
-
-In your view:
-```ruby
-  = AmountInflector.new(77, :godina) #=> 77 godina
 ```
 
-Tweaking
------------
-As for now only Croatian year/month/week/day is supported(config/locales/amount_inflections.yml)
+In your code
 
+```ruby
+AmountInflector.inflect(77, :godina).to_s #=> 77 godina
 ```
-godina: 
-  default:  godina
-  2:        godine
-  3:        godine
-  4:        godine
-  12:       godina
-  13:       godina
-  14:       godina
-mjesec:
-  default: mjeseci
-  1:       mjesec
-  2:       mjeseca
-  3:       mjeseca
-  4:       mjeseca
-  11:      mjeseci
-  12:      mjeseci
-  13:      mjeseci
-  14:      mjeseci
-tjedan: 
-  default: tjedana
-  1:       tjedan
-  2:       tjedna
-  3:       tjedna
-  4:       tjedna
-  11:      tjedana
-  12:      tjedana
-  13:      tjedana
-  14:      tjedana
-dan: 
-  default: dana 
-  1:       dan
-  11:      dana
-```
-
-If you have 2011 months for example (mjesec) the algorithm is:
-
-* Check for 2011 in inflections
-* Check for 011 in inflections
-* Check for 11 in inflections => match it is "2011 mjeseci"
 
+Is It For Me?
+--------------
+This is basically reimplementation of stuff I18n provides with :one, :few and :many
 
-If you have 77 years for example (godina) the algorithm is:
+[Example for Polish](http://dev.netizer.pl/rails-i18n-and-zero-one-two-few-many-other.html)
 
-* Check for 77 in inflections
-* Check for 7 in inflections
-* Check for :default in inflections => match it is "7 godina"
+```ruby
+# config/locales/pluralization.rb
+I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+{
+:pl => {:'i18n.plural.rule' => lambda { |n| n == 1 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : :other }},
+}
+```
+<blockquote>
+Only usage would be if you prefer not to use the whole I18n machinery for this simple task.
+</blockquote>
 
-Is It For Me?
---------------
-I have a suspicion that Croatian model might work quite well for some other languages. Anyways if you have some exceptions but not that many and if they tend to depend on "trailing digits" then amount_inflector is a right way to go.
+Tweaking
+----------
+Everything is in a sigle file (pluralization rules and translations) in lib/amount_inflector/amount_inflector.rb. That is the whole point, one small file for that.
 
 Contributing to amount_inflector
 ---------------------------------

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/amount_inflector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "amount_inflector"
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kresimir Bojcic"]
-  s.date = "2012-01-06"
+  s.date = "2012-01-08"
   s.description = "Amount Inflector for year/month/week/day (Croatian)"
   s.email = "kresimir.bojcic@gmail.com"
   s.extra_rdoc_files = [
@@ -25,12 +25,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "amount_inflector.gemspec",
-    "app/config/locales/amount_inflections.yml",
     "lib/amount_inflector.rb",
     "lib/amount_inflector/amount_inflector.rb",
-    "lib/generators/amount_inflector/USAGE",
-    "lib/generators/amount_inflector/install_generator.rb",
-    "lib/generators/amount_inflector/templates/amount_inflections.yml",
     "spec/amount_inflector_spec.rb"
   ]
   s.homepage = "http://github.com/drKreso/amount_inflector"
@@ -46,15 +42,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rspec-rails>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec-rails>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/amount_inflector/amount_inflector.rb

@@ -1,29 +1,22 @@
-require 'yaml'
-
 class AmountInflector
-  INFLECTIONS_CONFIG = 'app/config/locales/amount_inflections.yml'
-
-  def initialize(amount, unit, inflections=nil)
-    @amount = amount
-    @unit_inflections = (inflections.nil? ? load_from_yaml_config : inflections)[unit.to_s]
-    raise "Inflection :#{unit} is unsupported" if @unit_inflections.nil?
-    raise "No default inflection for :#{unit}" if @unit_inflections["default"].nil?
-  end
 
-  # first non nil match wins, there is guaranteed to be at least one (default)
-  def inflected
-    trailing_digits.map { |key| @unit_inflections[key] }.compact[0]
-  end
+  AMOUNT_CONFIG = {
+     :godina => { one:"godina", few:"godine",  many:"godina" },
+     :mjesec => { one:"mjesec", few:"mjeseca", many:"mjeseci" },
+     :tjedan => { one:"tjedan", few:"tjedna",  many:"tjedana" },
+     :dan =>    { one:"dan",    few:"dana",    many:"dana"}
+  }
 
-  # for example 211 result is [211,11,1,"default"]
-  def trailing_digits
-    (amount_length.downto 1).map { |n| @amount % 10**n } << "default"
+  def self.inflect(amount, unit)
+    unit_inflections = AMOUNT_CONFIG[unit]
+    raise "Inflection :#{unit} is unsupported" if unit_inflections.nil?
+    "#{amount} #{unit_inflections[pluralize_rule(amount)]}"
   end
 
-  def load_from_yaml_config
-    YAML::load(File.open(File.expand_path(INFLECTIONS_CONFIG)))
+  def self.pluralize_rule(n)
+    return :many if (11..14).include?(n % 100)
+    return :few if (2..4).include?(n % 10)
+    (n % 10) == 1 ? :one : :many
   end
 
-  def to_s() "#@amount #{inflected}" end
-  def amount_length() @amount.to_s.length end
 end

data/spec/amount_inflector_spec.rb

@@ -3,117 +3,91 @@ require_relative '../lib/amount_inflector.rb'
 describe AmountInflector do
 
   it 'should say 1 godina' do
-    trajanje = AmountInflector.new(1, :godina)
-    trajanje.to_s.should == "1 godina"
+    AmountInflector.inflect(1, :godina).should == "1 godina"
   end
 
   it 'should say 2 godine' do
-    trajanje = AmountInflector.new(2, :godina)
-    trajanje.to_s.should == "2 godine"
+    AmountInflector.inflect(2, :godina).should == "2 godine"
   end
 
   it 'should say 92 godine' do
-    trajanje = AmountInflector.new(92, :godina)
-    trajanje.to_s.should == "92 godine"
+    AmountInflector.inflect(92, :godina).should == "92 godine"
   end
 
   it 'should say 12 godina' do
-    trajanje = AmountInflector.new(12, :godina)
-    trajanje.to_s.should == "12 godina"
+    AmountInflector.inflect(12, :godina).should == "12 godina"
   end
 
   it 'should say 2012 godina' do
-    trajanje = AmountInflector.new(2012, :godina)
-    trajanje.to_s.should == "2012 godina"
+    AmountInflector.inflect(2012, :godina).should == "2012 godina"
   end
 
   it 'should say 5 godina' do
-    trajanje = AmountInflector.new(5, :godina)
-    trajanje.to_s.should == "5 godina"
+    AmountInflector.inflect(5, :godina).should == "5 godina"
   end
 
   it 'should say 1 tjedan' do
-    trajanje = AmountInflector.new(1, :tjedan)
-    trajanje.to_s.should == "1 tjedan"
+    AmountInflector.inflect(1, :tjedan).should == "1 tjedan"
   end
 
   it 'should say 5 tjedana' do
-    trajanje = AmountInflector.new(5, :tjedan)
-    trajanje.to_s.should == "5 tjedana"
+    AmountInflector.inflect(5, :tjedan).should == "5 tjedana"
   end
 
   it 'should say 11 tjedana' do
-    trajanje = AmountInflector.new(11, :tjedan)
-    trajanje.to_s.should == "11 tjedana"
+    AmountInflector.inflect(11, :tjedan).should == "11 tjedana"
   end
 
   it 'should sayl 55 tjedana' do
-    trajanje = AmountInflector.new(55, :tjedan)
-    trajanje.to_s.should == "55 tjedana"
+    AmountInflector.inflect(55, :tjedan).should == "55 tjedana"
   end
 
   it 'should say 3 tjedna' do
-    trajanje = AmountInflector.new(3, :tjedan)
-    trajanje.to_s.should == "3 tjedna"
+    AmountInflector.inflect(3, :tjedan).should == "3 tjedna"
   end
 
   it 'should sayl 53 tjedana' do
-    trajanje = AmountInflector.new(53, :tjedan)
-    trajanje.to_s.should == "53 tjedna"
+    AmountInflector.inflect(53, :tjedan).should == "53 tjedna"
   end
 
   it 'should say 4 tjedna' do
-    trajanje = AmountInflector.new(4, :tjedan)
-    trajanje.to_s.should == "4 tjedna"
+    AmountInflector.inflect(4, :tjedan).should == "4 tjedna"
   end
 
   it 'should say 50 tjedana' do
-    trajanje = AmountInflector.new(50, :tjedan)
-    trajanje.to_s.should == "50 tjedana"
+    AmountInflector.inflect(50, :tjedan).should == "50 tjedana"
   end
 
   it 'should say 1 dan' do
-    trajanje = AmountInflector.new(1, :dan)
-    trajanje.to_s.should == "1 dan"
+    AmountInflector.inflect(1, :dan).should == "1 dan"
   end
 
   it 'should say 2 dana' do
-    trajanje = AmountInflector.new(2, :dan)
-    trajanje.to_s.should == "2 dana"
+    AmountInflector.inflect(2, :dan).should == "2 dana"
   end
 
   it 'should say 3 dana' do
-    trajanje = AmountInflector.new(3, :dan)
-    trajanje.to_s.should == "3 dana"
+    AmountInflector.inflect(3, :dan).should == "3 dana"
   end
 
   it 'should say 11 dana' do
-    trajanje = AmountInflector.new(11, :dan)
-    trajanje.to_s.should == "11 dana"
+    AmountInflector.inflect(11, :dan).should == "11 dana"
   end
 
   it 'should say 12 dana' do
-    trajanje = AmountInflector.new(12, :dan)
-    trajanje.to_s.should == "12 dana"
+    AmountInflector.inflect(12, :dan).should == "12 dana"
   end
 
   it 'should say 13 dana' do
-    trajanje = AmountInflector.new(13, :dan)
-    trajanje.to_s.should == "13 dana"
+    AmountInflector.inflect(13, :dan).should == "13 dana"
   end
 
   it 'should say 21 dan' do
-    trajanje = AmountInflector.new(21, :dan)
-    trajanje.to_s.should == "21 dan"
+    AmountInflector.inflect(21, :dan).should == "21 dan"
   end
 
   it 'should raise for unknows inflection 1 danas' do
-    ->{ trajanje = AmountInflector.new(1, :danas) }.should raise_error 'Inflection :danas is unsupported'
-  end
-
-  it 'should raise for no default 2 erorr_no_default_dan' do
-    errors_in_inflections = { "error_no_default_dan" => { 1 => :dan, 2 => :dana } } 
-    ->{ trajanje = AmountInflector.new(1, :error_no_default_dan, errors_in_inflections) }.should raise_error 'No default inflection for :error_no_default_dan'
+    ->{ trajanje = AmountInflector.inflect(1, :danas) }.should raise_error 'Inflection :danas is unsupported'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amount_inflector
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70187527724260 !ruby/object:Gem::Requirement
+  requirement: &70092400470100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70187527724260
+  version_requirements: *70092400470100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70187527723500 !ruby/object:Gem::Requirement
+  requirement: &70092400469140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70187527723500
+  version_requirements: *70092400469140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70187527722720 !ruby/object:Gem::Requirement
+  requirement: &70092400468280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,18 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70187527722720
+  version_requirements: *70092400468280
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70092400467300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70092400467300
 description: Amount Inflector for year/month/week/day (Croatian)
 email: kresimir.bojcic@gmail.com
 executables: []
@@ -60,12 +71,8 @@ files:
 - Rakefile
 - VERSION
 - amount_inflector.gemspec
-- app/config/locales/amount_inflections.yml
 - lib/amount_inflector.rb
 - lib/amount_inflector/amount_inflector.rb
-- lib/generators/amount_inflector/USAGE
-- lib/generators/amount_inflector/install_generator.rb
-- lib/generators/amount_inflector/templates/amount_inflections.yml
 - spec/amount_inflector_spec.rb
 homepage: http://github.com/drKreso/amount_inflector
 licenses:
@@ -82,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -409522429409563961
+      hash: 2255724437978588266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/config/locales/amount_inflections.yml

@@ -1,44 +0,0 @@
-#As for now only Croatian year/month/week/day is supported
-#If you have 2011 months for example (mjesec) the alhorithm is:
-#
-#* Check for 2011 in inflections
-#* Check for 011 in inflections
-#* Check for 11 in inflections => match it is "2011 mjeseci"
-#
-#If you have 77 years for example (godina) the alhorithm is:
-#
-#* Check for 77 in inflections
-#* Check for 7 in inflections
-#* Check for :default in inflections => match it is "7 godina"
-godina: 
-  default:  godina
-  2:        godine
-  3:        godine
-  4:        godine
-  12:       godina
-  13:       godina
-  14:       godina
-mjesec:
-  default: mjeseci
-  1:       mjesec
-  2:       mjeseca
-  3:       mjeseca
-  4:       mjeseca
-  11:      mjeseci
-  12:      mjeseci
-  13:      mjeseci
-  14:      mjeseci
-tjedan: 
-  default: tjedana
-  1:       tjedan
-  2:       tjedna
-  3:       tjedna
-  4:       tjedna
-  11:      tjedana
-  12:      tjedana
-  13:      tjedana
-  14:      tjedana
-dan: 
-  default: dana 
-  1:       dan
-  11:      dana

data/lib/generators/amount_inflector/USAGE

@@ -1 +0,0 @@
-Copy inflections config to config/locales/amount_inflections.yml

data/lib/generators/amount_inflector/install_generator.rb

@@ -1,12 +0,0 @@
-require 'rails/generators'
-
-class AmountInflector
-  class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-
-    def copy_default_inflections
-      copy_file 'amount_inflections.yml', 'app/config/locales/amount_inflections.yml'
-    end
-
-  end
-end

data/lib/generators/amount_inflector/templates/amount_inflections.yml

@@ -1,44 +0,0 @@
-#As for now only Croatian year/month/week/day is supported
-#If you have 2011 months for example (mjesec) the alhorithm is:
-#
-#* Check for 2011 in inflections
-#* Check for 011 in inflections
-#* Check for 11 in inflections => match it is "2011 mjeseci"
-#
-#If you have 77 years for example (godina) the alhorithm is:
-#
-#* Check for 77 in inflections
-#* Check for 7 in inflections
-#* Check for :default in inflections => match it is "7 godina"
-godina: 
-  default:  godina
-  2:        godine
-  3:        godine
-  4:        godine
-  12:       godina
-  13:       godina
-  14:       godina
-mjesec:
-  default: mjeseci
-  1:       mjesec
-  2:       mjeseca
-  3:       mjeseca
-  4:       mjeseca
-  11:      mjeseci
-  12:      mjeseci
-  13:      mjeseci
-  14:      mjeseci
-tjedan: 
-  default: tjedana
-  1:       tjedan
-  2:       tjedna
-  3:       tjedna
-  4:       tjedna
-  11:      tjedana
-  12:      tjedana
-  13:      tjedana
-  14:      tjedana
-dan: 
-  default: dana 
-  1:       dan
-  11:      dana