mini_i18n 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba824b157c9dde80eaaaf9be9f5515d94e971e9
-  data.tar.gz: 5fbd8419e4aafde608285e00f202c15b15756a32
+  metadata.gz: e1535503921791b7c7660516aab9b224eda60883
+  data.tar.gz: 87d9b5f991ba9dca7da8310b2fc76d43b82a9100
 SHA512:
-  metadata.gz: 398e2a9136851a66f7436909d14977aa6983c6ea6f4fbcf554c39bffdd918cb544fdfb09a26557e97e5cf0001935618375b3f6d4a7c9d561ca8f78c77b406e17
-  data.tar.gz: 4e1ff97230966d61692d0f5ab334cb125914664f73c391eb554f909d8a34da22d30ea3b753d1bcc04f64190157b62ef9cb5fa0abdb5221eb6596f01b7d8bea57
+  metadata.gz: 58ba16e72dc2d6e2211999a89948490721f4ee23d7fc9781f913395bb2a44e80a21605ad0b8f7cb0c8be92d528ecf1fe0f46318a93935bfe23d67438904f2a3f
+  data.tar.gz: adf6f4cedaf7fc8b7c58179eb4e57a3b98a85cdc4269111b69411fcac45a0a9844d81cc4273ffff95e0b801cc035b9a6ea98fcb1e0a5c7862290636000b5d692

data/lib/mini_i18n/localization.rb

@@ -0,0 +1,74 @@
+require 'time'
+
+module MiniI18n
+  module Localization
+    extend self
+
+    DELIMITER_REGEX = /\d(?=(\d{3})+(?!\d))/
+    DAYS_MONTHS_REGEX = /%[aAbB]/
+
+    def localize(object, options = {})
+      case object
+      when Numeric
+        localize_number(object, options)
+      when Date
+        localize_datetime(object, options.merge(type: :date))
+      when Time, DateTime
+        localize_datetime(object, options.merge(type: :time))
+      when String
+        localize_string(object, options)
+      end
+    end
+    alias l localize
+
+    private
+
+    def localize_number(number, options)
+      locale = options[:locale]
+      delimiter = MiniI18n.t("number.format.delimiter", locale: locale)
+      separator = MiniI18n.t("number.format.separator", locale: locale)
+      integer, fractional = number.to_s.split(separator)
+
+      integer.to_s.gsub!(DELIMITER_REGEX) do |match|
+        "#{match}#{delimiter}"
+      end
+
+      number = [integer, fractional].compact.join(separator)
+
+      if as = options[:as]
+        number = MiniI18n.t("number.as.#{as}", number: number, locale: locale)
+      end
+
+      number
+    end
+
+    def localize_datetime(object, options)
+      locale = options[:locale]
+      type = options[:type]
+      format = MiniI18n.t("#{type}.formats.#{options[:format] || 'default'}", locale: locale)
+
+      format.gsub!(DAYS_MONTHS_REGEX) do |match|
+        {
+          '%a' => MiniI18n.t('date.abbr_day_names', locale: locale)[object.wday],
+          '%A' => MiniI18n.t('date.day_names', locale: locale)[object.wday],
+          '%b' => MiniI18n.t('date.abbr_month_names', locale: locale)[object.month - 1],
+          '%B' => MiniI18n.t('date.month_names', locale: locale)[object.month - 1]
+        }[match]
+      end
+
+      object.strftime(format)
+    end
+
+    def localize_string(string, options)
+      object = if options[:type] == :number || options[:as]
+        string.to_f
+      elsif options[:type] == :date
+        Date.parse(string) rescue nil
+      else
+        Time.parse(string) rescue nil
+      end
+
+      object && localize(object, options)
+    end
+  end
+end

data/lib/mini_i18n/utils.rb

@@ -8,10 +8,6 @@ module MiniI18n
       string
     end
 
-    def replace_with(array, old_elem, new_elem)
-      array.map { |elem| elem == old_elem ? new_elem : elem }
-    end
-
     def deep_merge(merge_to, merge_from)
       merged = merge_to.clone
 

data/lib/mini_i18n/version.rb

@@ -1,3 +1,3 @@
 module MiniI18n
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/mini_i18n.rb

