releaf-i18n_database 1.1.18 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cbb1320cffc7a77ad164a6e01e05529118081ff8b45e7ef56fe32a83635fa91
-  data.tar.gz: a4605bbb80ae8b36d31d40dbd7d10f846a3357807f90dc1cdee9840ec898a96c
+  metadata.gz: 26da56d1b3cb25df3efd5f142096f56eb3a0254b53c406a87d9093964524fa61
+  data.tar.gz: 86e216014dce28f62e0c48cf9bbcb70a82f2bd5bb71291678b2f745ae2fec9ef
 SHA512:
-  metadata.gz: 8be43fb29616b9cd5c65665418feb4b9dbc5ad980d4ed6e8e8694c89fbfef69de6189f5d6d99d335c72974acf4fa4a57184c69263d6bb586ee08fdfb879af935
-  data.tar.gz: c550e7b85c6c53cc111fc694a637eca396347674658e9561db3aeaf729e4c59cfa665fcc3560f87290217ef7598b88f2b67c8e7f0734c9afb0734476f3a5e22d
+  metadata.gz: 748958207fd580b1cc080ef73eb313114a4f0a9bdf1aa0a4e5e97191bac7f030998e2fb6f8fcefbf802e1a114102169e5d3ccec4965152f7cb12815781fb004e
+  data.tar.gz: f926dc8be53963f55a08346e7a0526cdd85689a6c1f5a5a9f7fee61ccb83084c576b6c9d957c37fc10b35db7b1ee9f01d885dbc63944c779ecddd3eabc0d07bc

data/app/assets/config/releaf_i18n_database_manifest.js

@@ -0,0 +1,2 @@
+//= link controllers/releaf/i18n_database/translations.css
+//= link controllers/releaf/i18n_database/translations.js

data/app/controllers/releaf/i18n_database/translations_controller.rb

@@ -152,7 +152,7 @@ class Releaf::I18nDatabase::TranslationsController < ::Releaf::ActionController
   end
 
   def export_file_name
-    "#{Rails.application.class.parent_name.underscore}_translations_#{Time.now.strftime('%Y_%m_%d_%H_%M_%S')}.xlsx"
+    "#{Rails.application.class.module_parent_name.underscore}_translations_#{Time.now.strftime('%Y_%m_%d_%H_%M_%S')}.xlsx"
   end
 
   def import_file_path

data/app/lib/releaf/i18n_database/parse_spreadsheet_translations.rb

@@ -34,8 +34,8 @@ module Releaf::I18nDatabase
     end
 
     def file_format_error?(error_class_name, error_message)
-      return true if ['Zip::ZipError','Ole::Storage::FormatError' ].include?(error_class_name)
-      error_class_name == 'ArgumentError' && error_message.match("Don't know how to open file").present?
+      return true if ['Zip::Error','Ole::Storage::FormatError' ].include?(error_class_name)
+      error_class_name == 'ArgumentError' && error_message.match("Can't detect the type").present?
     end
 
     def translations

data/app/lib/releaf/i18n_database/translations_store.rb

@@ -68,7 +68,7 @@ class Releaf::I18nDatabase::TranslationsStore
     Releaf::I18nDatabase::I18nEntryTranslation
       .joins(:i18n_entry)
       .where.not(text: '')
-      .pluck("CONCAT(locale, '.', releaf_i18n_entries.key) AS translation_key", "text")
+      .pluck(Arel.sql("CONCAT(locale, '.', releaf_i18n_entries.key) AS translation_key"), "text")
       .to_h
   end
 

data/app/lib/releaf/i18n_database/translations_utilities.rb

@@ -13,7 +13,7 @@ module Releaf::I18nDatabase
         blank_where_collection = blank_where_collection.where(column.eq('').or(column.eq(nil)))
       end
 
-      collection.where(blank_where_collection.where_values.reduce(:or))
+      collection.where(blank_where_collection.where_clause.send(:predicates).reduce(:or))
     end
 
     def self.filter_by_text(collection, lookup_string)

data/app/models/releaf/i18n_database/i18n_entry.rb

@@ -3,7 +3,7 @@ module Releaf::I18nDatabase
     self.table_name = "releaf_i18n_entries"
 
     validates_presence_of :key
