awesome_translations 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55dac9259ef0eb5ae536764f8bd14c5df32277491c8aa478ee9160bef11efe2c
-  data.tar.gz: a74978683d4b38c71c3917d0c9e85ae7a11e28e177a0d941908fea9eabed0135
+  metadata.gz: 8982155c60a5db849fe01b8007859a18edf3efb1895417bfef73e4dd525a317e
+  data.tar.gz: 58e47453d01189a483d665074ab374e770dd8fd1d96878626bbae5de64bcb0a4
 SHA512:
-  metadata.gz: 0b16c21783bffaf2205e929161bd289649a7f312bc16c670207a165f54e4287779a01873b19dab6dc925ae6d867fbf8c50a7a00b19cf22b7b134a054369a7090
-  data.tar.gz: 2ded14bda849ec6ddaa405bc74469c821e45744c805ac5766f4ea5f66c05663212009e72605df0ce6b9f92959b20319e33f8c69a4c67cdbf33f37849623f57d1
+  metadata.gz: 87904a819f4834458e15cf6c0d470104e2dbb380d9a5cbef0b3d31eb560905b395c0ae0cc7e767f430819ce2766d661f9d2d347b7830397546ca1e89e47dba9f
+  data.tar.gz: 91964d3d6c9916fe493d596f554792e2fa29c6eed492546123fc9483cc0496d780d1d51d22adde6de5513c95da56e98c6f59f67e829f05fa388749a408f44579

data/app/models/awesome_translations/translated_value.rb

@@ -37,7 +37,7 @@ class AwesomeTranslations::TranslatedValue
   def save!
     dir = File.dirname(@file)
     FileUtils.mkdir_p(dir) unless File.exist?(dir)
-    File.open(@file, "w") { |fp| fp.write("#{@locale}:\n") } unless File.exist?(@file)
+    File.write(@file, "#{@locale}:\n") unless File.exist?(@file)
 
     translations = YAML.safe_load(File.read(@file))
     translations ||= {}
@@ -48,7 +48,7 @@ class AwesomeTranslations::TranslatedValue
     update_models
 
     I18n.load_path << file unless I18n.load_path.include?(file)
-    File.open(file, "w") { |fp| fp.write(YAML.dump(translations)) }
+    File.write(file, YAML.dump(translations))
   end
 
 private

data/lib/awesome_translations/controller_translate_functionality.rb

@@ -7,8 +7,8 @@ module AwesomeTranslations::ControllerTranslateFunctionality
   end
 
   module Methods
-    def controller_t(key, args = {}, &blk)
-      AwesomeTranslations::GlobalTranslator.translate(key, translation_args: [args], caller_number: 1, action_in_key: false, &blk)
+    def controller_t(key, *args, **opts, &blk)
+      AwesomeTranslations::GlobalTranslator.translate(key, action_in_key: false, caller_number: 1, translation_args: args, translation_opts: opts, &blk)
     end
   end
 end

data/lib/awesome_translations/erb_inspector/translation_inspector.rb

@@ -92,7 +92,7 @@ private
   def generate_dir
     parts = %w[config locales awesome_translations]
 
-    key_parts = @full_key.split(".").reject(&:blank?)
+    key_parts = @full_key.split(".").compact_blank
     key_parts.pop
 
     @dir = Rails.root.join(*(parts + key_parts)).to_s

data/lib/awesome_translations/global_translator.rb

@@ -37,7 +37,7 @@ class AwesomeTranslations::GlobalTranslator
       @key = translation_key
     end
 
-    I18n.t(@key, *args[:translation_args], &blk)
+    I18n.t(@key, *args[:translation_args], **args[:translation_opts], &blk)
   end
 
 private

data/lib/awesome_translations/model_inspector.rb

@@ -36,13 +36,13 @@ class AwesomeTranslations::ModelInspector
   end
 
   def paperclip_attachments(&blk)
-    return unless ::Kernel.const_defined?("Paperclip")
+    return unless ::Kernel.const_defined?(:Paperclip)
 
     Paperclip::AttachmentRegistry.names_for(@clazz, &blk)
   end
 
   def money_attributes
-    return if !::Kernel.const_defined?("Money") || !@clazz.respond_to?(:monetized_attributes)
+    return if !::Kernel.const_defined?(:Money) || !@clazz.respond_to?(:monetized_attributes)
 
     @clazz.monetized_attributes.each do |attribute|
       yield attribute[0].to_s
@@ -50,7 +50,7 @@ class AwesomeTranslations::ModelInspector
   end
 
   def globalize_attributes
-    return if !::Kernel.const_defined?("Globalize") || !@clazz.respond_to?(:translated_attribute_names)
+    return if !::Kernel.const_defined?(:Globalize) || !@clazz.respond_to?(:translated_attribute_names)
 
     @clazz.translated_attribute_names.each do |attribute|
       yield attribute.to_s
@@ -96,7 +96,7 @@ class AwesomeTranslations::ModelInspector
     @scanned[clazz.name] = true
 
     clazz.subclasses.each do |subclass|
-      blk.call ::AwesomeTranslations::ModelInspector.new(subclass)
+      yield ::AwesomeTranslations::ModelInspector.new(subclass)
       find_subclasses(subclass, &blk)
     end
   end

data/lib/awesome_translations/object_extensions.rb

@@ -1,5 +1,5 @@
 module AwesomeTranslations::ObjectExtensions
-  def t(key, *args, &blk)
-    AwesomeTranslations::GlobalTranslator.translate(key, caller_number: 1, translation_args: args, &blk)
+  def t(key, *args, **opts, &blk)
+    AwesomeTranslations::GlobalTranslator.translate(key, caller_number: 1, translation_args: args, translation_opts: opts, &blk)
   end
 end

data/lib/awesome_translations/translation_migrator.rb

@@ -34,14 +34,14 @@ class AwesomeTranslations::TranslationMigrator
 
     if @new_path
       FileUtils.mkdir_p(File.dirname(@new_path))
-      File.open(@new_path, "w") { |fp| fp.write(YAML.dump(new_translations_hash)) }
+      File.write(@new_path, YAML.dump(new_translations_hash))
     end
 
     if translations_hash.empty?
       I18n.load_path.delete(@old_path)
       File.unlink(@old_path)
     else
-      File.open(@old_path, "w") { |fp| fp.write(YAML.dump(translations_hash)) }
+      File.write(@old_path, YAML.dump(translations_hash))
     end
 
     @translation_value.update!(file_path: @new_path) if @new_path

data/lib/awesome_translations/version.rb

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

data/lib/tasks/awesome_translations_tasks.rake

@@ -22,7 +22,4 @@ namespace :awesome_translations do
       end
     end
   end
-
-  task "update" => :environment do
-  end
 end

data/spec/controllers/handlers_controller_spec.rb

@@ -12,7 +12,7 @@ describe AwesomeTranslations::HandlersController do
   describe "#index" do
     it "renders the page" do
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
@@ -20,7 +20,7 @@ describe AwesomeTranslations::HandlersController do
     it "renders the page" do
       AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
       get :show, params: {id: "model_handler"}
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it "filters with missing translations" do
@@ -32,7 +32,7 @@ describe AwesomeTranslations::HandlersController do
 
       expect(all_groups.length).to be > groups.length
       expect(groups.length).to eq 5
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/controllers/users_controller_spec.rb

@@ -5,8 +5,10 @@ describe UsersController do
 
   render_views
 
-  before do
-    I18n.locale = :en
+  around do |example|
+    I18n.with_locale(:en) do
+      example.call
+    end
   end
 
   it "#update" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -5,15 +5,11 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  before_action :set_locale
+  around_action :with_locale
 
 private
 
-  def set_locale
-    if session[:locale]
-      I18n.locale = session[:locale]
-    else
-      I18n.locale = :en
-    end
+  def with_locale(&blk)
+    I18n.with_locale(session[:locale] || :en, &blk)
   end
 end

data/spec/dummy/app/models/role.rb

@@ -1,10 +1,7 @@
 class Role < ApplicationRecord
   translates :name
-
   belongs_to :user
-
-  validates :user, :role, presence: true
-
+  validates :role, presence: true
   monetize :price_cents, allow_nil: true
 
   def self.roles

data/spec/dummy/log/development.log

@@ -0,0 +1,52 @@
+   (1.0ms)  SELECT sqlite_version(*)
+   (0.1ms)  SELECT sqlite_version(*)
+   (0.1ms)  DROP TABLE IF EXISTS "roles"
+   (5.0ms)  CREATE TABLE "roles" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "role" varchar, "price_cents" integer)
+   (2.9ms)  CREATE INDEX "index_roles_on_user_id" ON "roles" ("user_id")
+   (0.1ms)  DROP TABLE IF EXISTS "users"
+   (2.8ms)  CREATE TABLE "users" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar, "password" varchar, "age" integer)
+   (2.8ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (2.4ms)  INSERT INTO "schema_migrations" (version) VALUES (20150607110245)
+   (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES
+(20141018081559),
+(20141018081640);
+
+
+   (2.4ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL)
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2021-12-30 16:01:09.444330"], ["updated_at", "2021-12-30 16:01:09.444330"]]
+  TRANSACTION (1.9ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "schema_sha1"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "schema_sha1"], ["value", "2fb15a187a8db3fd34877067601f82a165001b33"], ["created_at", "2021-12-30 16:01:09.448757"], ["updated_at", "2021-12-30 16:01:09.448757"]]
+  TRANSACTION (1.8ms)  commit transaction
+   (0.1ms)  SELECT sqlite_version(*)
+   (0.1ms)  DROP TABLE IF EXISTS "roles"
+   (2.5ms)  CREATE TABLE "roles" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "role" varchar, "price_cents" integer)
+   (2.3ms)  CREATE INDEX "index_roles_on_user_id" ON "roles" ("user_id")
+   (0.1ms)  DROP TABLE IF EXISTS "users"
+   (2.6ms)  CREATE TABLE "users" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar, "password" varchar, "age" integer)
+   (2.3ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES (20150607110245)
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES
+(20141018081559),
+(20141018081640);
+
+
+   (2.4ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime(6) NOT NULL, "updated_at" datetime(6) NOT NULL)
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2021-12-30 16:01:09.471093"], ["updated_at", "2021-12-30 16:01:09.471093"]]
+  TRANSACTION (1.7ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Update (0.2ms)  UPDATE "ar_internal_metadata" SET "value" = ?, "updated_at" = ? WHERE "ar_internal_metadata"."key" = ?  [["value", "test"], ["updated_at", "2021-12-30 16:01:09.474305"], ["key", "environment"]]
+  TRANSACTION (1.7ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "schema_sha1"], ["LIMIT", 1]]
+  TRANSACTION (0.0ms)  begin transaction
+  ActiveRecord::InternalMetadata Create (0.2ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "schema_sha1"], ["value", "2fb15a187a8db3fd34877067601f82a165001b33"], ["created_at", "2021-12-30 16:01:09.477396"], ["updated_at", "2021-12-30 16:01:09.477396"]]
+  TRANSACTION (1.8ms)  commit transaction