fast_gettext 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e2843e35fbde82280e708ad953d0e2e4db2046c401f228d8f80b2c678eb149
-  data.tar.gz: 300f5b287b2398b0706f79050eca58556c16ee54f8f8b88ab504c8f417cc8b3a
+  metadata.gz: 2add114a98a74b14ab732ccee6fbe25e0298c6d766f166ae7656304ff1bb29d7
+  data.tar.gz: aaee771bc595d542e3954da371d3cb661a2b6d7f4b38ed1d5b71ab9909fda919
 SHA512:
-  metadata.gz: 7a0c08120aa700cb08721d646e6665d2a124ec560306e5464af1b7ba8eb966225f1ae582328b56e6d74dc0354dc7d09046244a0587c6d08ad9a5845254965a1c
-  data.tar.gz: 754482e2e9301da6aa510b7d6005074fd94c7aec9d195a29b4a5dfa97822c37cf82022ff8f4d13dabe4364982ff7e284734e51b114f1aa27e99a65b6d756bcf4
+  metadata.gz: 5df7240d2fa1f5e42e8e552358dd3ba2e564edb837e22d9e64380d3c08404b1d1c4d5cd93d3c4da2546934d430474746cf475393936b7500a727e52ff625fe48
+  data.tar.gz: 58c342df8b8fba16c25003d5b8126984556acf8fd9c0bab9ae8393fa1d7e111c5b5bd3360fd562342da0985c81da3965a8998af79a5c670e55b577e4a7eb268b

data/CHANGELOG

@@ -1,3 +1,4 @@
+4.2.0 -- cache pluralisation rule
 4.1.0 -- drop EOL rubies + add racc dependency
 4.0.0 -- Remove String#% hack that would make it not blow up when using invalid keys, can temporarily restore with `FastGettext.allow_invalid_keys!`
 3.1.0 -- Work with frozen strings

data/lib/fast_gettext/mo_file.rb

@@ -25,17 +25,12 @@ module FastGettext
       split_plurals(self[msgids * PLURAL_SEPARATOR].to_s)
     end
 
+    # n_() asks for this on every call: read from the header and compiled the
+    # first time, then kept (nil when the file has none).
     def pluralisation_rule
-      # gettext uses 0 as default rule, which would turn off all pluralisation, very clever...
-      # additionally parsing fails when directly accessing po files, so this line was taken from gettext/mofile
-      (data[''] || '').split("\n").each do |line|
-        if /^Plural-Forms:\s*nplurals\s*\=\s*(\d*);\s*plural\s*\=\s*([^;]*)\n?/ =~ line
-          return ->(n) do # rubocop:disable Lint/UnusedBlockArgument
-            eval($2) # rubocop:disable Security/Eval
-          end
-        end
-      end
-      nil
+      return @pluralisation_rule if defined?(@pluralisation_rule)
+
+      @pluralisation_rule = read_pluralisation_rule
     end
 
     def data
@@ -44,11 +39,28 @@ module FastGettext
     end
 
     def self.empty
-      @empty ||= MoFile.new(File.join(__dir__, 'vendor', 'empty.mo'), eager_load: true).freeze
+      @empty ||= begin
+        empty = MoFile.new(File.join(__dir__, 'vendor', 'empty.mo'), eager_load: true)
+        # pluralisation_rule keeps what it computed in an instance variable, which
+        # it can't set once the object is frozen: compute it first
+        empty.pluralisation_rule
+        empty.freeze
+      end
     end
 
     private
 
+    def read_pluralisation_rule
+      # gettext uses 0 as default rule, which would turn off all pluralisation, very clever...
+      # additionally parsing fails when directly accessing po files, so this line was taken from gettext/mofile
+      (data[''] || '').split("\n").each do |line|
+        if /^Plural-Forms:\s*nplurals\s*=\s*(\d*);\s*plural\s*=\s*([^;]*)\n?/ =~ line
+          return eval("->(n) { #{$2} }", nil, __FILE__, __LINE__) # rubocop:disable Security/Eval
+        end
+      end
+      nil
+    end
+
     def load_data
       @data =
         if @filename.is_a? FastGettext::GetText::MOFile