-    validates_uniqueness_of :key
+    validates_uniqueness_of :key, case_sensitive: true
     validates_length_of :key, maximum: 255
 
     has_many :i18n_entry_translation, dependent: :destroy,

data/app/views/releaf/i18n_database/translations/_form_fields.haml

@@ -14,7 +14,7 @@
         %input{type: "text", class: "text", name: "translations[][localizations][#{locale}]"}
     %td.delete-column.only-icon
       = releaf_button(nil, "times", class: %w(danger remove-nested-item), title: t("Remove", scope: controller_scope_name))
-%section.nested{data: {name: "translations", releaf: {template: html_escape(template_html)}}}
+%section.nested{data: {name: "translations", releaf: {template: template_html.to_str}}}
   %table.table
     %thead
       %tr

data/lib/releaf-i18n_database.rb

@@ -1,4 +1,4 @@
-require 'axlsx_rails'
+require 'caxlsx_rails'
 require 'i18n'
 require 'rails-i18n'
 require 'roo'

data/lib/releaf/i18n_database/engine.rb

@@ -1,7 +1,7 @@
 module Releaf::I18nDatabase
   class Engine < ::Rails::Engine
-    initializer 'precompile', group: :all do |app|
-      app.config.assets.precompile += %w(controllers/releaf/i18n_database/*)
+    initializer 'releaf_i18n_database.assets_precompile', group: :all do |app|
+      app.config.assets.precompile << "releaf_i18n_database_manifest.js"
     end
   end
 end

data/spec/builders/translations/builder_common_spec.rb

@@ -5,7 +5,7 @@ describe Releaf::I18nDatabase::Translations::BuildersCommon, type: :class do
     include Releaf::I18nDatabase::Translations::BuildersCommon
   end
   class TableBuilderTestHelper < ActionView::Base; end
-  let(:template){ TableBuilderTestHelper.new }
+  let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:subject){ I18nBuildersCommonInheriter.new(template) }
 
   describe "#action_url" do

data/spec/builders/translations/edit_builder_spec.rb

@@ -4,7 +4,7 @@ describe Releaf::I18nDatabase::Translations::EditBuilder, type: :class do
   class TableBuilderTestHelper < ActionView::Base
     def protect_against_forgery?; end
   end
-  let(:template){ TableBuilderTestHelper.new }
+  let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:resource_class){ Releaf::I18nDatabase::Translation }
   let(:subject){ described_class.new(template) }
 
@@ -12,7 +12,7 @@ describe Releaf::I18nDatabase::Translations::EditBuilder, type: :class do
     it "returns section blocks wrapped within edit form" do
       allow(subject).to receive(:action_url).with(:update).and_return("update_url")
       allow(subject).to receive(:section_blocks).and_return(["a", "b"])
-      result = '<section><form action="update_url" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" />ab</form></section>'
+      result = '<section><form action="update_url" accept-charset="UTF-8" method="post">ab</form></section>'
       expect(subject.section).to eq(result)
     end
   end

data/spec/builders/translations/index_builder_spec.rb

@@ -15,7 +15,7 @@ describe Releaf::I18nDatabase::Translations::IndexBuilder, type: :class do
                       end
     end
   end
-  let(:template){ IndexBuilderTestHelper.new }
+  let(:template){ IndexBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:resource_class){ Releaf::I18nDatabase::Translation }
   let(:subject){ described_class.new(template) }
 
@@ -74,7 +74,7 @@ describe Releaf::I18nDatabase::Translations::IndexBuilder, type: :class do
   describe "#import_form" do
     it "returns import form" do
       allow(subject).to receive(:url_for).with(action: 'import').and_return("import_url")
-      result = "<form class=\"import\" enctype=\"multipart/form-data\" action=\"import_url\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"file\" name=\"import_file\" id=\"import_file\" /></form>"
+      result = "<form class=\"import\" enctype=\"multipart/form-data\" action=\"import_url\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"file\" name=\"import_file\" id=\"import_file\" /></form>"
       expect(subject.import_form).to eq(result)
     end
   end

data/spec/builders/translations/table_builder_spec.rb

@@ -2,7 +2,7 @@ require "rails_helper"
 
 describe Releaf::I18nDatabase::Translations::TableBuilder, type: :class do
   class TableBuilderTestHelper < ActionView::Base; end
-  let(:template){ TableBuilderTestHelper.new }
+  let(:template){ TableBuilderTestHelper.new(ActionView::LookupContext.new(nil), {}, nil) }
   let(:resource_class){ Releaf::I18nDatabase::I18nEntry }
   let(:subject){ described_class.new([], resource_class, template, {}) }
 

data/spec/controllers/i18n_backend/translations_controller_spec.rb

@@ -34,19 +34,19 @@ describe Releaf::I18nDatabase::TranslationsController do
 
     context "when searching" do
       it "searches by translation key" do
-        get :index, search: 'great'
+        get :index, params: {search: 'great'}
         expect( assigns(:collection).size ).to eq(1)
       end
 
       it "searched by localized values" do
-        get :index, search: 'manta'
+        get :index, params: {search: 'manta'}
         expect( assigns(:collection).size ).to eq(1)
       end
     end
 
     context "when searching blank translations" do
       it "returns translations that has blank translation in any localization" do
-        get :index, only_blank: 'true'
+        get :index, params: {only_blank: 'true'}
         expect( assigns(:collection).map(&:id) ).to match_array [@t1.id]
       end
     end
@@ -62,7 +62,7 @@ describe Releaf::I18nDatabase::TranslationsController do
 
     context "when search scope is given" do
       it "renders translations matching search pattern" do
-        get :index, search: 'stuff'
+        get :index, params: {search: 'stuff'}
         expect( assigns(:collection).size ).to eq(2)
       end
     end
@@ -72,12 +72,12 @@ describe Releaf::I18nDatabase::TranslationsController do
     context "when save successful" do
       it "updates translations updated_at" do
         expect(Releaf::I18nDatabase::Backend).to receive("translations_updated_at=").with(@time_now)
-        put :update, translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}]
+        put :update, params: {translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}]}
       end
 
       context "when save with import" do
         before do
-          put :update, translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}], import: "true"
+          put :update, params: {translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}], import: "true"}
         end
 
         it "redirects to index view" do
@@ -91,7 +91,7 @@ describe Releaf::I18nDatabase::TranslationsController do
 
       context "when save without import" do
         before do
-          put :update, translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}]
+          put :update, params: {translations: [{key: 'a.b.c', localizations: {en: 'test', lv: 'xxl'}}]}
         end
 
         it "redirects to edit view" do
@@ -106,12 +106,12 @@ describe Releaf::I18nDatabase::TranslationsController do
 
     context "when save failed" do
       it "renders edit view" do
-        put :update, translations: [{key: '', localizations: {en: 'test', lv: 'xxl'}}]
+        put :update, params: {translations: [{key: '', localizations: {en: 'test', lv: 'xxl'}}]}
         expect(response).to render_template(:edit)
       end
 
       it "flash error notification" do
-        put :update, translations: [{key: '', localizations: {en: 'test', lv: 'xxl'}}]
+        put :update, params: {translations: [{key: '', localizations: {en: 'test', lv: 'xxl'}}]}
         expect(flash["error"]).to eq("id" => "resource_status", "message" => "Update failed")
       end
     end
@@ -122,7 +122,7 @@ describe Releaf::I18nDatabase::TranslationsController do
       before do
         file = fixture_file_upload(File.expand_path('../../fixtures/translations_import.xlsx', __dir__),
                                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-        post :import, import_file: file
+        post :import, params: {import_file: file}
       end
 
       it "parses uploaded file and assigns content to collection" do

data/spec/features/translations_spec.rb

@@ -357,7 +357,7 @@ feature "Translations" do
 
           context "when positive create_plurals option passed" do
             it "creates pluralized translations for all Releaf locales" do
-              result = ["animals.horse.few", "animals.horse.many", "animals.horse.one", "animals.horse.other", "animals.horse.zero"]
+              result = ["animals.horse.one", "animals.horse.other", "animals.horse.zero"]
               expect{ I18n.t("animals.horse", count: 1, create_plurals: true) }.to change{ Releaf::I18nDatabase::I18nEntry.pluck(:key).sort }.
                 from([]).to(result.sort)
             end

data/spec/lib/releaf/i18n_database/backend_spec.rb

@@ -63,8 +63,10 @@ describe Releaf::I18nDatabase::Backend do
 
   describe ".locales_pluralizations" do
     it "returns array all pluralization forms for releaf locales" do
-      allow(Releaf.application.config).to receive(:all_locales).and_return([:de, :ru, :aasdsd])
-      allow(I18n).to receive(:locale_available?).and_return(true)
+      allow(Releaf.application.config).to receive(:all_locales).and_return([:de, :ru])
+      allow(I18n).to receive(:t).with(:'i18n.plural.keys', locale: :de).and_return([:one, :other])
+      allow(I18n).to receive(:t).with(:'i18n.plural.keys', locale: :ru).and_return([:one, :few, :many])
+
       expect(described_class.locales_pluralizations).to eq([:one, :other, :few, :many, :zero])
     end
   end

data/spec/lib/releaf/i18n_database/parse_spreadsheet_translations_spec.rb

@@ -3,7 +3,6 @@ require "rails_helper"
 describe Releaf::I18nDatabase::ParseSpreadsheetTranslations do
   let(:translation){ Releaf::I18nDatabase::I18nEntry.new }
   let(:fixture_path){ File.expand_path('../../../fixtures/translations_import.xlsx', __dir__) }
-  let(:error_message){ "Don't know how to open file #{fixture_path}" }
   subject{ described_class.new(file_path: fixture_path, extension: "xlsx") }
 
   describe "#call" do
@@ -82,9 +81,9 @@ describe Releaf::I18nDatabase::ParseSpreadsheetTranslations do
   describe "#file_format_error?" do
 
     context "when given error is an ArgumentError" do
-      context "when the message contains 'Don't know how to open file'" do
+      context "when the message contains 'Can't detect the type'" do
         it "returns true" do
-          expect(subject.file_format_error?("ArgumentError", error_message)).to be true
+          expect(subject.file_format_error?("ArgumentError", "Can't detect the type")).to be true
         end
       end
       context "when the message is different" do
@@ -94,9 +93,9 @@ describe Releaf::I18nDatabase::ParseSpreadsheetTranslations do
       end
     end
 
-    context "when the error is a Zip::ZipError" do
+    context "when the error is a Zip::Error" do
       it "returns true" do
-        expect(subject.file_format_error?("Zip::ZipError", "error message")).to be true
+        expect(subject.file_format_error?("Zip::Error", "error message")).to be true
       end
     end
 

data/spec/models/i18n_database/i18n_entry_spec.rb

@@ -3,7 +3,7 @@ require "rails_helper"
 describe Releaf::I18nDatabase::I18nEntry do
   it { is_expected.to validate_presence_of(:key) }
   it { is_expected.to validate_length_of(:key).is_at_most(255) }
-  it { is_expected.to validate_uniqueness_of(:key) }
+  it { subject.key = "a"; is_expected.to validate_uniqueness_of(:key) }
   it { is_expected.to have_many(:i18n_entry_translation).dependent(:destroy) }
   it { is_expected.to accept_nested_attributes_for(:i18n_entry_translation).allow_destroy(true) }
 

data/spec/models/i18n_database/i18n_entry_translation_spec.rb

@@ -4,6 +4,6 @@ describe Releaf::I18nDatabase::I18nEntryTranslation do
   it { is_expected.to validate_presence_of(:i18n_entry) }
   it { is_expected.to validate_presence_of(:locale) }
   it { is_expected.to validate_length_of(:locale).is_at_most(5) }
-  it { subject.locale = "de"; is_expected.to validate_uniqueness_of(:i18n_entry_id).scoped_to([:locale]) }
+  it { subject.locale = "de"; subject.i18n_entry_id = 1; is_expected.to validate_uniqueness_of(:i18n_entry_id).scoped_to([:locale]) }
   it { is_expected.to belong_to(:i18n_entry) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-i18n_database
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 2.0.0
 platform: ruby
 authors:
 - CubeSystems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.18
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.18
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: axlsx_rails
+  name: caxlsx_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- app/assets/config/releaf_i18n_database_manifest.js
 - app/assets/javascripts/controllers/releaf/i18n_database/translations.js
 - app/assets/stylesheets/controllers/releaf/i18n_database/translations.scss
 - app/builders/releaf/i18n_database/translations/builders_common.rb
@@ -123,7 +118,7 @@ homepage: https://github.com/cubesystems/releaf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: i18n database gem for releaf
 test_files: