r18n-core 2.2.0 → 3.0.0

data/lib/r18n-core/helpers.rb

@@ -1,21 +1,21 @@
-=begin
-Mixin with common methods.
+# frozen_string_literal: true
 
-Copyright (C) 2010 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# Mixin with common methods.
+#
+# Copyright (C) 2010 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module R18n
   # Useful aliases. Set I18n object before use them:

data/lib/r18n-core/i18n.rb

@@ -1,24 +1,23 @@
-=begin
-I18n support.
+# frozen_string_literal: true
 
-Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# I18n support.
+#
+# Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'date'
-require 'pathname'
 
 module R18n
   # General class to i18n support in your application. It load Translation and
@@ -103,7 +102,7 @@ module R18n
       locales = str.split(',')
       locales.map! do |locale|
         locale = locale.split ';q='
-        if 1 == locale.size
+        if locale.size == 1
           [locale[0], 1.0]
         else
           [locale[0], locale[1].to_f]
@@ -117,7 +116,7 @@ module R18n
     # argument.
     def self.convert_places(places)
       Array(places).map! do |loader|
-        if loader.respond_to? :available and loader.respond_to? :load
+        if loader.respond_to?(:available) && loader.respond_to?(:load)
           loader
         else
           R18n.default_loader.new(loader)
@@ -144,7 +143,7 @@ module R18n
     def initialize(locales, translation_places = nil, opts = {})
       locales = Array(locales)
 
-      if not locales.empty? and Locale.exists? locales.first
+      if !locales.empty? && Locale.exists?(locales.first)
         locales += Locale.load(locales.first).sublocales
       end
       locales << @@default
@@ -166,14 +165,15 @@ module R18n
 
       @translation_places = self.class.convert_places(@original_places)
 
-      if opts[:on_filters] or opts[:off_filters]
-        @filters = CustomFilterList.new(opts[:on_filters], opts[:off_filters])
-      else
-        @filters = GlobalFilterList.instance
-      end
+      @filters =
+        if opts[:on_filters] || opts[:off_filters]
+          CustomFilterList.new(opts[:on_filters], opts[:off_filters])
+        else
+          GlobalFilterList.instance
+        end
 
       key = translation_cache_key
-      if R18n.cache.has_key? key
+      if R18n.cache.key? key
         @locale, @translation = *R18n.cache[key]
       else
         reload!
@@ -187,8 +187,9 @@ module R18n
 
     # Return unique key for current locales in translation and places.
     def translation_cache_key
-      @available_codes ||= @translation_places.inject([]) { |all, i|
-        all + i.available }.uniq.map { |i| i.code.downcase }
+      @available_codes ||= @translation_places
+        .inject([]) { |all, i| all + i.available }
+        .uniq.map { |i| i.code.downcase }
       (@locales_codes & @available_codes).join(',') + '@' +
         @filters.hash.to_s + '_' +
         R18n.default_loader.hash.to_s + '_' +
@@ -202,18 +203,22 @@ module R18n
       @translation_places = self.class.convert_places(@original_places)
 
       available_in_places = @translation_places.map { |i| [i, i.available] }
-      available_in_extensions = R18n.extension_places.map {|i| [i, i.available]}
+      available_in_extensions =
+        R18n.extension_places.map { |i| [i, i.available] }
 
-      unless @locale
-        available_in_places.each do |place, available|
+      unless defined? @locale
+        # It's array!
+        # rubocop:disable Perfomance/HashEachMethods
+        available_in_places.each do |_place, available|
           @locales.each do |locale|
             if available.include? locale
               @locale = locale
               break
             end
           end
-          break if @locale
+          break if defined? @locale
         end
+        # rubocop:enable Perfomance/HashEachMethods
       end
       @locale ||= @locales.first
       unless @locale.supported?
@@ -228,17 +233,19 @@ module R18n
       @translation = Translation.new(@locale, '', filters: @filters)
       @locales.each do |locale|
         loaded = false
+
         available_in_places.each do |place, available|
           if available.include? locale
             @translation.merge! place.load(locale), locale
             loaded = true
           end
         end
-        if loaded
-          available_in_extensions.each do |extension, available|
-            if available.include? locale
-              @translation.merge! extension.load(locale), locale
-            end
+
+        next unless loaded
+
+        available_in_extensions.each do |extension, available|
+          if available.include? locale
+            @translation.merge! extension.load(locale), locale
           end
         end
       end