data/lib/fast_gettext/storage.rb

@@ -63,7 +63,9 @@ module FastGettext
     # if overwritten by user( FastGettext.pluralisation_rule = xxx) use it,
     # otherwise fall back to repo or to default lambda
     def pluralisation_rule
-      Thread.current[:fast_gettext_pluralisation_rule] || current_repository.pluralisation_rule || DEFAULT_PLURALIZATION_RULE
+      Thread.current[:fast_gettext_pluralisation_rule] ||
+        current_repository.pluralisation_rule ||
+        DEFAULT_PLURALIZATION_RULE
     end
 
     def cache
@@ -72,7 +74,7 @@ module FastGettext
 
     def reload!
       cache.reload!
-      translation_repositories.values.each(&:reload)
+      translation_repositories.each_value(&:reload)
     end
 
     # global, since re-parsing whole folders takes too much time...
@@ -94,7 +96,7 @@ module FastGettext
     end
 
     def cached_plural_find(*keys)
-      key = '||||' + keys * '||||'
+      key = "||||#{keys * '||||'}"
       cache.fetch(key) { current_repository.plural(*keys) }
     end
 
@@ -134,7 +136,8 @@ module FastGettext
     # IE6/7 de
     # nil if nothing matches
     def best_locale_in(locales)
-      formatted_sorted_locales(locales).each do |candidate|
+      candidates = plain_locale(locales) || formatted_sorted_locales(locales)
+      candidates.each do |candidate|
         return candidate unless available_locales
         return candidate if available_locales.include?(candidate)
         return candidate[0..1] if available_locales.include?(candidate[0..1]) # available locales include a langauge
@@ -160,9 +163,21 @@ module FastGettext
 
     private
 
+    # A single locale already in the de / de_DE form, as set_locale gets it on
+    # every I18n.locale= or with_locale (gettext_i18n_rails): parsing it as
+    # an Accept-Language header would give the same one candidate.
+    PLAIN_LOCALE = /\A[a-z]{2,3}(?:_[A-Z]{2,3})?\z/
+    private_constant :PLAIN_LOCALE
+
+    def plain_locale(locale)
+      locale = locale.name if locale.is_a?(Symbol)
+      [locale.dup] if locale.is_a?(String) && PLAIN_LOCALE.match?(locale)
+    end
+
     # de-de,DE-CH;q=0.9 -> ['de_DE','de_CH']
     def formatted_sorted_locales(locales)
-      found = weighted_locales(locales).reject(&:empty?).sort_by(&:last).reverse # sort them by weight which is the last entry
+      # sort them by weight which is the last entry
+      found = weighted_locales(locales).reject(&:empty?).sort_by(&:last).reverse
       found.flatten.map { |l| format_locale(l) }
     end
 
@@ -173,7 +188,7 @@ module FastGettext
       found = [[]]
       locales.split(',').each do |part|
         if part.include? ';q=' # contains language and weight ?
-          found.last << part.split(/;q=/)
+          found.last << part.split(';q=')
           found.last.flatten!
           found << []
         else
@@ -185,7 +200,7 @@ module FastGettext
 
     # de-de -> de_DE
     def format_locale(locale)
-      locale.sub(/^([a-zA-Z]{2,3})[-_]([a-zA-Z]{2,3})$/) { $1.downcase + '_' + $2.upcase }
+      locale.sub(/^([a-zA-Z]{2,3})[-_]([a-zA-Z]{2,3})$/) { "#{$1.downcase}_#{$2.upcase}" }
     end
 
     def switch_cache

data/lib/fast_gettext/translation.rb

@@ -2,7 +2,7 @@
 
 module FastGettext
   TRANSLATION_METHODS = [:_, :n_, :s_, :p_, :ns_, :np_].freeze
-  NIL_BLOCK = -> { nil }
+  NIL_BLOCK = -> {}
 
   # this module should be included
   # Responsibility:
@@ -90,6 +90,7 @@ module FastGettext
 
   module TranslationAliased
     include Translation
+
     TRANSLATION_METHODS.each { |m| alias_method "#{m.to_s.delete('_')}gettext", m }
   end
 

