fix tests, cover edge cases

Author: bodrovis

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+- Use `LokaliseManager` v7.0.0.
+- Added support for syncing multiple Lokalise projects via `LokaliseRails::GlobalConfig.for_project`, generating scoped rake tasks: `lokalise_rails:<name>:import` and `lokalise_rails:<name>:export` (thanks, [@floriansr](https://github.com/floriansr))
+- Project-specific config keys are validated against `LokaliseManager` supported options to prevent typos/unknown settings.
+
 ## 8.2.0 (01-May-2025)
 
 * Added `disable_import_task` boolean option. When enabled, the import task is turned off in your project. Defaults to `false`.

Gemfile

@@ -16,13 +16,6 @@ tz_platforms =
 group :test do
   gem 'dotenv', '~> 3.0'
   gem 'rails', '~> 8.1'
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.6'
-  gem 'rubocop', '~> 1.0'
-  gem 'rubocop-performance', '~> 1.5'
-  gem 'rubocop-rake', '~> 0.6'
-  gem 'rubocop-rspec', '~> 3.0'
-  gem 'simplecov', '~> 0.22'
   gem 'tzinfo-data', platforms: tz_platforms
   gem 'webmock', '~> 3.14'
 end

Rakefile

@@ -27,7 +27,7 @@ namespace :lokalise do
   task :install do
     puts 'Running bundle install'
     sh 'gem update --system'
-    sh 'bundle'
+    sh 'bundle install'
   end
 
   desc 'Builds the gem'

gemfiles/Gemfile-rails-6-1

@@ -16,13 +16,5 @@ group :test do
   gem 'dotenv', '~> 2.5'
   gem 'mutex_m', '~> 0.3.0'
   gem 'rails', '~> 6.1'
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.6'
-  gem 'rubocop', '~> 1.0'
-  gem 'rubocop-performance', '~> 1.5'
-  gem 'rubocop-rspec', '~> 2.6'
-  gem 'rubocop-rake', '~> 0.6'
-  gem 'simplecov', '~> 0.16'
-  gem 'simplecov-lcov', '~> 0.8'
   gem 'webmock', '~> 3.14'
 end

gemfiles/Gemfile-rails-7-1

@@ -15,13 +15,5 @@ group :test do
   gem 'tzinfo-data', platforms: tz_platforms
   gem 'dotenv', '~> 3.0'
   gem 'rails', '~> 7.1', '< 7.2'
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.6'
-  gem 'rubocop', '~> 1.0'
-  gem 'rubocop-performance', '~> 1.5'
-  gem 'rubocop-rspec', '~> 2.6'
-  gem 'rubocop-rake', '~> 0.6'
-  gem 'simplecov', '~> 0.22'
-  gem 'simplecov-lcov', '~> 0.8'
   gem 'webmock', '~> 3.14'
 end

gemfiles/Gemfile-rails-7-2

@@ -15,13 +15,5 @@ group :test do
   gem 'tzinfo-data', platforms: tz_platforms
   gem 'dotenv', '~> 3.0'
   gem 'rails', '~> 7.2'
-  gem 'rake', '~> 13.0'
-  gem 'rspec', '~> 3.6'
-  gem 'rubocop', '~> 1.0'
-  gem 'rubocop-performance', '~> 1.5'
-  gem 'rubocop-rspec', '~> 2.6'
-  gem 'rubocop-rake', '~> 0.6'
-  gem 'simplecov', '~> 0.22'
-  gem 'simplecov-lcov', '~> 0.8'
   gem 'webmock', '~> 3.14'
 end

lib/lokalise_rails/global_config.rb

@@ -4,70 +4,44 @@ module LokaliseRails
   # Extends `LokaliseManager::GlobalConfig` to provide a global configuration
   # specific to the LokaliseRails gem in a Rails application.
   class GlobalConfig < LokaliseManager::GlobalConfig
+    # Manager-supported config keys (for inline overrides)
+    MANAGER_CONFIG_KEYS = LokaliseManager::TaskDefinitions::Base::CONFIG_KEYS.freeze
+
     class << self
       attr_writer :disable_export_task, :disable_import_task
 
-      # Returns whether the export task should be disabled.
-      #
-      # Defaults to `false` if not explicitly set.
-      #
-      # @return [Boolean] `true` if the export task is disabled, otherwise `false`.
       def disable_export_task
         @disable_export_task.nil? ? false : @disable_export_task
       end
 
-      # Returns whether the import task should be disabled.
-      #
-      # Defaults to `false` if not explicitly set.
-      #
-      # @return [Boolean] `true` if the import task is disabled, otherwise `false`.
       def disable_import_task
         @disable_import_task.nil? ? false : @disable_import_task
       end
 
-      # Returns the path to the directory where translation files are stored.
-      #
-      # Defaults to `config/locales` under the Rails application root if not explicitly set.
-      #
-      # @return [String] Absolute path to the locales directory.
       def locales_path
         @locales_path || "#{LokaliseRails::Utils.root}/config/locales"
       end
 
-      # Registers a named project config and auto-generates scoped rake tasks
-      # (lokalise_rails:<name>:import and lokalise_rails:<name>:export).
+      # Registers a named project config.
       #
-      # Settings not explicitly set in the block fall back to GlobalConfig
-      # via LokaliseManager's inline override mechanism, so shared options
-      # like api_token only need to be set once in the main config block.
-      #
-      # @param name [Symbol, String] identifier for the project
-      # @yield [collector] block to configure project-specific settings
-      #
-      # @example
-      #   LokaliseRails::GlobalConfig.for_project(:mobile) do |c|
-      #     c.project_id  = ENV['LOKALISE_MOBILE_PROJECT_ID']
-      #     c.locales_path = "#{Rails.root}/config/locales/mobile"
-      #   end
+      # @param name [Symbol, String]
+      # @yield [collector]
       def for_project(name, &block)
-        collector = ProjectConfigCollector.new
+        key = name.to_sym
+        collector = ProjectConfigCollector.new(MANAGER_CONFIG_KEYS)
         block&.call(collector)
-        projects[name.to_sym] = collector.to_h
+        projects[key] = collector.to_h
       end
 
-      # Returns the registry of named project configs.
-      #
-      # @return [Hash{Symbol => Hash}]
       def projects
         @projects ||= {}
       end
     end
 
     # Collects attribute assignments from a for_project block into a plain hash.
-    # The hash is passed as inline overrides to LokaliseManager.importer/exporter,
-    # so any attribute not explicitly set falls back to GlobalConfig automatically.
     class ProjectConfigCollector
-      def initialize
+      def initialize(allowed_keys)
+        @allowed_keys = allowed_keys
         @settings = {}
       end
 
@@ -76,16 +50,21 @@ def to_h
       end
 
       def method_missing(name, *args)
-        attr = name.to_s
-        if attr.end_with?('=')
-          @settings[attr.chomp('=').to_sym] = args.first
-        else
-          super
-        end
+        method = name.to_s
+        return super unless method.end_with?('=')
+
+        key = method.chomp('=').to_sym
+        raise ArgumentError, "Unknown config key for for_project: #{key}" unless @allowed_keys.include?(key)
+
+        @settings[key] = args.first
       end
 
       def respond_to_missing?(name, include_private = false)
-        name.to_s.end_with?('=') || super
+        method = name.to_s
+        return super unless method.end_with?('=')
+
+        key = method.chomp('=').to_sym
+        @allowed_keys.include?(key) || super
       end
     end
 

lib/tasks/lokalise_rails_tasks.rake

@@ -6,56 +6,58 @@ require File.join(LokaliseRails::Utils.root, 'config', 'lokalise_rails')
 
 # Rake tasks for syncing translation files between a Rails project and Lokalise.
 namespace :lokalise_rails do
-  ##########################################################################
-  # IMPORT
-  ##########################################################################
-  desc 'Import translations from Lokalise into the Rails project'
-  task :import do
+  run_import = lambda do |opts, project_name: nil|
     if LokaliseRails::GlobalConfig.disable_import_task
       $stdout.puts 'Import task is disabled.'
       exit 0
     end
 
-    importer = LokaliseManager.importer({}, LokaliseRails::GlobalConfig)
-    importer.import!
+    LokaliseManager.importer(opts, LokaliseRails::GlobalConfig).import!
   rescue StandardError => e
-    abort "Import failed: #{e.message}"
+    name = project_name&.to_s
+    prefix = name && !name.empty? ? "[#{name}] " : ''
+    abort "#{prefix}Import failed: #{e.message}"
   end
 
-  ##########################################################################
-  # EXPORT
-  ##########################################################################
-  desc 'Export translations from the Rails project to Lokalise'
-  task :export do
+  run_export = lambda do |opts, project_name: nil|
     if LokaliseRails::GlobalConfig.disable_export_task
       $stdout.puts 'Export task is disabled.'
       exit 0
     end
 
-    exporter = LokaliseManager.exporter({}, LokaliseRails::GlobalConfig)
-    exporter.export!
+    LokaliseManager.exporter(opts, LokaliseRails::GlobalConfig).export!
   rescue StandardError => e
-    abort "Export failed: #{e.message}"
+    name = project_name&.to_s
+    prefix = name && !name.empty? ? "[#{name}] " : ''
+    abort "#{prefix}Export failed: #{e.message}"
+  end
+
+  ##########################################################################
+  # DEFAULT (GLOBAL) TASKS
+  ##########################################################################
+  desc 'Import translations from Lokalise into the Rails project'
+  task :import do
+    run_import.call({})
+  end
+
+  desc 'Export translations from the Rails project to Lokalise'
+  task :export do
+    run_export.call({})
   end
 
-  # Auto-generate scoped import/export tasks for each named project
-  # registered via LokaliseRails::GlobalConfig.for_project.
+  ##########################################################################
+  # SCOPED TASKS (PER PROJECT)
+  ##########################################################################
   LokaliseRails::GlobalConfig.projects.each do |project_name, project_opts|
-    namespace project_name do
+    namespace project_name.to_s do
       desc "Import translations from Lokalise (#{project_name})"
       task :import do
-        importer = LokaliseManager.importer(project_opts, LokaliseRails::GlobalConfig)
-        importer.import!
-      rescue StandardError => e
-        abort "Import failed: #{e.message}"
+        run_import.call(project_opts, project_name: project_name)
       end
 
       desc "Export translations to Lokalise (#{project_name})"
       task :export do
-        exporter = LokaliseManager.exporter(project_opts, LokaliseRails::GlobalConfig)
-        exporter.export!
-      rescue StandardError => e
-        abort "Export failed: #{e.message}"
+        run_export.call(project_opts, project_name: project_name)
       end
     end
   end

lokalise_rails.gemspec

@@ -17,15 +17,26 @@ Gem::Specification.new do |spec|
   spec.files = Dir['README.md', 'LICENSE.md',
                    'CHANGELOG.md', 'lib/**/*.rb',
                    'lib/**/*.rake',
-                   'lokalise_rails.gemspec', '.github/*.md',
-                   'Gemfile', 'Rakefile']
+                   'lokalise_rails.gemspec']
   spec.extra_rdoc_files = ['README.md']
   spec.require_paths    = ['lib']
 
-  spec.add_dependency 'lokalise_manager', '~> 6.5'
+  spec.add_dependency 'lokalise_manager', '~> 7.0'
   spec.add_dependency 'zeitwerk', '~> 2.4'
 
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.7'
+  spec.add_development_dependency 'rubocop-rspec', '~> 3.0'
+  spec.add_development_dependency 'simplecov', '~> 0.22'
+
   spec.metadata = {
-    'rubygems_mfa_required' => 'true'
+    'rubygems_mfa_required' => 'true',
+    'bug_tracker_uri' => 'https://github.com/bodrovis/lokalise_rails/issues',
+    'changelog_uri' => 'https://github.com/bodrovis/lokalise_rails/blob/master/CHANGELOG.md',
+    'documentation_uri' => 'https://github.com/bodrovis/lokalise_rails/blob/master/README.md',
+    'homepage_uri' => spec.homepage
   }
 end

spec/dummy/config/application.rb

@@ -36,8 +36,10 @@ class Application < Rails::Application
       config.load_defaults 6.1
     elsif Rails.gem_version < Gem::Version.new('8.0')
       config.load_defaults 7.0
-    else
+    elsif Rails.gem_version < Gem::Version.new('8.1')
       config.load_defaults 8.0
+    else
+      config.load_defaults 8.1
     end
   end
 end