fast_gettext 1.8.0 → 2.1.0

data/lib/fast_gettext/translation_repository/merge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fast_gettext/translation_repository/po'
 
 module FastGettext
@@ -7,7 +9,7 @@ module FastGettext
     #  - can be used instead of searching for translations in multiple domains
     #  - requires reload when current locale is changed
     class Merge < Base
-      def initialize(name, options={})
+      def initialize(name, options = {})
         clear
         super(name, options)
         options.fetch(:chain, []).each do |repo|
@@ -21,7 +23,9 @@ module FastGettext
 
       def pluralisation_rule
         @repositories.each do |r|
-          result = r.pluralisation_rule and return result
+          if result = r.pluralisation_rule
+            return result
+          end
         end
         nil
       end
@@ -45,6 +49,7 @@ module FastGettext
 
       def add_repo(repo)
         raise "Unsupported repository" unless repo_supported?(repo)
+
         @repositories << repo
         load_repo(repo)
         true
@@ -65,8 +70,8 @@ module FastGettext
         repo.respond_to?(:all_translations)
       end
 
-      def load_repo(r)
-        @data = r.all_translations.merge(@data)
+      def load_repo(repo)
+        @data = repo.all_translations.merge(@data)
       end
     end
   end

data/lib/fast_gettext/translation_repository/mo.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 require 'fast_gettext/translation_repository/base'
 module FastGettext
   module TranslationRepository
-     # Responsibility:
+    # Responsibility:
     #  - find and store mo files
     #  - provide access to translations in mo files
     class Mo < Base
-      def initialize(name,options={})
+      CONTEXT_SEPARATOR = "\u0004"
+
+      def initialize(name, options = {})
         super
         @eager_load = options.fetch(:eager_load, false)
         reload
@@ -30,9 +34,9 @@ module FastGettext
 
       protected
 
-      def find_and_store_files(name,options)
+      def find_and_store_files(name, options)
         # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
-        find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"), options[:path]) do |locale,file|
+        find_files_in_locale_folders(File.join('LC_MESSAGES', "#{name}.mo"), options[:path]) do |_locale, file|
           MoFile.new(file, eager_load: @eager_load)
         end
       end

data/lib/fast_gettext/translation_repository/po.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require 'fast_gettext/translation_repository/base'
 require 'fast_gettext/translation_repository/mo'
 module FastGettext
   module TranslationRepository
-     # Responsibility:
+    # Responsibility:
     #  - find and store po files
     #  - provide access to translations in po files
     class Po < Mo
       protected
+
       def find_and_store_files(name, options)
         require 'fast_gettext/po_file'
-        find_files_in_locale_folders("#{name}.po", options[:path]) do |locale,file|
+        find_files_in_locale_folders("#{name}.po", options[:path]) do |_locale, file|
           PoFile.new(file, options)
         end
       end

data/lib/fast_gettext/translation_repository/yaml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fast_gettext/translation_repository/base'
 require 'yaml'
 
@@ -7,7 +9,7 @@ module FastGettext
     #  - find and store yaml files
     #  - provide access to translations in yaml files
     class Yaml < Base
-      def initialize(name,options={})
+      def initialize(name, options = {})
         super
         reload
       end
@@ -23,7 +25,11 @@ module FastGettext
       end
 
       def pluralisation_rule
-        self['pluralisation_rule'] ? lambda{|n| eval(self['pluralisation_rule']) } : nil
+        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
       end
 
       def reload
@@ -64,7 +70,7 @@ module FastGettext
 
       def add_yaml_key(result, prefix, hash)
         hash.each_pair do |key, value|
-          if value.kind_of?(Hash)
+          if value.is_a?(Hash)
             add_yaml_key(result, yaml_dot_notation(prefix, key), value)
           else
             result[yaml_dot_notation(prefix, key)] = value
@@ -73,7 +79,7 @@ module FastGettext
         result
       end
 
-      def yaml_dot_notation(a,b)
+      def yaml_dot_notation(a, b) # rubocop:disable Naming/UncommunicativeMethodParamName
         a ? "#{a}.#{b}" : b
       end
     end

data/lib/fast_gettext/translation_repository.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 module FastGettext
   # Responsibility:
   #  - decide which repository to choose from given input
   module TranslationRepository
-    extend self
-
-    def build(name, options)
+    def self.build(name, options)
       type = options[:type] || :mo
       class_name = type.to_s.split('_').map(&:capitalize).join
-      unless FastGettext::TranslationRepository.constants.map{|c|c.to_s}.include?(class_name)
+      unless FastGettext::TranslationRepository.constants.map(&:to_s).include?(class_name)
         require "fast_gettext/translation_repository/#{type}"
       end
-      eval(class_name).new(name,options)
+      const_get(class_name).new(name, options)
     end
   end
 end

data/lib/fast_gettext/version.rb

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

data/lib/fast_gettext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fast_gettext/mo_file'
 require 'fast_gettext/storage'
 require 'fast_gettext/translation'
@@ -6,30 +8,28 @@ require 'fast_gettext/vendor/string'
 require 'fast_gettext/version'
 
 module FastGettext
-  include FastGettext::Storage
-  extend self
+  extend FastGettext::Storage
+  extend FastGettext::Translation
 
-  LOCALE_REX =  /^[a-z]{2,3}$|^[a-z]{2,3}_[A-Z]{2,3}$/
+  LOCALE_REX = /^[a-z]{2,3}$|^[a-z]{2,3}_[A-Z]{2,3}$/.freeze
   NAMESPACE_SEPARATOR = '|'
+  CONTEXT_SEPARATOR = "\004"
 
-  # users should not include FastGettext, since this would contaminate their namespace
-  # rather use
-  # FastGettext.locale = ..
-  # FastGettext.text_domain = ..
-  # and
-  # include FastGettext::Translation
-  FastGettext::Translation.public_instance_methods.each do |method|
-    define_method method do |*args|
-      Translation.send(method,*args)
-    end
+  # helper block for changing domains
+  def self.with_domain(domain)
+    old_domain = FastGettext.text_domain
+    FastGettext.text_domain = domain
+    yield
+  ensure
+    FastGettext.text_domain = old_domain
   end
 
-  def add_text_domain(name,options)
-    translation_repositories[name] = TranslationRepository.build(name,options)
+  def self.add_text_domain(name, options)
+    translation_repositories[name] = TranslationRepository.build(name, options)
   end
 
   # some repositories know where to store their locales
-  def locale_path
+  def self.locale_path
     translation_repositories[text_domain].instance_variable_get(:@options)[:path]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: forking_test_runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,15 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText