lokalise_rails 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac9b215d2e4002517b8dc09f29841e78cf349178639069e963bd4b0555cce93
-  data.tar.gz: 00aacebe6b1f54d80b4d3832c16a38e6863c469ba09cee44fffae9e8373772a6
+  metadata.gz: e0766634c77c771d4a7750da1a98c0d6c3a8f7f0ecf06ae071c4c4becc34c288
+  data.tar.gz: cdb4a114a582b30465e82fad8eefb5d89be6bbae8943f83255a9fd3c683c6b3c
 SHA512:
-  metadata.gz: b8647b6b7b1b691a03146fc69934f54fe550a76c547d4add769900095fa409949e982777b210cf977ee8523087f2f2864d5c4d141953d0513c5465b5ec21254b
-  data.tar.gz: 5e807d85f5cdf3c693d90ae0bbff1c2e0fcedc2ac5cf76d90ae65bb9e9992583cb72c13db29f05b028f9015668b4ace1e20936e3d67b4003337931b03233d2b3
+  metadata.gz: 11cc6c1dabc982278a58bc89e71c883501029badf2af8a627595e46cef2c4ed541734d872e00fa0c83bcaa7fce5b9e344ab06f1564c79a4bae78a740bd307347
+  data.tar.gz: 88c8ef5767a31660dd317cc828b088874cd5075eeea4afa7c9f58b1eebaa1e7a8a1917392e89e3da679558faca8346061e1aaad0e981e004f5f5497a41472e8b

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.0.0 (11-Mar-2022)
+
+* **Breaking change**: require Ruby 2.7+
+* Use Zeitwerk loader
+* Use newer LokaliseManager (v3) and RubyLokaliseApi (v6)
+* Prettify code
+
 ## 4.0.0 (27-Jan-22)
 
 * File exporting is now multi-threaded as Lokalise API started to support parallel requests since January 2022

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 group :test do
   gem 'codecov', '~> 0.2'
   gem 'dotenv', '~> 2.5'
-  gem 'rails', '~> 7.0.0'
+  gem 'rails', '~> 7.0'
   gem 'rake', '~> 13.0'
   gem 'rspec', '~> 3.6'
   gem 'rubocop', '~> 1.0'
@@ -15,6 +15,6 @@ group :test do
   gem 'rubocop-rspec', '~> 2.6'
   gem 'simplecov', '~> 0.16'
   gem 'sprockets-rails', '~> 3'
-  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
+  gem 'tzinfo-data' # , platforms: %i[mingw mswin x64_mingw jruby]
   gem 'vcr', '~> 6.0'
 end

data/lib/generators/lokalise_rails/install_generator.rb

@@ -3,7 +3,9 @@
 require 'rails/generators'
 
 module LokaliseRails
+  # Generators for LokaliseRails
   module Generators
+    # Installs LokaliseRails config
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __dir__)
 

data/lib/lokalise_rails/global_config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module LokaliseRails
+  # Global configuration, based on LokaliseManager config
   class GlobalConfig < LokaliseManager::GlobalConfig
     class << self
       def locales_path

data/lib/lokalise_rails/railtie.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module LokaliseRails
+  # Load Rake tasks
   class Railtie < Rails::Railtie
     rake_tasks do
       load 'tasks/lokalise_rails_tasks.rake'

data/lib/lokalise_rails/utils.rb

@@ -3,12 +3,15 @@
 require 'pathname'
 
 module LokaliseRails
+  # Util methods
   module Utils
     class << self
+      # Current project root
       def root
         Pathname.new(rails_root || Dir.getwd)
       end
 
+      # Tries to get Rails root if Rails is defined
       def rails_root
         return ::Rails.root.to_s if defined?(::Rails.root) && ::Rails.root
         return RAILS_ROOT.to_s if defined?(RAILS_ROOT)

data/lib/lokalise_rails/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module LokaliseRails
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end
 # :nocov:

data/lib/lokalise_rails.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require 'zeitwerk'
 require 'lokalise_manager'
 
