releaf-i18n_database 1.1.19 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99882449e7f18be42bd7a2973dc3cbe21178378a03c3dd040d83286b4e72e76d
-  data.tar.gz: a6a0bd1208703a20215d9724036a975c9b3e8801ff12e09d0572b0e93005266a
+  metadata.gz: afc6d90826c0b3f735b41f966a7b8cc75534a2aaf48767d58e206827af9d518c
+  data.tar.gz: 6a77acd32a7f86f1e044816529b3a57ba284b8ffff18bf7af13358d8e4ff37a8
 SHA512:
-  metadata.gz: 9501a91f46fe8a961be8e878809aa25a1c99fa4ea3ac1e89638dbda0c02b2d2781e43c88f7e14fd0f66eae250dc3e4a8fc3a97fb80ebed6205cc8d9d9d43f894
-  data.tar.gz: 39ca3dcbb46ba37076685d5ffb14f4232244d995282fb745714f6de6da84a1cc0175ab3975e9062d78470b37bfef5e8105b548d24d4bc2eaa0e46d831335ed76
+  metadata.gz: c0c6ea46f74fe2de5bcf734a115af278fc0c7f4e52af3d640150a1801e6786a959ab71e9983d9b4d1ff189a4e900f3fc5c5c7daeb74a256b8ebd044fa055ef34
+  data.tar.gz: 4352e52cd0d81b365c6fdfedb2cbb7c3d8059a2ed9bf7932805f2025396e3a9407d5953f1fc46335ce181529bec8a7bf76017e2ff0c930889bd379f32a72d34f

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-i18n_database
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 2.0.1
 platform: ruby
 authors:
 - CubeSystems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2020-12-14 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.19
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 2.0.1
 - !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
@@ -99,31 +94,11 @@ files:
 - lib/releaf/i18n_database/engine.rb
 - lib/releaf/i18n_database/humanize_missing_translations.rb
 - misc/translations.xlsx
-- spec/builders/translations/builder_common_spec.rb
-- spec/builders/translations/edit_builder_spec.rb
-- spec/builders/translations/index_builder_spec.rb
-- spec/builders/translations/table_builder_spec.rb
-- spec/controllers/i18n_backend/translations_controller_spec.rb
-- spec/features/translations_spec.rb
-- spec/fixtures/all_translations_exported.xlsx
-- spec/fixtures/invalid.xls
-- spec/fixtures/invalid.xlsx
-- spec/fixtures/time.formats.xlsx
-- spec/fixtures/translations_import.xlsx
-- spec/fixtures/unsupported_import_file.png
-- spec/lib/releaf/i18n_database/backend_spec.rb
-- spec/lib/releaf/i18n_database/configuration_spec.rb
-- spec/lib/releaf/i18n_database/humanize_missing_translations_spec.rb
-- spec/lib/releaf/i18n_database/parse_spreadsheet_translations_spec.rb
-- spec/lib/releaf/i18n_database/translations_store_spec.rb
-- spec/lib/releaf/i18n_database/translations_utilities_spec.rb
-- spec/models/i18n_database/i18n_entry_spec.rb
-- spec/models/i18n_database/i18n_entry_translation_spec.rb
 homepage: https://github.com/cubesystems/releaf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,29 +113,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:
-- spec/builders/translations/table_builder_spec.rb
-- spec/builders/translations/index_builder_spec.rb
-- spec/builders/translations/builder_common_spec.rb
-- spec/builders/translations/edit_builder_spec.rb
-- spec/features/translations_spec.rb
-- spec/models/i18n_database/i18n_entry_spec.rb
-- spec/models/i18n_database/i18n_entry_translation_spec.rb
-- spec/lib/releaf/i18n_database/translations_utilities_spec.rb
-- spec/lib/releaf/i18n_database/humanize_missing_translations_spec.rb
-- spec/lib/releaf/i18n_database/backend_spec.rb
-- spec/lib/releaf/i18n_database/configuration_spec.rb
-- spec/lib/releaf/i18n_database/translations_store_spec.rb
-- spec/lib/releaf/i18n_database/parse_spreadsheet_translations_spec.rb
-- spec/fixtures/all_translations_exported.xlsx
-- spec/fixtures/unsupported_import_file.png
-- spec/fixtures/time.formats.xlsx
-- spec/fixtures/translations_import.xlsx
-- spec/fixtures/invalid.xlsx
-- spec/fixtures/invalid.xls
-- spec/controllers/i18n_backend/translations_controller_spec.rb
+test_files: []

