lokalise_rails 6.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b031485e357b3c1b4d4aa5640f214ddcdb382fe53266de02d70b118867515d
-  data.tar.gz: e0b8070461e74fcdf9dd465335b60486d98dd80456b46934029ef5da23e60525
+  metadata.gz: 7d0c8f216f82d224538b9d7e0931f99dff27067c21209a4652f210fc3e4a6dd8
+  data.tar.gz: bcf43f559a4b2a81b307498641af169ee916e634fe6f0b44ae2e1816df7ba86d
 SHA512:
-  metadata.gz: 9aab358a2d9cb224c199a0b052d5749ffad9dc4c3a1e739ab6a1532a7303dd45d88ba1e9b242e3a1ce8b8c0ecef98288abf7049124d2ae56170ebf417573eb20
-  data.tar.gz: fa9ed8e36017819eeb00f712910d582fb13d2ca63a07fb62b85c561fd3edb8e93fe1275a4fcca5be80093a97c4f5dc2260305daf94afa96146a22dd001831a27
+  metadata.gz: fe926df4a57c93bb325802a7767dfb978e7bddcdd652bff24be9e889e42bff478031d0561bf84cb0f3c2541aa3da87ad8c5d5ad95593761c3bb647ae66eb5670
+  data.tar.gz: 7e11ac6f31780fc01a1109101ab70fe8a42e6377270198e58050e11af6c98a6e285c4ce79f3c53bb2d1edfd3264ea64d26281e86fda5b4a07fc3b6963f8b0925

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 7.0.1
+
+* Update documentation, minor code tweaks
+
+## 7.0.0 (09-Nov-2023)
+
+* **Breaking change**: require Ruby 3+. Version 2.7 has reached end-of-life and thus we are not planning to support it anymore. If you need support for Ruby 2.7, please stay on 6.0.0.
+* **Potential breaking change**: lambda returned by the `lang_iso_inferer` method has been slightly enhanced. It now accepts not only the file data but also the full path to the file. Therefore, if you redefine the `lang_iso_inferer` option please make sure that the returned lambda accepts two params, not one. This way, you can be more flexible when inferring the locale. For example:
+
+```ruby
+lang_iso_inferer: ->(_data, path) { path.basename('.yml').to_s }
+```
+
+* Use newer lokalise_manager and ruby-lokalise-api.
+* Test with Ruby 3.3, do not test with Rails 6.0 (EOL)
+
 ## 6.0.0 (27-Jul-2023)
 
 * Use lokalise-manager v4 and ruby-lokalise-api v8. The latter is a major rewrite of the original SDK and has some breaking changes (however 95% of the methods have similar signatures). Therefore please make sure that your tests pass.

data/Gemfile

@@ -5,8 +5,8 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem 'dotenv', '~> 2.5'
-  gem 'rails', '~> 7.0.4'
+  gem 'dotenv', '~> 3.0'
+  gem 'rails', '~> 7.1'
   gem 'rake', '~> 13.0'
   gem 'rspec', '~> 3.6'
   gem 'rubocop', '~> 1.0'
@@ -14,6 +14,7 @@ group :test do
   gem 'rubocop-rake', '~> 0.6'
   gem 'rubocop-rspec', '~> 2.6'
   gem 'simplecov', '~> 0.22'
