ordinalize_full 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3aca4a46aa2509add50b4e3ccb3cc48c58059f
-  data.tar.gz: ff6d913c3efef11eb3f53fea9dea99fc553dedd5
+  metadata.gz: d4594f97093bb7853d4c0e15b7e5aa6bf72905ec
+  data.tar.gz: f9c7b05ae930ab830f1cc1a8ae3697eefc7bd768
 SHA512:
-  metadata.gz: 6942fb0227b949b39f4882e74932c39d1b47c46e98d6e9e60afb5494a6af86d13ae27a1516b6af62e3cc2093389b66881cb1bd7cd427c7d770b34e9f5a9d3576
-  data.tar.gz: f05e00a98fc180c0ac7f5730ced2de96cccdbcce36904e5aa1f0e3f7e0ff2b6ba659eae7f7fda136d1aea8a8bc101d0c88c90edd8ddfd53008aee756fe77e79c
+  metadata.gz: 36ad759eb60b6cc789ec181cd4b8a1641d7eaaabd7117b53fda9f00cea93c0dc0fff404c6b6f45d1f607ecfc28174e7af1619f5817ac43fb20f33e1f2f40f8ff
+  data.tar.gz: 61b6b76999c5bc5b2759e9664b91464059c5691038a0ef77d94e206511b0b804d5e9bc2a0b60657f04dc03609828bb2609488dbd004a91b5cf7f0f8f854bc6f1

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1
 notifications:
   email:

data/README.md

@@ -7,7 +7,7 @@ Features:
 - i18n support
 - doesn't monkey-patch
 - easy to integrate with Rails but doesn't require Rails
-- less than 25 lines of code
+- less than 50 lines of code
 
 ## Usage
 
@@ -19,9 +19,11 @@ require "ordinalize_full/integer"
 42.ordinalize_in_full #=> "forty second"
 42.ordinalize_full #=> "forty second"
 42.ordinalize(in_full: true) #=> "forty second"
+42.ordinalize #=> "42nd"
 
 I18n.locale = :fr
 42.ordinalize_in_full #=> "quarante-deuxième"
+42.ordinalize #=> "42ème"
 ```
 
 ### Without monkey-patching

data/lib/ordinalize_full.rb

@@ -4,18 +4,42 @@ module OrdinalizeFull
   I18n.load_path << Dir[File.join(__dir__, "ordinalize_full/locales/*.yml")]
 
   def ordinalize(in_full: false)
-    if in_full
-      self.ordinalize_in_full
-    else
-      require "active_support/inflector"
-      ActiveSupport::Inflector.ordinalize(self)
-    end
+    in_full ? ordinalize_in_full : ordinalize_in_short
   end
 
+  alias_method :ordinalize_full, \
   def ordinalize_in_full
-    I18n.t("ordinalize_full.n_#{self}")
+    begin
+      I18n.t("ordinalize_full.n_#{self}", throw: true)
+    rescue ArgumentError
+      raise NotImplementedError, "Unknown locale #{I18n.locale}"
+    end
   end
 
-  alias_method :ordinalize_full, :ordinalize_in_full
+private
+
+  def ordinalize_in_short
+    abs_number = self.to_i.abs
+
+    suffix = case I18n.locale
+    when :en
+      if (11..13).include?(abs_number % 100)
+        "th"
+      else
+        case abs_number % 10
+          when 1; "st"
+          when 2; "nd"
+          when 3; "rd"
+          else    "th"
+        end
+      end
+    when :fr
+      self == 1 ? "er" : "ème"
+    else
+      raise NotImplementedError, "Unknown locale #{I18n.locale}"
+    end
+
+    [self, suffix].join
+  end
 end
 

data/lib/ordinalize_full/integer.rb

@@ -1,6 +1,6 @@
 require "ordinalize_full"
 
 class Integer
-  include OrdinalizeFull
+  prepend OrdinalizeFull
 end
 

data/ordinalize_full.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "ordinalize_full"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Cédric Félizard"]
   spec.email         = ["cedric@felizard.fr"]
   spec.summary       = %q{Turns a number into an ordinal string such as first, second, third or 1st, 2nd, 3rd.}

data/spec/ordinalize_full_spec.rb

@@ -3,6 +3,8 @@ require "ordinalize_full/integer"
 describe OrdinalizeFull do
   describe "#ordinalize_in_full" do
     context "with the default locale (:en)" do
+      before { I18n.locale = :en }
+
       specify { expect(1.ordinalize_in_full).to eq("first") }
       specify { expect(42.ordinalize_in_full).to eq("forty second") }
     end
@@ -13,10 +15,36 @@ describe OrdinalizeFull do
       specify { expect(1.ordinalize_in_full).to eq("premier") }
       specify { expect(42.ordinalize_in_full).to eq("quarante-deuxième") }
     end
+
+    it "raises for unknown locales" do
+      I18n.locale = :zz
+      expect { 1.ordinalize_in_full }.to raise_error(NotImplementedError)
+    end
   end
 
   describe "#ordinalize_full" do
     specify { expect(1.ordinalize_full).to eq(1.ordinalize_in_full) }
   end
+
+  describe "#ordinalize" do
+    context "with the default locale (:en)" do
+      before { I18n.locale = :en }
+
+      specify { expect(1.ordinalize(in_full: true)).to eq("first") }
+      specify { expect(1.ordinalize(in_full: false)).to eq("1st") }
+    end
+
+    context "with locale = :fr" do
+      before { I18n.locale = :fr }
+
+      specify { expect(1.ordinalize(in_full: true)).to eq("premier") }
+      specify { expect(1.ordinalize(in_full: false)).to eq("1er") }
+    end
+
+    it "raises for unknown locales" do
+      I18n.locale = :zz
+      expect { 1.ordinalize(in_full: false) }.to raise_error(NotImplementedError)
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordinalize_full
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cédric Félizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n