@@ -1,9 +1,12 @@
 require "yaml"
 require "mini_i18n/version"
 require "mini_i18n/utils"
+require "mini_i18n/localization"
 
 module MiniI18n
   class << self
+    include Localization
+
     DEFAULT_LOCALE = :en
     SEPARATOR = '.'
 
@@ -48,14 +51,7 @@ module MiniI18n
     def load_translations(path)
       Dir[path.to_s].each do |file|
         YAML.load_file(file).each do |locale, new_translations|
-          locale = locale.to_s
-          @@available_locales << locale unless available_locale?(locale)
-
-          if translations[locale]
-            translations[locale] = Utils.deep_merge(translations[locale], new_translations)
-          else
-            translations[locale] = new_translations
-          end
+          add_translations(locale.to_s, new_translations)
         end
       end
     end
@@ -65,7 +61,6 @@ module MiniI18n
 
       _locale = available_locale?(options[:locale]) || locale
       scope = options[:scope]
-      count = options[:count]
 
       keys = [_locale.to_s]
       keys << scope.to_s.split(SEPARATOR) if scope
@@ -74,25 +69,9 @@ module MiniI18n
 
       result = lookup(*keys)
 
-      if fallbacks && result.empty?
-        keys = Utils.replace_with(keys, _locale, default_locale.to_s)
-        result = lookup(*keys)
-      end
-
-      if count && result.is_a?(Hash)
-        case count
-        when 0
-          result = result["zero"]
-        when 1
-          result = result["one"]
-        else
-          result = result["many"]
-        end
-      end
-
-      if result.respond_to?(:match) && result.match(/%{\w+}/)
-        result = Utils.interpolate(result, options)
-      end
+      result = with_fallbacks(result, keys)
+      result = with_pluralization(result, options)
+      result = with_interpolation(result, options)
 
       result || options[:default]
     end
@@ -116,5 +95,49 @@ module MiniI18n
     def lookup(*keys)
       translations.dig(*keys)
     end
+
+    def add_translations(locale, new_translations)
+      @@available_locales << locale unless available_locale?(locale)
+
+      if translations[locale]
+        translations[locale] = Utils.deep_merge(translations[locale], new_translations)
+      else
+        translations[locale] = new_translations
+      end
+    end
+
+    def with_fallbacks(result, keys)
+      if fallbacks && result.empty?
+        keys[0] = default_locale.to_s
+        result = lookup(*keys)
+      end
+
+      result
+    end
+
+    def with_pluralization(result, options)
+      count = options[:count]
+
+      if count && result.is_a?(Hash)
+        case count
+        when 0
+          result = result["zero"]
+        when 1
+          result = result["one"]
+        else
+          result = result["many"]
+        end
+      end
+
+      result
+    end
+
+    def with_interpolation(result, options)
+      if result.respond_to?(:match) && result.match(/%{\w+}/)
+        result = Utils.interpolate(result, options)
+      end
+
+      result
+    end
   end
 end

data/spec/fixtures/locales/localization.yml

