awesome_translations 0.0.59 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630fd6805a59fe0e501a01e85fec405e0c74e969334a64183fd5e001a2a86f19
-  data.tar.gz: c3e9fc60d2af9574536759378db9891ba6bb6297696e79357280f1fc2feddddc
+  metadata.gz: 55dac9259ef0eb5ae536764f8bd14c5df32277491c8aa478ee9160bef11efe2c
+  data.tar.gz: a74978683d4b38c71c3917d0c9e85ae7a11e28e177a0d941908fea9eabed0135
 SHA512:
-  metadata.gz: 37c3afd48491b25cebe63b263454e32845548c1aca9ddcc6a9cadbfb1a116ce8aa74899a8084ab74770ab639ed01287fb91d1ca6e9913d3ef29fba845fe53325
-  data.tar.gz: 7b612ecd73272de814ca2725fc10693468811ffddf6601f572da56718078b1f108ce3a7b7682ac05eafc4257a3b0a860f7eb6efa36c3c36fa304171a8f0375ff
+  metadata.gz: 0b16c21783bffaf2205e929161bd289649a7f312bc16c670207a165f54e4287779a01873b19dab6dc925ae6d867fbf8c50a7a00b19cf22b7b134a054369a7090
+  data.tar.gz: 2ded14bda849ec6ddaa405bc74469c821e45744c805ac5766f4ea5f66c05663212009e72605df0ce6b9f92959b20319e33f8c69a4c67cdbf33f37849623f57d1

data/app/controllers/awesome_translations/clean_ups_controller.rb

@@ -26,7 +26,7 @@ private
       .joins(:translation_key)
       .includes(:translation_key)
       .joins("LEFT JOIN handler_translations ON handler_translations.translation_key_id = translation_keys.id")
-      .where("handler_translations.id IS NULL")
+      .where(handler_translations: {id: nil})
       .where("translation_values.file_path LIKE '%/config/locales/awesome_translations/%'")
   end
 end

data/lib/awesome_translations/cache_database_generator/group.rb

@@ -3,8 +3,15 @@ class AwesomeTranslations::CacheDatabaseGenerator::Group < BazaModels::Model
 
   belongs_to :handler, class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
 
-  has_many :handler_translations, dependent: :destroy, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
-  has_many :translation_keys, dependent: :destroy, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+  has_many :handler_translations,
+    dependent: :destroy,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
+
+  has_many :translation_keys,
+    dependent: :destroy,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :name, :handler
 

data/lib/awesome_translations/cache_database_generator/handler.rb

@@ -1,6 +1,13 @@
 class AwesomeTranslations::CacheDatabaseGenerator::Handler < BazaModels::Model
-  has_many :groups, dependent: :destroy, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
-  has_many :handler_translations, dependent: :destroy, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
+  has_many :groups,
+    dependent: :destroy,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
+
+  has_many :handler_translations,
+    dependent: :destroy,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
 
   validates_presence_of :name
 

data/lib/awesome_translations/cache_database_generator/handler_translation.rb

@@ -1,7 +1,15 @@
 class AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation < BazaModels::Model
-  belongs_to :group, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
-  belongs_to :handler, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
-  belongs_to :translation_key, foreign_key: "translation_key_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+  belongs_to :group,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
+
+  belongs_to :handler,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
+
+  belongs_to :translation_key,
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :handler, :translation_key
 

data/lib/awesome_translations/cache_database_generator/translation_key.rb

@@ -1,15 +1,15 @@
 class AwesomeTranslations::CacheDatabaseGenerator::TranslationKey < BazaModels::Model
-  belongs_to :group, foreign_key: "group_id"
-  belongs_to :handler, foreign_key: "handler_id"
+  belongs_to :group, foreign_key: "group_id" # rubocop:disable Rails/RedundantForeignKey
+  belongs_to :handler, foreign_key: "handler_id" # rubocop:disable Rails/RedundantForeignKey
 
   has_many :handler_translations,
     dependent: :destroy,
-    foreign_key: "translation_key_id",
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
     class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
 
   has_many :translation_values,
     dependent: :destroy,
-    foreign_key: "translation_key_id",
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
     class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationValue"
 
   validates_presence_of :group, :handler

data/lib/awesome_translations/cache_database_generator/translation_value.rb

@@ -1,5 +1,7 @@
 class AwesomeTranslations::CacheDatabaseGenerator::TranslationValue < BazaModels::Model
-  belongs_to :translation_key, foreign_key: "translation_key_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+  belongs_to :translation_key,
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :translation_key
 

data/lib/awesome_translations/erb_inspector/file_inspector.rb

@@ -50,19 +50,19 @@ class AwesomeTranslations::ErbInspector::FileInspector
 private
 
   def parse_content_liquid(line_no, line, translations_found, yielder)
