From 18a063a780c05fc3eeda86373191044341928f77 Mon Sep 17 00:00:00 2001 From: miks Date: Tue, 11 Oct 2016 18:35:52 +0300 Subject: [PATCH] Remove "create_default" option for i18n backend --- .../builders/releaf/builders/form_builder.rb | 2 +- .../refused_destroy_dialog_builder.rb | 2 +- .../builders/releaf/builders/table_builder.rb | 2 +- .../releaf/builders/form_builder_spec.rb | 2 +- .../releaf/builders/table_builder_spec.rb | 4 ++-- .../lib/releaf/i18n_database/backend.rb | 9 ------- .../spec/features/translations_spec.rb | 16 ------------- .../lib/releaf/i18n_database/backend_spec.rb | 24 ------------------- 8 files changed, 6 insertions(+), 55 deletions(-) diff --git a/releaf-core/app/builders/releaf/builders/form_builder.rb b/releaf-core/app/builders/releaf/builders/form_builder.rb index 6593bc880..5c52ed9b3 100644 --- a/releaf-core/app/builders/releaf/builders/form_builder.rb +++ b/releaf-core/app/builders/releaf/builders/form_builder.rb @@ -100,7 +100,7 @@ def input_attributes(_name, attributes, _options) end def translate_attribute(attribute) - object.class.human_attribute_name(attribute, create_default: false) + object.class.human_attribute_name(attribute) end def association_collection(reflector) diff --git a/releaf-core/app/builders/releaf/builders/refused_destroy_dialog_builder.rb b/releaf-core/app/builders/releaf/builders/refused_destroy_dialog_builder.rb index 86062a623..25bd57d1e 100644 --- a/releaf-core/app/builders/releaf/builders/refused_destroy_dialog_builder.rb +++ b/releaf-core/app/builders/releaf/builders/refused_destroy_dialog_builder.rb @@ -23,7 +23,7 @@ def restricted_relations end def relation_description(relation, key) - "#{resource.class.human_attribute_name(key, create_default: false)} (#{relation[:objects].count})" + "#{resource.class.human_attribute_name(key)} (#{relation[:objects].count})" end def relation_objects(relation) diff --git a/releaf-core/app/builders/releaf/builders/table_builder.rb b/releaf-core/app/builders/releaf/builders/table_builder.rb index 3a2acab54..ff2f1dc12 100644 --- a/releaf-core/app/builders/releaf/builders/table_builder.rb +++ b/releaf-core/app/builders/releaf/builders/table_builder.rb @@ -73,7 +73,7 @@ def head_cell(column) def head_cell_content(column) unless column.to_sym == :toolbox attribute = column.to_s.tr(".", "_") - resource_class.human_attribute_name(attribute, create_default: false) + resource_class.human_attribute_name(attribute) end end diff --git a/releaf-core/spec/builders/releaf/builders/form_builder_spec.rb b/releaf-core/spec/builders/releaf/builders/form_builder_spec.rb index fa7550740..9f040c25c 100644 --- a/releaf-core/spec/builders/releaf/builders/form_builder_spec.rb +++ b/releaf-core/spec/builders/releaf/builders/form_builder_spec.rb @@ -221,7 +221,7 @@ class FormBuilderTestHelper < ActionView::Base describe "#translate_attribute" do it "translates given attribute within object translation scope" do - allow(object.class).to receive(:human_attribute_name).with("x", create_default: false).and_return("z") + allow(object.class).to receive(:human_attribute_name).with("x").and_return("z") expect(subject.translate_attribute("x")).to eq("z") end end diff --git a/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb b/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb index 66773ffbf..dc066f1a4 100644 --- a/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb +++ b/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb @@ -196,12 +196,12 @@ def custom_title(resource); end describe "#head_cell_content" do it "returns translated column scoped to resource class attributes" do - allow(resource_class).to receive(:human_attribute_name).with("some_long_name", create_default: false).and_return("Taittls") + allow(resource_class).to receive(:human_attribute_name).with("some_long_name").and_return("Taittls") expect(subject.head_cell_content("some_long_name")).to eq('Taittls') end it "casts given column to string" do - allow(resource_class).to receive(:human_attribute_name).with("title", create_default: false).and_return("Taittls") + allow(resource_class).to receive(:human_attribute_name).with("title",).and_return("Taittls") expect(subject.head_cell_content(:title)).to eq('Taittls') end diff --git a/releaf-i18n_database/lib/releaf/i18n_database/backend.rb b/releaf-i18n_database/lib/releaf/i18n_database/backend.rb index e37acdfc8..93c4afbf7 100644 --- a/releaf-i18n_database/lib/releaf/i18n_database/backend.rb +++ b/releaf-i18n_database/lib/releaf/i18n_database/backend.rb @@ -64,15 +64,6 @@ def lookup(locale, key, scope = [], options = {}) result end - - def default(locale, object, subject, options = {}) - if options[:create_default] == false - options = options.except(:create_default) - options[:create_missing] = false - end - - super - end end end end diff --git a/releaf-i18n_database/spec/features/translations_spec.rb b/releaf-i18n_database/spec/features/translations_spec.rb index 53927d244..5f6cf5203 100644 --- a/releaf-i18n_database/spec/features/translations_spec.rb +++ b/releaf-i18n_database/spec/features/translations_spec.rb @@ -258,22 +258,6 @@ end end - context "when translation has default" do - context "when default creation is disabled" do - it "creates base translation" do - expect{ I18n.t("xxx.test.mest", default: :"xxx.mest", create_default: false) }.to change{ Releaf::I18nDatabase::I18nEntry.pluck(:key) } - .to(["xxx.test.mest"]) - end - end - - context "when default creation is not disabled" do - it "creates base and default translations" do - expect{ I18n.t("xxx.test.mest", default: :"xxx.mest") }.to change{ Releaf::I18nDatabase::I18nEntry.pluck(:key) } - .to(match_array(["xxx.mest", "xxx.test.mest"])) - end - end - end - context "in parent scope" do context "nonexistent translation in given scope" do it "uses parent scope" do diff --git a/releaf-i18n_database/spec/lib/releaf/i18n_database/backend_spec.rb b/releaf-i18n_database/spec/lib/releaf/i18n_database/backend_spec.rb index 5461a018f..1544ec78d 100644 --- a/releaf-i18n_database/spec/lib/releaf/i18n_database/backend_spec.rb +++ b/releaf-i18n_database/spec/lib/releaf/i18n_database/backend_spec.rb @@ -60,30 +60,6 @@ end end - describe "#default" do - context "when `create_default: false` option exists" do - it "adds `create_default: true` option and remove `create_default` option" do - expect(subject).to receive(:resolve).with("en", "aa", "bb", count: 1, fallback: true, create_missing: false) - subject.send(:default, "en", "aa", "bb", count:1, default: "xxx", fallback: true, create_default: false, create_missing: false) - end - - it "does not change given options" do - options = {count:1, default: "xxx", fallback: true, create_default: false} - expect{ subject.send(:default, "en", "aa", "bb", options) }.to_not change{ options } - end - end - - context "when `create_default: false` option does not exists" do - it "does not modify options" do - expect(subject).to receive(:resolve).with("en", "aa", "bb", count: 1, fallback: true) - subject.send(:default, "en", "aa", "bb", count:1, default: "xxx", fallback: true) - - expect(subject).to receive(:resolve).with("en", "aa", "bb", count: 1, fallback: true, create_default: true) - subject.send(:default, "en", "aa", "bb", count:1, default: "xxx", fallback: true, create_default: true) - end - end - end - describe ".translations_updated_at" do it "returns translations updated_at from cached settings" do allow(Releaf::Settings).to receive(:[]).with(described_class::UPDATED_AT_KEY).and_return("x")