-require 'lokalise_rails/utils'
-require 'lokalise_rails/global_config'
+loader = Zeitwerk::Loader.for_gem
+loader.ignore "#{__dir__}/lokalise_rails/railtie.rb"
+loader.setup
 
+# Main LokaliseRails module
 module LokaliseRails
 end
 
-require 'lokalise_rails/railtie' if defined?(Rails)
+require_relative 'lokalise_rails/railtie' if defined?(Rails)

data/lokalise_rails.gemspec

@@ -5,14 +5,14 @@ require File.expand_path('lib/lokalise_rails/version', __dir__)
 Gem::Specification.new do |spec|
   spec.name                  = 'lokalise_rails'
   spec.version               = LokaliseRails::VERSION
-  spec.authors               = ['Ilya Bodrov']
+  spec.authors               = ['Ilya Bodrov-Krukowski']
   spec.email                 = ['golosizpru@gmail.com']
   spec.summary               = 'Lokalise integration for Ruby on Rails'
   spec.description           = 'This gem allows to exchange translation files between your Rails app and Lokalise TMS.'
   spec.homepage              = 'https://github.com/bodrovis/lokalise_rails'
   spec.license               = 'MIT'
   spec.platform              = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.files = Dir['README.md', 'LICENSE',
                    'CHANGELOG.md', 'lib/**/*.rb',
@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md']
   spec.require_paths    = ['lib']
 
-  spec.add_dependency 'lokalise_manager', '~> 2.0'
+  spec.add_dependency 'lokalise_manager', '~> 3.0'
+  spec.add_dependency 'zeitwerk', '~> 2.4'
 
   spec.metadata = {
     'rubygems_mfa_required' => 'true'

data/spec/lib/generators/lokalise_rails/install_generator_spec.rb

@@ -3,11 +3,11 @@
 require 'generators/lokalise_rails/install_generator'
 
 describe LokaliseRails::Generators::InstallGenerator do
-  before :all do
+  before do
     remove_config
   end
 
-  after :all do
+  after do
     remove_config
     add_config!
   end

data/spec/lib/tasks/export_task_spec.rb

@@ -6,14 +6,14 @@ RSpec.describe 'Export Rake task' do
   it 'halts when the API key is not set' do
     allow(global_config).to receive(:api_token).and_return(nil)
 
-    expect(export_executor).to raise_error(SystemExit, /API token is not set/i)
+    expect { Rake::Task['lokalise_rails:export'].execute }.to raise_error(SystemExit, /API token is not set/i)
     expect(global_config).to have_received(:api_token)
   end
 
   it 'halts when the project ID is not set' do
     allow(global_config).to receive(:project_id).and_return(nil)
 
-    expect(export_executor).to raise_error(SystemExit, /ID is not set/i)
+    expect { Rake::Task['lokalise_rails:export'].execute }.to raise_error(SystemExit, /ID is not set/i)
 
     expect(global_config).to have_received(:project_id)
   end
@@ -22,11 +22,11 @@ RSpec.describe 'Export Rake task' do
     let(:filename_ru) { 'ru.yml' }
     let(:path_ru) { "#{Rails.root}/config/locales/#{filename_ru}" }
 
-    before :all do
+    before do
       add_translation_files! with_ru: true
     end
 
-    after :all do
+    after do
       rm_translation_files
     end
 
@@ -34,7 +34,7 @@ RSpec.describe 'Export Rake task' do
       it 'is callable' do
         allow_project_id global_config, ENV['LOKALISE_PROJECT_ID'] do
           VCR.use_cassette('upload_files') do
-            expect(export_executor).to output(/complete!/).to_stdout
+            expect { Rake::Task['lokalise_rails:export'].execute }.to output(/complete!/).to_stdout
           end
         end
       end
@@ -42,7 +42,7 @@ RSpec.describe 'Export Rake task' do
       it 're-raises export errors' do
         allow_project_id global_config, '542886116159f798720dc4.94769464' do
           VCR.use_cassette('upload_files_error') do
-            expect(export_executor).to raise_error(SystemExit, /Unknown `lang_iso`/)
+            expect { Rake::Task['lokalise_rails:export'].execute }.to raise_error(SystemExit, /Unknown `lang_iso`/)
           end
         end
       end

data/spec/lib/tasks/import_task_spec.rb

@@ -7,14 +7,14 @@ RSpec.describe 'Import Rake task' do
   it 'halts when the API key is not set' do
     allow(global_config).to receive(:api_token).and_return(nil)
 
-    expect(import_executor).to raise_error(SystemExit, /API token is not set/i)
+    expect { Rake::Task['lokalise_rails:import'].execute }.to raise_error(SystemExit, /API token is not set/i)
     expect(global_config).to have_received(:api_token)
   end
 
   it 'halts when the project ID is not set' do
     allow(global_config).to receive(:project_id).and_return(nil)
 
-    expect(import_executor).to raise_error(SystemExit, /ID is not set/i)
+    expect { Rake::Task['lokalise_rails:import'].execute }.to raise_error(SystemExit, /ID is not set/i)
 
     expect(global_config).to have_received(:project_id)
   end
@@ -25,7 +25,7 @@ RSpec.describe 'Import Rake task' do
       rm_translation_files
     end
 
-    after :all do
+    after do
       rm_translation_files
     end
 
@@ -33,7 +33,7 @@ RSpec.describe 'Import Rake task' do
       it 'is callable' do
         allow_project_id global_config, ENV['LOKALISE_PROJECT_ID'] do
           VCR.use_cassette('download_files') do
-            expect(import_executor).to output(/complete!/).to_stdout
+            expect { Rake::Task['lokalise_rails:import'].execute }.to output(/complete!/).to_stdout
           end
 
           expect(count_translations).to eq(4)
@@ -47,7 +47,9 @@ RSpec.describe 'Import Rake task' do
       it 're-raises export errors' do
         allow_project_id global_config, 'fake' do
           VCR.use_cassette('download_files_error') do
-            expect(import_executor).to raise_error(SystemExit, /Invalid `project_id` parameter/)
+            expect do
+              Rake::Task['lokalise_rails:import'].execute
+            end.to raise_error(SystemExit, /Invalid `project_id` parameter/)
           end
         end
       end

data/spec/spec_helper.rb

@@ -24,7 +24,6 @@ ENV['RAILS_ROOT'] ||= "#{File.dirname(__FILE__)}../../../spec/dummy"
 
 RSpec.configure do |config|
   config.include FileManager
-  config.include RakeUtils
   config.include SpecAddons
 end
 

data/spec/support/file_manager.rb

@@ -4,7 +4,9 @@ require 'fileutils'
 
 module FileManager
   def mkdir_locales
-    FileUtils.mkdir_p(LokaliseRails::GlobalConfig.locales_path) unless File.directory?(LokaliseRails::GlobalConfig.locales_path)
+    return if File.directory?(LokaliseRails::GlobalConfig.locales_path)
+
+    FileUtils.mkdir_p(LokaliseRails::GlobalConfig.locales_path)
   end
 
   def rm_translation_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokalise_rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
-- Ilya Bodrov
+- Ilya Bodrov-Krukowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lokalise_manager
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: This gem allows to exchange translation files between your Rails app
   and Lokalise TMS.
 email:
@@ -74,7 +88,6 @@ files:
 - spec/lib/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_manager.rb
-- spec/support/rake_utils.rb
 - spec/support/spec_addons.rb
 - spec/support/vcr.rb
 homepage: https://github.com/bodrovis/lokalise_rails
@@ -90,14 +103,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: Lokalise integration for Ruby on Rails
@@ -126,6 +139,5 @@ test_files:
 - spec/lib/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_manager.rb
-- spec/support/rake_utils.rb
 - spec/support/spec_addons.rb
 - spec/support/vcr.rb

data/spec/support/rake_utils.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module RakeUtils
-  def import_executor
-    -> { Rake::Task['lokalise_rails:import'].execute }
-  end
-
-  def export_executor
-    -> { Rake::Task['lokalise_rails:export'].execute }
-  end
-
-  def install_invoker
-    Rails::Generators.invoke 'lokalise_rails:install'
-  end
-end