+  gem 'simplecov-lcov', '~> 0.8'
   gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
   gem 'webmock', '~> 3.14'
 end

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Ilya Krukowski
+Copyright (c) 2024 Ilya Krukowski
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,6 +2,8 @@
 
 ![Gem](https://img.shields.io/gem/v/lokalise_rails)
 ![CI](https://github.com/bodrovis/lokalise_rails/actions/workflows/ci.yml/badge.svg)
+[![Coverage Status](https://coveralls.io/repos/github/bodrovis/lokalise_rails/badge.svg?branch=master)](https://coveralls.io/github/bodrovis/lokalise_rails?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/6e5c98f76227de00b0f2/maintainability)](https://codeclimate.com/github/bodrovis/lokalise_rails/maintainability)
 ![Downloads total](https://img.shields.io/gem/dt/lokalise_rails)
 
 This gem provides [Lokalise](http://lokalise.com) integration for Ruby on Rails and allows to exchange translation files easily. It relies on [lokalise_manager](https://github.com/bodrovis/lokalise_manager) which perform the actual import/export and can be used to run this task in any Ruby script.
@@ -12,7 +14,7 @@ This gem provides [Lokalise](http://lokalise.com) integration for Ruby on Rails
 
 ### Requirements
 
-This gem requires Ruby 2.7+ and Rails 5.1+. It might work with older versions of Rails though. You will also need to [setup a Lokalise account](https://app.lokalise.com/signup) and create a [translation project](https://docs.lokalise.com/en/articles/1400460-projects). Finally, you will need to generate a [read/write API token](https://docs.lokalise.com/en/articles/1929556-api-tokens) at your Lokalise profile.
+This gem requires Ruby 3.0+ and Rails 5.1+. It might work with older versions of Rails though. You will also need to [setup a Lokalise account](https://app.lokalise.com/signup) and create a [translation project](https://docs.lokalise.com/en/articles/1400460-projects). Finally, you will need to generate a [read/write API token](https://docs.lokalise.com/en/articles/1929556-api-tokens) at your Lokalise profile.
 
 Alternatively, you can utilize a token obtained via OAuth 2 flow. When using such a token, you'll have to set `:use_oauth2_token` option to `true` (please check [options docs](https://github.com/bodrovis/lokalise_manager#common-config) to learn more).
 
@@ -182,7 +184,7 @@ LokaliseRails::GlobalConfig.config do |c|
   ## c.translations_converter = ->(raw_data) { YAML.dump(raw_data).gsub(/\\\\n/, '\n') }
 
   ## Infer language ISO code for the translation file:
-  ## c.lang_iso_inferer = ->(data) { YAML.safe_load(data)&.keys&.first }
+  ## c.lang_iso_inferer = ->(data, _path) { YAML.safe_load(data)&.keys&.first }
 end
 ```
 

data/lib/generators/lokalise_rails/install_generator.rb

@@ -3,15 +3,22 @@
 require 'rails/generators'
 
 module LokaliseRails
-  # Generators for LokaliseRails
   module Generators
-    # Installs LokaliseRails config
+    # Generator that sets up the LokaliseRails configuration in a Rails application.
+    # It copies a predefined configuration template into the appropriate directory within the Rails application,
+    # making it easier for users to configure and use LokaliseRails.
     class InstallGenerator < Rails::Generators::Base
+      # Sets the directory containing the template files relative to this file's location.
       source_root File.expand_path('../templates', __dir__)
 
-      desc 'Creates a LokaliseRails config file.'
+      # Description of the generator's purpose, which is displayed in the Rails generators list.
+      desc 'Creates a LokaliseRails config file in your Rails application.'
 
+      # The primary method of this generator, responsible for copying the LokaliseRails configuration template
+      # from the gem to the Rails application's config directory. This is where users can customize
+      # their Lokalise settings.
       def copy_config
+        # Copies the configuration template to the Rails application's config directory.
         template 'lokalise_rails_config.rb', "#{Rails.root}/config/lokalise_rails.rb"
       end
     end

data/lib/generators/templates/lokalise_rails_config.rb

@@ -51,6 +51,6 @@ if defined?(LokaliseRails) && defined?(LokaliseRails::GlobalConfig)
     ## c.translations_converter = ->(raw_data) { YAML.dump(raw_data).gsub(/\\\\n/, '\n') }
 
     ## Infer language ISO code for the translation file:
-    ## c.lang_iso_inferer = ->(data) { YAML.safe_load(data)&.keys&.first }
+    ## c.lang_iso_inferer = ->(data, _path) { YAML.safe_load(data)&.keys&.first }
   end
 end

data/lib/lokalise_rails/global_config.rb

@@ -1,10 +1,17 @@
 # frozen_string_literal: true
 
 module LokaliseRails
-  # Global configuration, based on LokaliseManager config
+  # Inherits from LokaliseManager::GlobalConfig to provide a global configuration specific to the LokaliseRails gem.
+  # This class is primarily used to manage configuration settings that affect how the LokaliseRails gem operates
+  # within a Ruby on Rails application, particularly in managing locale paths.
   class GlobalConfig < LokaliseManager::GlobalConfig
     class << self
+      # Provides the path to the locales directory where translation files are stored. If not set explicitly,
+      # it defaults to the `config/locales` directory within the root of the application using this gem.
+      #
+      # @return [String] the path to the locales directory
       def locales_path
+        # If @locales_path is not set, it defaults to a path under the application's root directory.
         @locales_path || "#{LokaliseRails::Utils.root}/config/locales"
       end
     end

data/lib/lokalise_rails/railtie.rb

@@ -1,9 +1,18 @@
 # frozen_string_literal: true
 
 module LokaliseRails
-  # Load Rake tasks
+  # The Railtie class in Rails is used to extend Rails' functionality within an application, or in this case,
+  # a gem. This Railtie is specifically used to add custom Rake tasks from the
+  # LokaliseRails gem into the Rails application.
+  #
+  # It leverages Rails' Railtie architecture to ensure the Rake
+  # tasks are loaded when the application boots up and Rake is invoked.
   class Railtie < Rails::Railtie
+    # Register Rake tasks that are defined within this gem. This block is called by Rails during the initialization
+    # process and ensures that all Rake tasks specific to LokaliseRails are available to the application.
     rake_tasks do
+      # Loads the Rake tasks from a file located relative to this file. Ensure this file exists and contains
+      # valid Rake task definitions specifically tailored for Lokalise integration.
       load 'tasks/lokalise_rails_tasks.rake'
     end
   end

data/lib/lokalise_rails/utils.rb

@@ -6,16 +6,28 @@ module LokaliseRails
   # Util methods
   module Utils
     class << self
-      # Current project root
+      # Retrieves the root directory of the current project.
+      # It attempts to find the Rails root directory if Rails is loaded.
+      # If Rails is not present, it defaults to the current working directory of the process.
+      #
+      # @return [Pathname] A Pathname object pointing to the root directory of the project.
       def root
+        # Uses Pathname to create a robust path object from the rails_root or the current working directory.
         Pathname.new(rails_root || Dir.getwd)
       end
 
-      # Tries to get Rails root if Rails is defined
+      # Attempts to determine the root directory of a Rails
+      # project by checking the presence of Rails and its root method.
+      # If Rails is older and does not have the root method, it falls back to the RAILS_ROOT constant if defined.
+      #
+      # @return [String, nil] the path to the root directory if Rails is defined, or nil if it cannot be determined.
       def rails_root
+        # First, check if Rails.root is defined and return its path if available.
         return ::Rails.root.to_s if defined?(::Rails.root) && ::Rails.root
+        # Fallback to the RAILS_ROOT constant from older Rails versions.
         return RAILS_ROOT.to_s if defined?(RAILS_ROOT)
 
+        # Returns nil if none of the above are defined, indicating Rails is not present.
         nil
       end
     end

data/lib/lokalise_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LokaliseRails
-  VERSION = '6.0.0'
+  VERSION = '7.0.1'
 end

data/lib/lokalise_rails.rb

@@ -3,14 +3,19 @@
 require 'zeitwerk'
 require 'lokalise_manager'
 
+# Configure Zeitwerk loader specific for gem environments. This loader is set up to ignore certain files
+# that should not be autoloaded, such as Rails-specific files or templates which are not part of the main load path.
 loader = Zeitwerk::Loader.for_gem
-loader.ignore "#{__dir__}/lokalise_rails/railtie.rb"
-loader.ignore "#{__dir__}/generators/templates/lokalise_rails_config.rb"
-loader.ignore "#{__dir__}/generators/lokalise_rails/install_generator.rb"
+loader.ignore "#{__dir__}/lokalise_rails/railtie.rb" # Ignore the Railtie in non-Rails environments
+loader.ignore "#{__dir__}/generators/templates/lokalise_rails_config.rb"  # Ignore the generator templates
+loader.ignore "#{__dir__}/generators/lokalise_rails/install_generator.rb" # Ignore installation generator scripts
 loader.setup
 
-# Main LokaliseRails module
+# Main module for the LokaliseRails gem. This module serves as the namespace for all components
+# related to the LokaliseRails integration. It provides a structured way to manage translations
+# through the Lokalise platform within Ruby on Rails applications.
 module LokaliseRails
 end
 
+# Require the Railtie only if Rails is defined to integrate with Rails without manual configuration.
 require_relative 'lokalise_rails/railtie' if defined?(Rails)

data/lib/tasks/lokalise_rails_tasks.rake

@@ -2,22 +2,33 @@
 
 require 'rake'
 require 'lokalise_rails'
+# Loads the configuration settings from the lokalise_rails configuration file within the Rails project.
 require "#{LokaliseRails::Utils.root}/config/lokalise_rails"
 
+# Namespace for Rake tasks related to the LokaliseRails gem.
+# These tasks facilitate the synchronization of localization files between the Rails project and the Lokalise platform.
 namespace :lokalise_rails do
+  # Imports translation files from Lokalise and integrates them into the current Rails project.
+  # This task utilizes the LokaliseManager to handle the import process according to the configuration specified
+  # in the GlobalConfig class.
   desc 'Imports translation files from Lokalise to the current Rails project'
   task :import do
     importer = LokaliseManager.importer({}, LokaliseRails::GlobalConfig)
     importer.import!
   rescue StandardError => e
-    abort e.inspect
+    # Aborts the task and prints the error message.
+    # Ensures that any exceptions raised during import are handled gracefully.
+    abort "Import failed: #{e.message}"
   end
 
+  # Exports translation files from the current Rails project to Lokalise.
+  # Similar to the import task, it leverages the LokaliseManager and uses the GlobalConfig for configuration settings.
   desc 'Exports translation files from the current Rails project to Lokalise'
   task :export do
     exporter = LokaliseManager.exporter({}, LokaliseRails::GlobalConfig)
     exporter.export!
   rescue StandardError => e
-    abort e.inspect
+    # Aborts the task and prints the error message. Provides clear feedback on why the export failed.
+    abort "Export failed: #{e.message}"
   end
 end

data/lokalise_rails.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage              = 'https://github.com/bodrovis/lokalise_rails'
   spec.license               = 'MIT'
   spec.platform              = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0'
 
   spec.files = Dir['README.md', 'LICENSE',
                    'CHANGELOG.md', 'lib/**/*.rb',
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md']
   spec.require_paths    = ['lib']
 
-  spec.add_dependency 'lokalise_manager', '~> 4.0'
+  spec.add_dependency 'lokalise_manager', '~> 5.0'
   spec.add_dependency 'zeitwerk', '~> 2.4'
 
   spec.metadata = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokalise_rails
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Ilya Krukowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lokalise_manager
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -77,14 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Lokalise integration for Ruby on Rails