data/spec/builders/translations/builder_common_spec.rb

@@ -1,39 +0,0 @@
-require "rails_helper"
-
-describe Releaf::I18nDatabase::Translations::BuildersCommon, type: :class do
-  class I18nBuildersCommonInheriter < Releaf::Builders::IndexBuilder
-    include Releaf::I18nDatabase::Translations::BuildersCommon
-  end
-  class TableBuilderTestHelper < ActionView::Base; end
-  let(:template){ TableBuilderTestHelper.new }
-  let(:subject){ I18nBuildersCommonInheriter.new(template) }
-
-  describe "#action_url" do
-    before do
-      request = ActionDispatch::Request.new("X")
-      allow(request).to receive(:query_parameters).and_return(a: "b", c: "d")
-      allow(subject).to receive(:request).and_return(request)
-    end
-
-    it "returns url for given action with current query params" do
-      allow(subject).to receive(:url_for).with(a: "b", c: "d", action: :edit).and_return("url")
-      expect(subject.action_url(:edit)).to eq("url")
-    end
-
-    context "when extra params given" do
-      it "merges given params to url" do
-        allow(subject).to receive(:url_for).with(a: "b", c: "z", action: :edit, format: "xx").and_return("url")
-        expect(subject.action_url(:edit, format: "xx", c: "z")).to eq("url")
-      end
-    end
-  end
-
-  describe "#export_button" do
-    it "returns export button" do
-      allow(subject).to receive(:t).with("Export").and_return("exp")
-      allow(subject).to receive(:action_url).with(:export, format: :xlsx).and_return("_exp_url_")
-      allow(subject).to receive(:button).with("exp", "download", class: "secondary", href: "_exp_url_").and_return("btn")
-      expect(subject.export_button).to eq('btn')
-    end
-  end
-end

data/spec/builders/translations/edit_builder_spec.rb

@@ -1,93 +0,0 @@
-require "rails_helper"
-
-describe Releaf::I18nDatabase::Translations::EditBuilder, type: :class do
-  class TableBuilderTestHelper < ActionView::Base
-    def protect_against_forgery?; end
-  end
-  let(:template){ TableBuilderTestHelper.new }
-  let(:resource_class){ Releaf::I18nDatabase::Translation }
-  let(:subject){ described_class.new(template) }
-
-  describe "#section" 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>'
-      expect(subject.section).to eq(result)
-    end
-  end
-
-  describe "#section_body" do
-    it "returns section body with form fields partial" do
-      allow(subject).to receive(:render).with(partial: "form_fields", locals: {builder: subject}).and_return("xxx")
-      expect(subject.section_body).to eq('<div class="body">xxx</div>')
-    end
-  end
-
-  describe "#import?" do
-    it "returns template `import` value" do
-      allow(subject).to receive(:template_variable).with("import").and_return("x")
-      expect(subject.import?).to eq("x")
-    end
-  end
-
-  describe "#save_button" do
-    it "returns localized value for given resource and column(locale)" do
-      allow(subject).to receive(:save_button_text).and_return("sv_txt")
-      allow(subject).to receive(:button).with("sv_txt", "check", class: "primary", data: { type: 'ok' }, type: "submit").and_return("save_btn")
-      expect(subject.save_button).to eq("save_btn")
-    end
-  end
-
-  describe "#save_button_text" do
-    context "when within import view" do
-      it "returns translated `Import` text" do
-        allow(subject).to receive(:t).with("Import").and_return("_import_")
-        allow(subject).to receive(:import?).and_return(true)
-        expect(subject.save_button_text).to eq("_import_")
-      end
-    end
-
-    context "when not within import view" do
-      it "returns translated `Save` text" do
-        allow(subject).to receive(:t).with("Save").and_return("_save_")
-        allow(subject).to receive(:import?).and_return(false)
-        expect(subject.save_button_text).to eq("_save_")
-      end
-    end
-  end
-
-  describe "#footer_secondary_tools" do
-    before do
-      allow(subject).to receive(:back_to_index_button).and_return("indx_btn")
-      allow(subject).to receive(:export_button).and_return("xprt_btn")
-    end
-
-    it "returns array with back and export links" do
-      allow(subject).to receive(:import?).and_return(false)
-      expect(subject.footer_secondary_tools).to eq(["indx_btn", "xprt_btn"])
-    end
-
-    context "when within import view" do
-      it "does not incliude export button" do
-        allow(subject).to receive(:import?).and_return(true)
-        expect(subject.footer_secondary_tools).to eq(["indx_btn"])
-      end
-    end
-  end
-
-  describe "#back_to_index_button" do
-    it "returns localized value for given resource and column(locale)" do
-      allow(subject).to receive(:t).with("Back to list").and_return("back")
-      allow(subject).to receive(:action_url).with(:index).and_return("index_path")
-      allow(subject).to receive(:button).with("back", "caret-left", class: "secondary", href: "index_path").and_return("index_btn")
-      expect(subject.back_to_index_button).to eq("index_btn")
-    end
-  end
-
-  describe "#section_header" do
-    it "returns nil" do
-      expect(subject.section_header).to be nil
-    end
-  end
-end