@@ -267,7 +274,7 @@ module R18n
     def localize(object, format = nil, *params)
       locale.localize(object, format, self, *params)
     end
-    alias :l :localize
+    alias l localize
 
     # Return translations.
     def t

data/lib/r18n-core/locale.rb

@@ -1,23 +1,22 @@
-=begin
-Locale to i18n support.
+# frozen_string_literal: true
+
+# Locale to i18n support.
+#
+# Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Copyright (C) 2008 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require 'pathname'
 require 'singleton'
 require 'bigdecimal'
 
@@ -55,7 +54,7 @@ module R18n
   # You can see more available data about locale in samples in
   # <tt>locales/</tt> dir.
   class Locale
-    LOCALES_DIR = Pathname(__FILE__).dirname.expand_path + '../../locales/'
+    LOCALES_DIR = File.join(__dir__, '..', '..', 'locales')
 
     @@loaded = {}
 
@@ -68,19 +67,19 @@ module R18n
 
     # Is +locale+ has info file.
     def self.exists?(locale)
-      File.exists?(File.join(LOCALES_DIR, locale.to_s + '.rb'))
+      File.exist?(File.join(LOCALES_DIR, "#{locale}.rb"))
     end
 
     # Load locale by RFC 3066 +code+.
     def self.load(code)
       original = code.to_s.gsub(/[^-_a-zA-Z]/, '')
-      code = original.gsub('_', '-').downcase
+      code = original.tr('_', '-').downcase
 
       @@loaded[code] ||= begin
         if exists? code
-          require LOCALES_DIR.join("#{code}.rb").to_s
-          name = code.gsub(/[\w\d]+/) { |i| i.capitalize }.gsub('-', '')
-          eval('R18n::Locales::' + name).new
+          require File.join(LOCALES_DIR, "#{code}.rb")
+          name = code.gsub(/\w+/, &:capitalize).delete('-')
+          R18n::Locales.const_get(name).new
         else
           UnsupportedLocale.new(original)
         end
@@ -111,7 +110,7 @@ module R18n
       lang.downcase + (culture ? '-' + culture.upcase : '')
     end
 
-    set sublocales:  %w{en},
+    set sublocales:  %w[en],
         week_start:  :monday,
         time_am:     'AM',
         time_pm:     'PM',
@@ -119,16 +118,26 @@ module R18n
         full_format: '%e %B',
         year_format: '_ %Y'
 
-    def month_standalone; month_names; end
-    def month_abbrs;      month_names; end
-    def wday_abbrs;       wday_names;  end
+    def month_standalone
+      month_names
+    end
+
+    def month_abbrs
+      month_names
+    end
+
+    def wday_abbrs
+      wday_names
+    end
 
     # Is locale has left-to-right write direction.
-    def ltr?; true; end
+    def ltr?
+      true
+    end
 
     # Is another locale has same code.
-    def ==(locale)
-      self.class == locale.class
+    def ==(other)
+      self.class == other.class
     end
 
     # Is locale has information file. In this class always return true.
@@ -156,13 +165,13 @@ module R18n
         format_float(obj.to_f)
       when Time, DateTime, Date
         return strftime(obj, format) if format.is_a? String
-        return month_standalone[obj.month - 1] if :month == format
-        return obj.to_s if :human == format and not params.first.is_a? I18n
+        return month_standalone[obj.month - 1] if format == :month
+        return obj.to_s if format == :human && !params.first.is_a?(I18n)
 
         type = obj.is_a?(Date) && !obj.is_a?(DateTime) ? 'date' : 'time'
-        format = :standard unless format
+        format ||= :standard
 
-        unless [:human, :full, :standard].include? format
+        unless %i[human full standard].include? format
           raise ArgumentError, "Unknown time formatter #{format}"
         end
 
@@ -176,7 +185,7 @@ module R18n
     # It will also put real typographic minus.
     def format_integer(integer)
       str = integer.to_s
-      str[0] = '−' if 0 > integer # Real typographic minus
+      str[0] = '−' if integer < 0 # Real typographic minus
       group = number_group
 
       str.gsub(/(\d)(?=(\d\d\d)+(?!\d))/) do |match|
@@ -188,7 +197,7 @@ module R18n
     # It will also put real typographic minus.
     def format_float(float)
       decimal = number_decimal
-      self.format_integer(float.to_i) + decimal + float.to_s.split('.').last
+      format_integer(float.to_i) + decimal + float.to_s.split('.').last
     end
 
     # Same that <tt>Time.strftime</tt>, but translate months and week days
@@ -197,20 +206,21 @@ module R18n
     def strftime(time, format)
       translated = ''
       format.scan(/%[EO]?.|./o) do |c|
-        case c.sub(/^%[EO]?(.)$/o, '%\\1')
-        when '%A'
-          translated << wday_names[time.wday]
-        when '%a'
-          translated << wday_abbrs[time.wday]
-        when '%B'
-          translated << month_names[time.month - 1]
-        when '%b'
-          translated << month_abbrs[time.month - 1]
-        when '%p'
-          translated << (time.hour < 12 ? time_am : time_pm)
-        else
-          translated << c
-        end
+        translated +=
+          case c.sub(/^%[EO]?(.)$/o, '%\\1')
+          when '%A'
+            wday_names[time.wday]
+          when '%a'
+            wday_abbrs[time.wday]
+          when '%B'
+            month_names[time.month - 1]
+          when '%b'
+            month_abbrs[time.month - 1]
+          when '%p'
+            time.hour < 12 ? time_am : time_pm
+          else
+            c
+          end
       end
       time.strftime(translated)
     end
@@ -223,42 +233,40 @@ module R18n
     # Format +time+ in human usable form. For example “5 minutes ago” or
     # “yesterday”. In +now+ you can set base time, which be used to get relative
     # time. For special cases you can replace it in locale’s class.
-    def format_time_human(time, i18n, now = Time.now, *params)
+    def format_time_human(time, i18n, now = Time.now, *_params)
       diff = time - now
       minutes = time.is_a?(DateTime) ? diff * 24 * 60.0 : diff / 60.0
       diff = minutes.abs
-      if (diff > 24 * 60) or (time.mday != now.mday and diff > 12 * 24)
+      if (diff > 24 * 60) || (time.mday != now.mday && diff > 12 * 24)
         format_time(format_date_human(time.to_date, i18n, now.to_date), time)
+      elsif minutes > -1 && minutes < 1
+        i18n.human_time.now
+      elsif minutes >= 60
+        i18n.human_time.after_hours((diff / 60.0).floor)
+      elsif minutes <= -60
+        i18n.human_time.hours_ago((diff / 60.0).floor)
+      elsif minutes > 0
+        i18n.human_time.after_minutes(minutes.round)
       else
-        if -1 < minutes and 1 > minutes
-          i18n.human_time.now
-        elsif 60 <= minutes
-          i18n.human_time.after_hours((diff / 60.0).floor)
-        elsif -60 >= minutes
-          i18n.human_time.hours_ago((diff / 60.0).floor)
-        elsif 0 < minutes
-          i18n.human_time.after_minutes(minutes.round)
-        else
-          i18n.human_time.minutes_ago(minutes.round.abs)
-        end
+        i18n.human_time.minutes_ago(minutes.round.abs)
       end
     end
 
     # Format +time+ in compact form. For example, “12/31/09 12:59”.
-    def format_time_standard(time, *params)
+    def format_time_standard(time, *_params)
       format_time(format_date_standard(time), time)
     end
 
     # Format +time+ in most official form. For example, “December 31st, 2009
     # 12:59”. For special cases you can replace it in locale’s class.
-    def format_time_full(time, *params)
+    def format_time_full(time, *_params)
       format_time(format_date_full(time), time)
     end
 
     # Format +date+ in human usable form. For example “5 days ago” or
     # “yesterday”. In +now+ you can set base time, which be used to get relative
     # time. For special cases you can replace it in locale’s class.
-    def format_date_human(date, i18n, now = Date.today, *params)
+    def format_date_human(date, i18n, now = Date.today, *_params)
       days = (date - now).to_i
       case days
       when -6..-2
@@ -277,14 +285,14 @@ module R18n
     end
 
     # Format +date+ in compact form. For example, “12/31/09”.
-    def format_date_standard(date, *params)
+    def format_date_standard(date, *_params)
       strftime(date, date_format)
     end
 
     # Format +date+ in most official form. For example, “December 31st, 2009”.
     # For special cases you can replace it in locale’s class. If +year+ is false
     # date will be without year.
-    def format_date_full(date, year = true, *params)
+    def format_date_full(date, year = true, *_params)
       format = full_format
       format = year_format.sub('_', format) if year
       strftime(date, format)
@@ -304,5 +312,6 @@ module R18n
     end
   end
 
+  # Namespace for Locale sub-classes
   module Locales; end
 end