@@ -0,0 +1,20 @@
+en:
+  date:
+    formats:
+      default: "%A %d, %B, %Y"
+      short: "%d %b %y"
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+    month_names: [January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+  time:
+    formats:
+      default: "%a %d, %B, %Y - %H:%M"
+      short: "%d %b %y - %H:%M"
+  number:
+    format:
+      delimiter: ','
+      separator: '.'
+    as:
+      currency: '%{number} $'
+      distance: 'Distance: %{number} miles'

data/spec/fixtures/locales/multiple.yml

@@ -10,6 +10,9 @@ es:
   bye: "adiós"
   second_level:
     hello: "hola 2"
+  number:
+    as:
+      currency: '%{number} €'
 
 fr:
   hello: "bonjour"

data/spec/localization_spec.rb

@@ -0,0 +1,49 @@
+RSpec.describe MiniI18n::Localization do
+  let(:time) { Time.new(2018, 8, 7, 22, 30) }
+
+  describe 'date' do
+    it 'accepts different formats' do
+      date = time.to_date
+      expect(MiniI18n.l(date)).to eq 'Tuesday 07, August, 2018'
+      expect(MiniI18n.l(date, format: :short)).to eq '07 Aug 18'
+    end
+  end
+
+  describe 'time' do
+    it 'accepts different formats' do
+      expect(MiniI18n.l(time)).to eq 'Tue 07, August, 2018 - 22:30'
+      expect(MiniI18n.l(time, format: :short)).to eq '07 Aug 18 - 22:30'
+    end
+  end
+
+  describe 'string' do
+    it 'accepts and defaults to time' do
+      time_string = time.to_s
+      expect(MiniI18n.l(time_string)).to eq 'Tue 07, August, 2018 - 22:30'
+      expect(MiniI18n.l(time_string, type: :time)).to eq 'Tue 07, August, 2018 - 22:30'
+    end
+
+    it 'to date' do
+      date_string = time.to_date.to_s
+      expect(MiniI18n.l(date_string, type: :date, format: :short)).to eq '07 Aug 18'
+    end
+
+    it 'to number' do
+      expect(MiniI18n.l("1000000", type: :number)).to eq '1,000,000.0'
+      expect(MiniI18n.l("1000000", as: :currency)).to eq '1,000,000.0 $'
+    end
+  end
+
+  describe 'number' do
+    it 'uses defined format' do
+      expect(MiniI18n.l(9000)).to eq '9,000'
+      expect(MiniI18n.l(9000.50)).to eq '9,000.5'
+    end
+
+    it 'as' do
+      expect(MiniI18n.l(9000, as: :currency)).to eq '9,000 $'
+      expect(MiniI18n.l(9000, as: :currency, locale: :es)).to eq '9000 €'
+      expect(MiniI18n.l(125.5, as: :distance)).to eq 'Distance: 125.5 miles'
+    end
+  end
+end

data/spec/mini_i18n_spec.rb

@@ -1,14 +1,4 @@
 RSpec.describe MiniI18n do
-  before(:all) do
-    MiniI18n.load_translations File.expand_path(__dir__ + '/fixtures/locales/*')
-  end
-
-  before(:each) do
-    MiniI18n.locale = :en
-    MiniI18n.fallbacks = false
-    MiniI18n.available_locales = [:en, :es, :fr]
-  end
-
   describe 'load_translations' do
     it "allows to load multiple locales and translations from different files" do
       expect(MiniI18n.available_locales).to eq ["en", "es", "fr"]
@@ -89,7 +79,7 @@ RSpec.describe MiniI18n do
     it "pluralization" do
       expect(MiniI18n.t('notifications', count: 0)).to eq 'no unread notifications'
       expect(MiniI18n.t('notifications', count: 1)).to eq '1 unread notification'
-      expect(MiniI18n.t('notifications', count: 2)).to eq '2 unread notifications'
+      expect(MiniI18n.t('notifications', count: 5)).to eq '5 unread notifications'
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,4 +3,14 @@ require "mini_i18n"
 RSpec.configure do |config|
   config.order = :rand
   config.disable_monkey_patching!
+
+  config.before(:suite) do
+    MiniI18n.load_translations File.expand_path(__dir__ + '/fixtures/locales/*')
+  end
+
+  config.before(:each) do
+    MiniI18n.locale = :en
+    MiniI18n.fallbacks = false
+    MiniI18n.available_locales = [:en, :es, :fr]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_i18n
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Minimalistic I18n library for Ruby. It supports localization, pluralization,
+  interpolations, fallbacks, nested keys and more.
 email:
 - srmarc.ai@gmail.com
 executables: []
@@ -74,10 +75,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mini_i18n.rb
+- lib/mini_i18n/localization.rb
 - lib/mini_i18n/utils.rb
 - lib/mini_i18n/version.rb
 - spec/fixtures/locales/en.yml
+- spec/fixtures/locales/localization.yml
 - spec/fixtures/locales/multiple.yml
+- spec/localization_spec.rb
 - spec/mini_i18n_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/markets/mini_i18n
@@ -106,6 +110,8 @@ specification_version: 4
 summary: Minimalistic I18n library for Ruby
 test_files:
 - spec/fixtures/locales/en.yml
+- spec/fixtures/locales/localization.yml
 - spec/fixtures/locales/multiple.yml
+- spec/localization_spec.rb
 - spec/mini_i18n_spec.rb
 - spec/spec_helper.rb