data/spec/builders/translations/index_builder_spec.rb

@@ -1,96 +0,0 @@
-require "rails_helper"
-
-describe Releaf::I18nDatabase::Translations::IndexBuilder, type: :class do
-  class IndexBuilderTestHelper < ActionView::Base
-    include Releaf::ApplicationHelper
-    delegate :resource_class, :table_options, to: :controller
-
-    def protect_against_forgery?; end
-
-    def controller
-      @controller ||= begin
-                        c = Releaf::I18nDatabase::TranslationsController.new
-                        c.setup
-                        c
-                      end
-    end
-  end
-  let(:template){ IndexBuilderTestHelper.new }
-  let(:resource_class){ Releaf::I18nDatabase::Translation }
-  let(:subject){ described_class.new(template) }
-
-  describe "#text_search_content" do
-    it "adds blank translation checbox to text search" do
-      allow(subject).to receive(:t).and_return("search")
-      allow(subject).to receive(:params).and_return(search: "xx")
-      allow(subject).to receive(:button).and_return("btn")
-      allow(subject).to receive(:search_only_blank_ui).and_return("_blank_ui_")
-      expect(subject.text_search_content).to start_with("_blank_ui_")
-    end
-  end
-
-  describe "#search_only_blank_ui" do
-    before do
-      allow(subject).to receive(:t).with("Only blank").and_return("trnls")
-    end
-
-    it "returns only blank translation search ui" do
-      allow(subject).to receive(:params).and_return(search: "xx")
-      expect(subject.search_only_blank_ui).to match_html(%Q[
-          <div class="search-field" data-name="only-blank">
-              <input type="checkbox" name="only_blank" id="only_blank" value="true" />
-              <label for="only_blank">trnls</label>
-          </div>
-      ])
-    end
-
-    it "reflects `only_blank` params to checkbox state" do
-      allow(subject).to receive(:params).and_return(only_blank: "1", search: true)
-      expect(subject.search_only_blank_ui).to match_html(%Q[
-          <div class="search-field" data-name="only-blank">
-              <input type="checkbox" name="only_blank" id="only_blank" value="true" checked="checked" />
-              <label for=\"only_blank\">trnls</label>
-          </div>
-      ])
-    end
-  end
-
-  describe "#footer_primary_tools" do
-    it "returns array with edit button" do
-      allow(subject).to receive(:edit_button).and_return("btn")
-      expect(subject.footer_primary_tools).to eq(["btn"])
-    end
-  end
-
-  describe "#footer_secondary_tools" do
-    it "returns array with edit button" do
-      allow(subject).to receive(:export_button).and_return("a")
-      allow(subject).to receive(:import_button).and_return("b")
-      allow(subject).to receive(:import_form).and_return("c")
-      expect(subject.footer_secondary_tools).to eq(["a", "b", "c"])
-    end
-  end
-
-  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>"
-      expect(subject.import_form).to eq(result)
-    end
-  end
-
-  describe "#edit_button" do
-    it "return edit button" do
-      allow(subject).to receive(:t).with("Edit").and_return("edt")
-      allow(subject).to receive(:action_url).with(:edit).and_return("edt_url")
-      allow(subject).to receive(:button).with("edt", "edit", class: "primary", href: "edt_url").and_return("edt_btn")
-      expect(subject.edit_button).to eq("edt_btn")
-    end
-  end
-
-  describe "#text_search_available?" do
-    it "return true" do
-      expect(subject.text_search_available?).to be true
-    end
-  end
-end