r18n-rails 4.0.0 → 5.0.0

data/lib/r18n-rails.rb

@@ -20,44 +20,56 @@
 require 'r18n-core'
 require 'r18n-rails-api'
 
+require 'rails'
+require 'action_controller'
+
 require_relative 'r18n-rails/helpers'
-require_relative 'r18n-rails/controller'
+require_relative 'r18n-rails/hooks_helper'
 require_relative 'r18n-rails/translated'
 require_relative 'r18n-rails/filters'
 
 R18n.default_places { [Rails.root.join('app/i18n'), R18n::Loader::Rails.new] }
 
 ActionController::Base.helper(R18n::Rails::Helpers)
-ActionController::Base.include R18n::Rails::Controller
+ActionController::Base.include R18n::Rails::HooksHelper::ForController
 
 if ActionController::Base.respond_to? :before_action
   ActionController::Base.send(:before_action, :set_r18n)
-  if Rails.env.development?
-    ActionController::Base.send(:before_action, :reload_r18n)
-  end
+  ActionController::Base.send(:before_action, :reload_r18n) if Rails.env.development?
 else
   ActionController::Base.send(:before_filter, :set_r18n)
-  if Rails.env.development?
-    ActionController::Base.send(:before_filter, :reload_r18n)
-  end
+  ActionController::Base.send(:before_filter, :reload_r18n) if Rails.env.development?
 end
 
-ActionMailer::Base.helper(R18n::Rails::Helpers) if defined? ActionMailer
+if defined? ActionMailer
+  ActionMailer::Base.helper(R18n::Rails::Helpers)
+  ActionMailer::Base.include R18n::Rails::HooksHelper::ForMailer
+
+  if ActionMailer::Base.respond_to? :before_action
+    ActionMailer::Base.send(:before_action, :set_r18n)
+    ActionMailer::Base.send(:before_action, :reload_r18n) if Rails.env.development?
+  else
+    ActionMailer::Base.send(:before_filter, :set_r18n)
+    ActionMailer::Base.send(:before_filter, :reload_r18n) if Rails.env.development?
+  end
+end
 
 ActiveSupport.on_load(:after_initialize) do
   env = ENV['LANG']
   env = env.split('.').first if env
-  locale = env || I18n.default_locale.to_s
-  if defined?(Rails::Console) && !defined?(Wirble)
-    i18n = R18n::I18n.new(
-      locale, R18n.default_places,
-      off_filters: :untranslated,
-      on_filters: :untranslated_bash
-    )
-    R18n.set(i18n)
-  else
-    R18n.set(locale)
-  end
+  R18n::I18n.default = I18n.default_locale.to_s
+  locales = [env, I18n.default_locale.to_s]
+  options =
+    if defined?(Rails::Console) && !defined?(Wirble)
+      {
+        off_filters: :untranslated,
+        on_filters: :untranslated_bash
+      }
+    else
+      {}
+    end
+  i18n = R18n::I18n.new(locales, R18n.default_places, **options)
+  R18n.set(i18n)
 
   I18n.backend = R18n::Backend.new
 end

data/lib/r18n-rails/filters.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# Load R18n filters from Rails app directory.
-#
 # Copyright (C) 2012 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -18,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module R18n
+  # Load R18n filters from Rails app directory.
   module Rails
     # Load and remove filters from ruby files in `app/i18n`.
     class Filters
@@ -27,6 +26,7 @@ module R18n
 
         # Path to filters. Should be set to `app/i18n`.
         attr_writer :path
+
         def path
           return @path if defined?(@path)
 

data/lib/r18n-rails/helpers.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# R18n helpers for Rails.
-#
 # Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -19,6 +17,7 @@
 
 module R18n
   module Rails
+    # R18n helpers for Rails.
     module Helpers
       # Return current R18n I18n object, to use R18n API:
       # * `r18n.available_locales` – available application translations.
@@ -49,11 +48,11 @@ module R18n
       #   l Time.now                 # Rails I18n default format
       #   l Time.now, format: :short # Rails I18n style
       #   l Time.now, :human         # R18n style
-      def l(obj, *params)
-        if params.empty? || params.first.is_a?(Hash)
-          super(obj, *params)
+      def l(obj, *args, **kwargs)
+        if args.empty? || kwargs.any?
+          super(obj, *args, **kwargs)
         else
-          r18n.l(obj, *params)
+          r18n.l(obj, *args, now: Time.zone.now, **kwargs)
         end
       end
       alias localize l

data/lib/r18n-rails/{controller.rb → hooks_helper.rb}

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# Methods and filters to controllers.
-#
 # Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -21,14 +19,29 @@ require 'r18n-rails-api'
 
 module R18n
   module Rails
-    module Controller
-      include Helpers
+    # Methods and filters to controllers.
+    module HooksHelper
+      module Common
+        include Helpers
+
+        private
 
-      private
+        # Clean cache and reload filters from ruby files in `app/i18n`.
+        # Used only for development.
+        def reload_r18n
+          R18n.clear_cache!
+          R18n::Rails::Filters.reload!
+          R18n.get.try(:reload!)
+        end
+      end
 
-      # Auto detect user locales and change backend.
-      def set_r18n
-        R18n.set do
+      module ForController
+        include Common
+
+        private
+
+        # Auto detect user locales and set.
+        def set_r18n
           R18n::I18n.default = ::I18n.default_locale.to_s
           locales = R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
 
@@ -43,16 +56,27 @@ module R18n
             off_filters: :untranslated, on_filters: :untranslated_html
           )
           ::I18n.locale = i18n.locale.code.to_sym