data/lib/fast_gettext/translation_repository/db_models/translation_key.rb

@@ -8,7 +8,9 @@ class TranslationKey < ActiveRecord::Base
   validates_uniqueness_of :key
   validates_presence_of :key
 
-  attr_accessible :key, :translations, :translations_attributes if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+  if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+    attr_accessible :key, :translations, :translations_attributes
+  end
 
   before_save :normalize_newlines
 
@@ -20,13 +22,11 @@ class TranslationKey < ActiveRecord::Base
   end
 
   def self.available_locales
-    @available_locales ||= begin
-      if ActiveRecord::VERSION::MAJOR >= 3
-        TranslationText.group(:locale).count
-      else
-        TranslationText.count(group: :locale)
-      end.keys.sort
-    end
+    @available_locales ||= if ActiveRecord::VERSION::MAJOR >= 3
+                             TranslationText.group(:locale).count
+                           else
+                             TranslationText.count(group: :locale)
+                           end.keys.sort
   end
 
   def self.newline_normalize(string)

data/lib/fast_gettext/translation_repository/db_models/translation_text.rb

@@ -4,7 +4,9 @@ class TranslationText < ActiveRecord::Base
   belongs_to :translation_key, class_name: 'TranslationKey'
   validates_presence_of :locale
   validates_uniqueness_of :locale, scope: :translation_key_id
-  attr_accessible :text, :locale, :translation_key, :translation_key_id if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+  if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+    attr_accessible :text, :locale, :translation_key, :translation_key_id
+  end
   after_update :expire_cache
 
   protected

data/lib/fast_gettext/translation_repository/merge.rb

@@ -11,7 +11,7 @@ module FastGettext
     class Merge < Base
       def initialize(name, options = {})
         clear
-        super(name, options)
+        super
         options.fetch(:chain, []).each do |repo|
           add_repo(repo)
         end

data/lib/fast_gettext/translation_repository/yaml.rb

@@ -24,12 +24,14 @@ module FastGettext
         end
       end
 
+      # n_() asks for this on every call: each rule is compiled once, keyed by
+      # its text, so locales with different rules get their own lambda and
+      # locales with the same rule share one.
       def pluralisation_rule
         return unless rule = self['pluralisation_rule']
 
-        ->(n) do # rubocop:disable Lint/UnusedBlockArgument n can be used from pluralisation_rule code
-          eval(rule) # rubocop:disable Security/Eval TODO remove eval
-        end
+        (@pluralisation_rules ||= {})[rule] ||=
+          eval("->(n) { #{rule} }", nil, __FILE__, __LINE__) # rubocop:disable Security/Eval -- TODO remove eval
       end
 
       def reload
@@ -79,7 +81,7 @@ module FastGettext
         result
       end
 
-      def yaml_dot_notation(a, b) # rubocop:disable Naming/UncommunicativeMethodParamName
+      def yaml_dot_notation(a, b)
         a ? "#{a}.#{b}" : b
       end
     end

data/lib/fast_gettext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastGettext
-  VERSION = Version = '4.1.1' # rubocop:disable Naming/ConstantName
+  VERSION = Version = '4.2.0' # rubocop:disable Naming/ConstantName
 end

data/lib/fast_gettext.rb

@@ -11,7 +11,7 @@ module FastGettext
   extend FastGettext::Storage
   extend FastGettext::Translation
 
-  LOCALE_REX = /^[a-z]{2,3}$|^[a-z]{2,3}_[A-Z]{2,3}$/.freeze
+  LOCALE_REX = /^[a-z]{2,3}$|^[a-z]{2,3}_[A-Z]{2,3}$/
   NAMESPACE_SEPARATOR = '|'
   CONTEXT_SEPARATOR = "\004"
 
@@ -30,7 +30,7 @@ module FastGettext
 
   # deprecated, just a crutch to migrate to new api
   def self.allow_invalid_keys!
-    eval(<<~CODE)
+    eval(<<~CODE, binding, __FILE__, __LINE__ + 1)
       class ::String
         alias :_fast_gettext_old_format_m :%
         def %(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="