-    line.scan(/\"([^\"]+?)\"\s+\|\s+t\s*(\%}|\}\}|\|)/) do |match|
+    line.scan(/"([^"]+?)"\s+\|\s+t\s*(%}|\}\}|\|)/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/\'([^\']+?)\'\s+\|\s+t\s*(\%}|\}\}|\|)/) do |match|
+    line.scan(/'([^']+?)'\s+\|\s+t\s*(%}|\}\}|\|)/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/\"([^\"]+?)\"\s+\|\s+val:\s*\"([^\"]+?)\"\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
+    line.scan(/"([^"]+?)"\s+\|\s+val:\s*"([^"]+?)"\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/'([^\"]+?)'\s+\|\s+val:\s*'([^\"]+?)'\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
+    line.scan(/'([^"]+?)'\s+\|\s+val:\s*'([^"]+?)'\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
   end

data/lib/awesome_translations/erb_inspector/translation_inspector.rb

@@ -27,7 +27,7 @@ class AwesomeTranslations::ErbInspector::TranslationInspector
   end
 
   def global?
-    !relative? && !key.include?(".")
+    !relative? && key.exclude?(".")
   end
 
   def relative?
@@ -49,16 +49,16 @@ private
         is_mailer = true
       elsif @full_key.start_with?("app/views/")
         # Remove "app/views" from view-translations since that doesn't get used in keys.
-        @full_key.gsub!(/\Aapp\/views\//, "")
+        @full_key.delete_prefix!("app/views/")
       elsif @full_key.start_with?("app/controllers")
         # Remove "app/controllers" from controller-translations since that doesn't get used in keys.
         @full_key.gsub!(/\Aapp\/controllers(\/?)/, "")
         is_controller = true
       elsif @full_key.start_with?("app/cells")
-        @full_key.gsub!(/\Aapp\/cells\//, "")
+        @full_key.delete_prefix!("app/cells/")
       elsif @full_key.start_with?("app/")
         # Remove "app" from controller- and helper-translations since that doesn't get used.
-        @full_key.gsub!(/\Aapp\//, "")
+        @full_key.delete_prefix!("app/")
       end
 
       @full_key.tr!("/", ".")
@@ -66,7 +66,7 @@ private
       @full_key << file_key(@file_path)
       @full_key << ".#{@last_method}" if (is_mailer || is_controller) && @last_method && @method != "controller_t"
       @full_key << "."
-      @full_key << @key.gsub(/\A\./, "")
+      @full_key << @key.delete_prefix(".")
     elsif @method == "I18n-js.t" || @method == "t" || @method == "helper_t" || @method == "controller_t"
       @full_key = @key
     else
@@ -81,10 +81,10 @@ private
     key = key.match(/\A(.+?)\./)[1]
 
     # Remove leading "_" from partials
-    key = key.gsub(/\A_/, "")
+    key.delete_prefix!("_")
 
     # Remove '_controller' from controllers
-    key = key.gsub(/_controller\Z/, "")
+    key.delete_suffix!("_controller")
 
     key
   end

data/lib/awesome_translations/global_translator.rb

@@ -45,8 +45,8 @@ private
   def dir
     if @_dir.nil?
       @_dir = File.dirname(previous_file)
-      @_dir = @_dir.gsub(/\A#{Regexp.escape(Rails.root.to_s)}\//, "")
-      @_dir = @_dir.gsub(/\Aspec\/dummy\//, "")
+      @_dir.delete_prefix!("#{Rails.root}/") # rubocop:disable Rails/FilePath
+      @_dir.delete_prefix!("spec/dummy/")
 
       if @_dir.starts_with?("app/controllers")
         @_dir = @_dir.gsub(/\Aapp\/controllers(\/?)/, "")
@@ -54,7 +54,7 @@ private
       elsif @_dir.starts_with?("app/views")
         @_dir = @_dir.gsub(/\Aapp\/views(\/?)/, "")
       elsif @_dir.starts_with?("app/")
-        @_dir = @_dir.gsub(/\Aapp\//, "")
+        @_dir.delete_prefix!("app/")
       end
     end
 
@@ -95,7 +95,7 @@ private
 
   def translation_key
     translation_key = dir
-    translation_key = translation_key.gsub(/\Aapp\//, "")
+    translation_key = translation_key.delete_prefix("app/")
     translation_key << "/#{file}"
 
     key_parts = translation_key.split("/")

data/lib/awesome_translations/handlers/validations_handler.rb

@@ -23,11 +23,11 @@ class AwesomeTranslations::Handlers::ValidationsHandler < AwesomeTranslations::H
             translations_for_format_validator(validator, model_inspector, attribute_name, yielder)
           elsif validator.is_a?(ActiveRecord::Validations::UniquenessValidator)
             translations_for_uniqueness_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "ActiveRecord::Validations::PresenceValidator"
+          elsif validator.class.name == "ActiveRecord::Validations::PresenceValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_presence_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "EmailValidator"
+          elsif validator.class.name == "EmailValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_email_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "ActiveModel::Validations::ConfirmationValidator"
+          elsif validator.class.name == "ActiveModel::Validations::ConfirmationValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_confirmation_validator(validator, model_inspector, attribute_name, yielder)
           else
             Rails.logger.error "Unhandeled validator: #{validator.class.name}"

data/lib/awesome_translations/model_inspector.rb

@@ -2,6 +2,7 @@ class AwesomeTranslations::ModelInspector
   autoload :Attribute, "#{File.dirname(__FILE__)}/model_inspector/attribute"
 
   attr_reader :clazz
+
   cattr_accessor :models_loaded
 
   # Yields a model-inspector for each model found in the application.
@@ -34,12 +35,10 @@ class AwesomeTranslations::ModelInspector
     end
   end
 
-  def paperclip_attachments
+  def paperclip_attachments(&blk)
     return unless ::Kernel.const_defined?("Paperclip")
 
-    Paperclip::AttachmentRegistry.names_for(@clazz).each do |name|
-      yield name
-    end
+    Paperclip::AttachmentRegistry.names_for(@clazz, &blk)
   end
 
   def money_attributes
@@ -75,10 +74,8 @@ class AwesomeTranslations::ModelInspector
   end
 
   # TODO: Maybe this should yield a ModelInspector::Relationship instead?
-  def relationships
-    @clazz.reflections.each do |key, reflection|
-      yield key, reflection
-    end
+  def relationships(&blk)
+    @clazz.reflections.each(&blk)
   end
 
   def attribute_key(attribute_name)
@@ -138,6 +135,6 @@ class AwesomeTranslations::ModelInspector
   end
 
   def self.active_storage_path?(model_path)
-    model_path.match?(/\/gems\/activestorage-([\d\.]+)\//)
+    model_path.match?(/\/gems\/activestorage-([\d.]+)\//)
   end
 end

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.59".freeze
+  VERSION = "0.0.60".freeze
 end

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path("../config/environment", __FILE__)
+require ::File.expand_path("config/environment", __dir__)
 run Rails.application

data/spec/features/movals_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::MovalsController do
+describe AwesomeTranslations::MovalsController do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let!(:handler_translation) do
     create :handler_translation,
       translation_key: translation_key,
@@ -34,7 +34,7 @@ describe AwesomeTranslations::MovalsController do
     end
   end
 
-  describe "#index" do
+  describe "#index" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "renders the page and shows the correct results" do
       visit movals_path
 
@@ -49,7 +49,7 @@ describe AwesomeTranslations::MovalsController do
     end
   end
 
-  describe "#create" do
+  describe "#create" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "moves the checked translations to the right path" do
       visit movals_path
 

data/spec/handlers/file_handler_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe AwesomeTranslations::Handlers::FileHandler do
   let(:handler) { AwesomeTranslations::Handlers::FileHandler.new }
 
-  describe "erb stuff" do
+  describe "erb stuff" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     let(:users_index_group) { handler.groups.find { |group| group.name == "app/views/users/index.html.haml" } }
     let(:users_index_translations) { users_index_group.translations }
     let(:users_partial_test_translations) { handler.groups.find { |group| group.name == "app/views/users/_partial_test.html.erb" }.translations }
@@ -40,7 +40,7 @@ describe AwesomeTranslations::Handlers::FileHandler do
     end
   end
 
-  describe "library stuff" do
+  describe "library stuff" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     let(:group) { handler.groups.find { |group| group.name == "app/models/role.rb" } }
     let(:mailer_group) { handler.groups.find { |group| group.name == "app/mailers/my_mailer.rb" } }
     let(:subject_translation) { mailer_group.translations.find { |translation| translation.key == "my_mailer.mailer_action.custom_subject" } }

data/spec/handlers/model_handler_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::Handlers::ModelHandler do
+describe AwesomeTranslations::Handlers::ModelHandler do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:model_handler) { AwesomeTranslations::Handlers::ModelHandler.new }
   let(:groups) { model_handler.groups.to_a }
   let(:user_group) { model_handler.groups.detect { |group| group.name == "User" } }
@@ -12,7 +12,7 @@ describe AwesomeTranslations::Handlers::ModelHandler do
     expect(groups.length).to eq 5
   end
 
-  describe "#translations_for_group" do
+  describe "#translations_for_group" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "finds the right number of translations" do
       expect(user_group.translations.to_a.length).to eq 7
     end

data/spec/lib/erb_inspector/file_inspector_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::ErbInspector::FileInspector do
+describe AwesomeTranslations::ErbInspector::FileInspector do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:erb_inspector) do
     AwesomeTranslations::ErbInspector.new(
       dirs: [Rails.root.to_s]
@@ -15,7 +15,7 @@ describe AwesomeTranslations::ErbInspector::FileInspector do
   let(:user_index_translations) { user_index_inspector.translations.to_a }
   let(:hello_world_translation) { user_index_translations.find { |translation| translation.key == ".hello_world" } }
 
-  describe "#translations" do
+  describe "#translations" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "finds the right number of translations" do
       expect(user_index_translations.length).to eq 3
     end

data/spec/lib/erb_inspector/translation_inspector_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::ErbInspector::TranslationInspector do
+describe AwesomeTranslations::ErbInspector::TranslationInspector do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:erb_inspector) do
     AwesomeTranslations::ErbInspector.new(
       dirs: [Rails.root.to_s]