localeapp 3.1.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a7cd53343b6eb12ea585524362dc60be3c0d2a5
-  data.tar.gz: 04d96ff855e00b290e748324eff03a7a596bea8f
+SHA256:
+  metadata.gz: 9ae1a6275c06e67be70d5928a931d76b6c82a3376baf3ac23d233694c74ae760
+  data.tar.gz: 8a223f69cf4b65bfb79bbbd650f1f1f71c85a376b136b26651c72104a9f93dfc
 SHA512:
-  metadata.gz: c9624f8d6e81d35f9df063059aafaba5779cc607fd9fc45d1a785818b61159bf7776752ef8ee5b29da4d73a5d9748c8ad2bd091e5fe049469fe6c0c8cfaf6593
-  data.tar.gz: beb7c4864b7c32b52de9c57cf732adcff5375c5833f6988c34603d9ea367ee43d88990bc36021c25abfd0a09c2dbf6cc1c6cd329a8b68606df608cecc8de3322
+  metadata.gz: 9fe3ac6532472f2b93cadbdb0ce8b3c4b7cf8bad59739db47044bb5cf2675bf6844bb2329f2f674bdc3d5c7011d366adee13b97b09b2ff05c07780a00f5e6541
+  data.tar.gz: 1f50388ec54d72d13d2129f5bc631b84a6e12900bc649c40266b1e2628b5e004be27c2a3bcb7c635afe0c3922f7bce84c2ae63d7b0e95296bcb0ce8ddb54bf0e

data/.travis.yml

@@ -18,4 +18,4 @@ gemfile:
   - spec/gemfiles/i18n_1.0.gemfile
 notifications:
   slack:
-    secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=
+    secure: dPiP4+6xO6L9/RfXyivr2X2UohSD8CDdnnY57BvNgGVvFtQ2LUP9s1mDxj7gbBGhRZJzTMZlM/PU7bT9O9JCJPcpUs4dWg748KZ0ZGOslnv8yfzNbRh9U5OzyEjch2PFkEhpQPnuVCiof+ahjfxQQSkokpsbNa9DLlDmUapXFPY=

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # master
 
+# Version 3.3.0
+
+* Support I18n >= 1.9.0 (thanks to [@ryanb](https://github.com/ryanb))
+
+# Version 3.2.0
+
+* Support ruby 3.0 (thanks to [@spilin](https://github.com/spilin))
+
+# Version 3.1.3
+
+* Fix deprecation warning in Rails 6 initialization (thanks to [@ryanb](https://github.com/ryanb) for [reporting it](https://github.com/Locale/localeapp/issues/276))
+
+# Version 3.1.2
+
+* Fix a bug when `.env` is a directory (thanks to [@xijo](https://github.com/xijo) for [reporting it](https://github.com/Locale/localeapp/pull/262))
+
 # Version 3.1.1
 
 * Remove I18n Hash#deep_merge! usage

data/bin/localeapp

@@ -34,7 +34,7 @@ module LocaleappGLIWrapper
       global_options[:k]
     elsif ENV['LOCALEAPP_API_KEY']
       ENV['LOCALEAPP_API_KEY']
-    elsif File.exist?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
+    elsif File.file?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
       $1
     else
       nil

data/lib/localeapp/rails/backport_translation_helper_fix_to_honor_raise_option.rb

@@ -49,7 +49,8 @@ module Localeapp::TranslationHelperRails41MonkeyPatch
 
     if html_safe_translation_key?(key)
       html_safe_options = options.dup
-      options.except(*I18n::RESERVED_KEYS).each do |name, value|
+      options.each do |name, value|
+        next if I18n::RESERVED_KEYS.include?(name)
         unless name == :count && value.is_a?(Numeric)
           html_safe_options[name] = ERB::Util.html_escape(value.to_s)
         end

data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb

@@ -16,9 +16,9 @@ module Localeapp
     def translate(key, options = {})
       full_key = [options[:scope], key].compact.join(".")
       if full_key =~ Localeapp.configuration.blacklisted_keys_pattern
-        super(key, options)
+        super(key, **options)
       else
-        super(key, {:raise => false}.merge(options))
+        super(key, **{:raise => false}.merge(options))
       end
     end
     alias :t :translate

data/lib/localeapp/rails.rb

@@ -4,7 +4,9 @@ module Localeapp
   module Rails
     def self.initialize
 
-      ActionController::Base.send(:include, Localeapp::Rails::Controller)
+      ActiveSupport.on_load(:action_controller) do
+        ActionController::Base.send(:include, Localeapp::Rails::Controller)
+      end
 
       # match all versions between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc on all branches
       if rails_version_matches_all?('~> 4.0.10.rc1') |

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "3.1.1"
+  VERSION = "3.3.0"
 end

data/lib/localeapp.rb

@@ -1,5 +1,4 @@
 require 'i18n'
-require 'i18n/core_ext/hash'
 require 'yaml'
 
 require 'localeapp/i18n_shim'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -298,10 +298,64 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: localeapp
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com
-test_files: []
-has_rdoc: 
+test_files:
+- features/add.feature
+- features/bad_command.feature
+- features/cp.feature
+- features/env_file.feature
+- features/environment.feature
+- features/help.feature
+- features/install.feature
+- features/install/write_env_file.feature
+- features/mv.feature
+- features/options/api_key.feature
+- features/pull.feature
+- features/push.feature
+- features/rm.feature
+- features/step_definitions/cli_steps.rb
+- features/step_definitions/execution_steps.rb
+- features/step_definitions/filesystem_steps.rb
+- features/step_definitions/output_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
+- features/update.feature
+- spec/fixtures/empty_log.yml
+- spec/fixtures/en.yml
+- spec/fixtures/es.yml
+- spec/fixtures/string_log.yml
+- spec/fixtures/symbol_log.yml
+- spec/gemfiles/i18n_0.7.gemfile
+- spec/gemfiles/i18n_0.8.gemfile
+- spec/gemfiles/i18n_0.9.gemfile
+- spec/gemfiles/i18n_1.0.gemfile
+- spec/localeapp/api_call_spec.rb
+- spec/localeapp/api_caller_spec.rb
+- spec/localeapp/cli/add_spec.rb
+- spec/localeapp/cli/copy_spec.rb
+- spec/localeapp/cli/daemon_spec.rb
+- spec/localeapp/cli/install_spec.rb
+- spec/localeapp/cli/pull_spec.rb
+- spec/localeapp/cli/push_spec.rb
+- spec/localeapp/cli/rename_spec.rb
+- spec/localeapp/cli/update_spec.rb
+- spec/localeapp/configuration_spec.rb
+- spec/localeapp/default_value_handler_spec.rb
+- spec/localeapp/exception_handler_spec.rb
+- spec/localeapp/key_checker_spec.rb
+- spec/localeapp/missing_translations_spec.rb
+- spec/localeapp/poller_spec.rb
+- spec/localeapp/rails/controller_spec.rb
+- spec/localeapp/routes_spec.rb
+- spec/localeapp/sender_spec.rb
+- spec/localeapp/sync_file_spec.rb
+- spec/localeapp/updater_spec.rb
+- spec/localeapp_spec.rb
+- spec/spec_helper.rb
+- spec/support/fakeweb_socket_close_patch.rb
+- spec/support/i18n/missing_translation.rb
+- spec/support/localeapp_integration_data.rb
+- spec/support/localeapp_synchronization_data.rb