-          i18n
+          R18n.set i18n
+          ## To not prevent action
+          ## Also don't use `puts`
+          nil
         end
       end
 
-      # Clean cache and reload filters from ruby files in `app/i18n`.
-      # Used only for development.
-      def reload_r18n
-        R18n.clear_cache!
-        R18n::Rails::Filters.reload!
-        R18n.get.try(:reload!)
+      module ForMailer
+        include Common
+
+        private
+
+        # Set locale from `::I18n`
+        def set_r18n
+          R18n::I18n.default = ::I18n.default_locale.to_s
+          i18n = R18n::I18n.new(
+            ::I18n.locale, R18n.default_places,
+            off_filters: :untranslated, on_filters: :untranslated_html
+          )
+          R18n.set i18n
+        end
       end
     end
   end

data/lib/r18n-rails/translated.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# ActiveRecord fix mixin to R18n::Translated.
-#
 # Copyright (C) 2011 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -19,10 +17,13 @@
 
 module R18n
   module Translated
+    # ActiveRecord fix mixin to R18n::Translated.
     module Base
+      remove_method :unlocalized_methods
+
       def unlocalized_methods
-        if defined?(ActiveRecord) && ancestors.include?(ActiveRecord::Base)
-          column_names + column_names.map { |i| i + '=' } + instance_methods
+        if defined?(ActiveRecord) && self <= ActiveRecord::Base
+          column_names + column_names.map { |i| "#{i}=" } + instance_methods
         else
           instance_methods
         end

data/lib/r18n-rails/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module R18n
+  module Rails
+    VERSION = '5.0.0'
+  end
+end

metadata

@@ -1,29 +1,218 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
-autorequire: 
+- Alexander Popov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r18n-rails-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: |2
       Out-of-box R18n support for Ruby on Rails.
       It is just a wrapper for R18n Rails API and R18n core libraries.
@@ -31,53 +220,34 @@ description: |2
       translation support for any classes, time and number localization, several
       user language support, agnostic core package with out-of-box support for
       Rails, Sinatra and desktop applications.
-email: andrey@sitnik.ru
+email:
+- andrey@sitnik.ru
+- alex.wayfer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".rspec"
+- ChangeLog.md
 - LICENSE
 - README.md
-- Rakefile
 - lib/r18n-rails.rb
-- lib/r18n-rails/controller.rb
 - lib/r18n-rails/filters.rb
 - lib/r18n-rails/helpers.rb
+- lib/r18n-rails/hooks_helper.rb
 - lib/r18n-rails/translated.rb
-- r18n-rails.gemspec
-- spec/app/app/controllers/application_controller.rb
-- spec/app/app/controllers/test_controller.rb
-- spec/app/app/i18n/en.yml
-- spec/app/app/i18n/filters.rb
-- spec/app/app/i18n/ru.yml
-- spec/app/app/mailers/test_mailer.rb
-- spec/app/app/models/post.rb
-- spec/app/app/views/test/format.html.erb
-- spec/app/app/views/test/helpers.html.erb
-- spec/app/app/views/test/safe.html.erb
-- spec/app/app/views/test_mailer/test.text.erb
-- spec/app/config.ru
-- spec/app/config/application.rb
-- spec/app/config/boot.rb
-- spec/app/config/environment.rb
-- spec/app/config/environments/test.rb
-- spec/app/config/initializers/r18n.rb
-- spec/app/config/initializers/secret_token.rb
-- spec/app/config/locales/en.yml
-- spec/app/config/locales/ru.yml
-- spec/app/config/routes.rb
-- spec/app/db/migrate/20091218123631_create_posts.rb
-- spec/app/db/schema.rb
-- spec/rails_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/r18n/r18n/tree/master/r18n-rails
+- lib/r18n-rails/version.rb
+homepage: https://github.com/r18n/r18n-rails
 licenses:
 - LGPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/r18n/r18n-rails/issues
+  changelog_uri: https://github.com/r18n/r18n-rails/blob/5.0.0/ChangeLog.md
+  documentation_uri: http://www.rubydoc.info/gems/r18n-rails/5.0.0
+  homepage_uri: https://github.com/r18n/r18n-rails
+  source_code_uri: https://github.com/r18n/r18n-rails
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,40 +255,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: R18n for Rails
-test_files:
-- spec/app/app/controllers/application_controller.rb
-- spec/app/app/controllers/test_controller.rb
-- spec/app/app/i18n/en.yml
-- spec/app/app/i18n/filters.rb
-- spec/app/app/i18n/ru.yml
-- spec/app/app/mailers/test_mailer.rb
-- spec/app/app/models/post.rb
-- spec/app/app/views/test/format.html.erb
-- spec/app/app/views/test/helpers.html.erb
-- spec/app/app/views/test/safe.html.erb
-- spec/app/app/views/test_mailer/test.text.erb
-- spec/app/config.ru
-- spec/app/config/application.rb
-- spec/app/config/boot.rb
-- spec/app/config/environment.rb
-- spec/app/config/environments/test.rb
-- spec/app/config/initializers/r18n.rb
-- spec/app/config/initializers/secret_token.rb
-- spec/app/config/locales/en.yml
-- spec/app/config/locales/ru.yml
-- spec/app/config/routes.rb
-- spec/app/db/migrate/20091218123631_create_posts.rb
-- spec/app/db/schema.rb
-- spec/rails_spec.rb
-- spec/spec_helper.rb
+test_files: []