releaf-i18n_database 0.2.1 → 1.0.3

data/spec/lib/{i18n_database → releaf/i18n_database}/translations_utilities_spec.rb

@@ -39,17 +39,17 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
 
   describe ".filter_only_blank_translations" do
     it "returns given collection applied with empty translation data search" do
-      collection = Releaf::I18nDatabase::Translation.where("id > 1")
+      collection = Releaf::I18nDatabase::I18nEntry.where("id > 1")
       allow(described_class).to receive(:search_columns).and_return([
-        Releaf::I18nDatabase::Translation.arel_table[:key],
-        Releaf::I18nDatabase::Translation.arel_table.alias("lv_data")[:localization],
+        Releaf::I18nDatabase::I18nEntry.arel_table[:key],
+        Releaf::I18nDatabase::I18nEntry.arel_table.alias("lv_data")[:text],
       ])
       if postgresql?
-        result = "WHERE (id > 1) AND ((\"releaf_translations\".\"key\" = '' OR \"releaf_translations\".\"key\" IS NULL)"
-        result += " OR (\"lv_data\".\"localization\" = '' OR \"lv_data\".\"localization\" IS NULL))"
+        result = "WHERE (id > 1) AND ((\"releaf_i18n_entries\".\"key\" = '' OR \"releaf_i18n_entries\".\"key\" IS NULL)"
+        result += " OR (\"lv_data\".\"text\" = '' OR \"lv_data\".\"text\" IS NULL))"
       else
-        result = "WHERE (id > 1) AND ((`releaf_translations`.`key` = '' OR `releaf_translations`.`key` IS NULL)"
-        result += " OR (`lv_data`.`localization` = '' OR `lv_data`.`localization` IS NULL))"
+        result = "WHERE (id > 1) AND ((`releaf_i18n_entries`.`key` = '' OR `releaf_i18n_entries`.`key` IS NULL)"
+        result += " OR (`lv_data`.`text` = '' OR `lv_data`.`text` IS NULL))"
       end
       expect(described_class.filter_only_blank_translations(collection).to_sql).to end_with(result)
     end
@@ -57,7 +57,7 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
 
   describe ".filter_by_text" do
     it "returns collection with grouped column searches" do
-      collection = Releaf::I18nDatabase::Translation.where("id > 1")
+      collection = Releaf::I18nDatabase::I18nEntry.where("id > 1")
       allow(described_class).to receive(:column_searches).with("redx").and_return([
         "id = 8 AND id = 2",
         "id = 9 AND id = 19",
@@ -70,17 +70,17 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
   describe ".column_searches" do
     it "return array with column based searches" do
       allow(described_class).to receive(:search_columns).and_return([
-        Releaf::I18nDatabase::Translation.arel_table[:key],
-        Releaf::I18nDatabase::Translation.arel_table.alias("lv_data")[:localization],
+        Releaf::I18nDatabase::I18nEntry.arel_table[:key],
+        Releaf::I18nDatabase::I18nEntry.arel_table.alias("lv_data")[:text],
       ])
       allow(described_class).to receive(:escape_search_string).with("red").twice.and_return("escaped_red")
       allow(described_class).to receive(:escape_search_string).with("car").twice.and_return("escaped_car")
       if postgresql?
-        result = ["\"releaf_translations\".\"key\" ILIKE '%escaped_red%' AND \"releaf_translations\".\"key\" ILIKE '%escaped_car%'",
-                  "\"lv_data\".\"localization\" ILIKE '%escaped_red%' AND \"lv_data\".\"localization\" ILIKE '%escaped_car%'"]
+        result = ["\"releaf_i18n_entries\".\"key\" ILIKE '%escaped_red%' AND \"releaf_i18n_entries\".\"key\" ILIKE '%escaped_car%'",
+                  "\"lv_data\".\"text\" ILIKE '%escaped_red%' AND \"lv_data\".\"text\" ILIKE '%escaped_car%'"]
       else
-        result = ["`releaf_translations`.`key` LIKE '%escaped_red%' AND `releaf_translations`.`key` LIKE '%escaped_car%'",
-                  "`lv_data`.`localization` LIKE '%escaped_red%' AND `lv_data`.`localization` LIKE '%escaped_car%'"]
+        result = ["`releaf_i18n_entries`.`key` LIKE '%escaped_red%' AND `releaf_i18n_entries`.`key` LIKE '%escaped_car%'",
+                  "`lv_data`.`text` LIKE '%escaped_red%' AND `lv_data`.`text` LIKE '%escaped_car%'"]
       end
       expect(described_class.column_searches(" red   car ")).to eq(result)
     end
@@ -89,16 +89,16 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
   describe ".search_columns" do
     it "returns array with translation key arel attribute and locale tables localization attributes" do
       allow(described_class).to receive(:locale_tables).and_return(
-        de: Releaf::I18nDatabase::TranslationData.arel_table.alias("de_data"),
-        lv: Releaf::I18nDatabase::TranslationData.arel_table.alias("lv_data"),
-        en: Releaf::I18nDatabase::TranslationData.arel_table.alias("en_data")
+        de: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("de_data"),
+        lv: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("lv_data"),
+        en: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("en_data")
       )
 
       result = [
-        Releaf::I18nDatabase::Translation.arel_table[:key],
-        Releaf::I18nDatabase::TranslationData.arel_table.alias("de_data")[:localization],
-        Releaf::I18nDatabase::TranslationData.arel_table.alias("lv_data")[:localization],
-        Releaf::I18nDatabase::TranslationData.arel_table.alias("en_data")[:localization]
+        Releaf::I18nDatabase::I18nEntry.arel_table[:key],
+        Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("de_data")[:text],
+        Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("lv_data")[:text],
+        Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("en_data")[:text]
       ]
       expect(described_class.search_columns).to eq(result)
     end
@@ -114,8 +114,8 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
     it "returns array with arel aliased locale tables" do
       allow(Releaf.application.config).to receive(:all_locales).and_return([:de, :en])
       result = {
-        de: Releaf::I18nDatabase::TranslationData.arel_table.alias("de_data"),
-        en: Releaf::I18nDatabase::TranslationData.arel_table.alias("en_data")
+        de: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("de_data"),
+        en: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("en_data")
       }
       expect(described_class.locale_tables).to eq(result)
     end
@@ -126,24 +126,24 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
       allow(described_class).to receive(:localization_include_joins).and_return(["a", "b"])
       allow(described_class).to receive(:localization_include_selects).and_return("x")
       if postgresql?
-        result = "SELECT x FROM \"releaf_translations\" a b"
+        result = "SELECT x FROM \"releaf_i18n_entries\" a b"
       else
-        result = "SELECT x FROM `releaf_translations` a b"
+        result = "SELECT x FROM `releaf_i18n_entries` a b"
       end
-      expect(described_class.include_localizations(Releaf::I18nDatabase::Translation).to_sql).to eq(result)
+      expect(described_class.include_localizations(Releaf::I18nDatabase::I18nEntry).to_sql).to eq(result)
     end
   end
 
   describe ".localization_include_joins" do
     it "returns array with locales translation table joins" do
       allow(described_class).to receive(:locale_tables).and_return(
-        de: Releaf::I18nDatabase::TranslationData.arel_table.alias("de_data"),
-        lv: Releaf::I18nDatabase::TranslationData.arel_table.alias("lv_data"),
-        en: Releaf::I18nDatabase::TranslationData.arel_table.alias("en_data")
+        de: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("de_data"),
+        lv: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("lv_data"),
+        en: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("en_data")
       )
-      result = ["LEFT JOIN releaf_translation_data AS de_data ON de_data.translation_id = releaf_translations.id AND de_data.lang = 'de'",
-                "LEFT JOIN releaf_translation_data AS lv_data ON lv_data.translation_id = releaf_translations.id AND lv_data.lang = 'lv'",
-                "LEFT JOIN releaf_translation_data AS en_data ON en_data.translation_id = releaf_translations.id AND en_data.lang = 'en'"]
+      result = ["LEFT JOIN releaf_i18n_entry_translations AS de_data ON de_data.i18n_entry_id = releaf_i18n_entries.id AND de_data.locale = 'de'",
+                "LEFT JOIN releaf_i18n_entry_translations AS lv_data ON lv_data.i18n_entry_id = releaf_i18n_entries.id AND lv_data.locale = 'lv'",
+                "LEFT JOIN releaf_i18n_entry_translations AS en_data ON en_data.i18n_entry_id = releaf_i18n_entries.id AND en_data.locale = 'en'"]
       expect(described_class.localization_include_joins).to eq(result)
     end
   end
@@ -154,7 +154,7 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
         "de_data.localization AS de_localization",
         "de_data.id AS de_localization_id"
       ])
-      result = "releaf_translations.*, de_data.localization AS de_localization, de_data.id AS de_localization_id"
+      result = "releaf_i18n_entries.*, de_data.localization AS de_localization, de_data.id AS de_localization_id"
       expect(described_class.localization_include_selects).to eq(result)
     end
   end
@@ -162,13 +162,13 @@ describe Releaf::I18nDatabase::TranslationsUtilities do
   describe ".localization_include_locales_columns" do
     it "returns locales translated values columns and ids" do
       allow(described_class).to receive(:locale_tables).and_return(
-        de: Releaf::I18nDatabase::TranslationData.arel_table.alias("de_data"),
-        lv: Releaf::I18nDatabase::TranslationData.arel_table.alias("lv_data"),
-        en: Releaf::I18nDatabase::TranslationData.arel_table.alias("en_data")
+        de: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("de_data"),
+        lv: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("lv_data"),
+        en: Releaf::I18nDatabase::I18nEntryTranslation.arel_table.alias("en_data")
       )
-      result = ["de_data.localization AS de_localization", "de_data.id AS de_localization_id",
-                "lv_data.localization AS lv_localization", "lv_data.id AS lv_localization_id",
-                "en_data.localization AS en_localization", "en_data.id AS en_localization_id"]
+      result = ["de_data.text AS de_localization", "de_data.id AS de_localization_id",
+                "lv_data.text AS lv_localization", "lv_data.id AS lv_localization_id",
+                "en_data.text AS en_localization", "en_data.id AS en_localization_id"]
       expect(described_class.localization_include_locales_columns).to eq(result)
     end
   end

data/spec/models/i18n_database/i18n_entry_spec.rb

@@ -0,0 +1,50 @@
+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 { is_expected.to have_many(:i18n_entry_translation).dependent(:destroy) }
+  it { is_expected.to accept_nested_attributes_for(:i18n_entry_translation).allow_destroy(true) }
+
+  describe "#locale_value" do
+    it "returns translated value for given locale" do
+      subject.i18n_entry_translation.build(text: 'apple', locale: "en")
+      subject.i18n_entry_translation.build(text: 'apfel', locale: "de")
+
+      expect(subject.locale_value("en")).to eq("apple")
+      expect(subject.locale_value(:de)).to eq("apfel")
+      expect(subject.locale_value("lt")).to be nil
+    end
+  end
+
+  describe "#find_or_initialize_translation" do
+    before do
+      subject.key = "xx"
+      subject.i18n_entry_translation.build(text: 'apple', locale: "en")
+      subject.i18n_entry_translation.build(text: 'ābols', locale: "lv")
+      subject.save
+      allow(subject.i18n_entry_translation).to receive(:build).with(locale: "de").and_return(:new)
+    end
+
+    context "when translation exists for given locale (given as string or symbol)" do
+      it "returns existing translation instance" do
+        expect(subject.find_or_initialize_translation(:en).text).to eq("apple")
+        expect(subject.find_or_initialize_translation("en").text).to eq("apple")
+      end
+
+      it "uses AR cache to prevent multiple db hit for multiple locales lookup" do
+        expect {
+          subject.find_or_initialize_translation("en")
+          subject.find_or_initialize_translation("lv")
+        }.to make_database_queries(count: 1)
+      end
+    end
+
+    context "when translation does not exists for given locale" do
+      it "returns newly builded translation instance" do
+        expect(subject.find_or_initialize_translation("de")).to eq(:new)
+      end
+    end
+  end
+end

data/spec/models/i18n_database/i18n_entry_translation_spec.rb

@@ -0,0 +1,9 @@
+require "rails_helper"
+
+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 { 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: 0.2.1
+  version: 1.0.3
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,32 +16,35 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: axlsx_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -49,6 +52,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -73,25 +79,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- app/assets/javascripts/releaf/controllers/releaf/i18n_database/translations.js
-- app/assets/stylesheets/releaf/controllers/releaf/i18n_database/translations.scss
+- 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
 - app/builders/releaf/i18n_database/translations/edit_builder.rb
 - app/builders/releaf/i18n_database/translations/index_builder.rb
 - app/builders/releaf/i18n_database/translations/table_builder.rb
 - app/controllers/releaf/i18n_database/translations_controller.rb
-- app/lib/releaf/i18n_database/translations_importer.rb
+- app/lib/releaf/i18n_database/parse_spreadsheet_translations.rb
+- app/lib/releaf/i18n_database/translations_store.rb
 - app/lib/releaf/i18n_database/translations_utilities.rb
-- app/models/releaf/i18n_database/translation.rb
-- app/models/releaf/i18n_database/translation_data.rb
+- app/models/releaf/i18n_database/i18n_entry.rb
+- app/models/releaf/i18n_database/i18n_entry_translation.rb
 - app/views/releaf/i18n_database/translations/_form_fields.haml
 - app/views/releaf/i18n_database/translations/export.xlsx.axlsx
 - lib/releaf-i18n_database.rb
 - lib/releaf/i18n_database/backend.rb
-- lib/releaf/i18n_database/builders_autoload.rb
+- lib/releaf/i18n_database/configuration.rb
 - lib/releaf/i18n_database/engine.rb
 - lib/releaf/i18n_database/humanize_missing_translations.rb
-- releaf-i18n_database.gemspec
+- misc/translations.xlsx
 - spec/builders/translations/builder_common_spec.rb
 - spec/builders/translations/edit_builder_spec.rb
 - spec/builders/translations/index_builder_spec.rb
@@ -99,17 +106,22 @@ files:
 - 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/i18n_database/backend_spec.rb
-- spec/lib/i18n_database/humanize_missing_translations_spec.rb
-- spec/lib/i18n_database/translations_importer_spec.rb
-- spec/lib/i18n_database/translations_utilities_spec.rb
-- spec/models/i18n_database/translation_data_spec.rb
-- spec/models/i18n_database/translation_spec.rb
+- 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: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -127,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: i18n database gem for releaf
@@ -139,13 +151,16 @@ test_files:
 - 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/i18n_database/backend_spec.rb
-- spec/lib/i18n_database/humanize_missing_translations_spec.rb
-- spec/lib/i18n_database/translations_importer_spec.rb
-- spec/lib/i18n_database/translations_utilities_spec.rb
-- spec/models/i18n_database/translation_data_spec.rb
-- spec/models/i18n_database/translation_spec.rb
-has_rdoc: 
+- 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

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

@@ -1,72 +0,0 @@
-module Releaf::I18nDatabase
-  class TranslationsImporter
-    class UnsupportedFileFormatError < StandardError; end
-
-    def initialize file_path, file_extension
-      require "roo"
-      begin
-        @excel = Roo::Spreadsheet.open(file_path, file_warning: :ignore, extension: file_extension)
-        @data = []
-        @locales = []
-      rescue ArgumentError => e
-        error_string = "Don't know how to open file"
-        if e.message.match(error_string)
-          raise UnsupportedFileFormatError
-        else
-          raise
-        end
-      end
-    end
-
-    def parsed_output
-      @excel.each_with_pagename do |name, sheet|
-        detect_sheet_locales(sheet)
-        parse_sheet(sheet)
-      end
-
-      @data
-    end
-
-    def detect_sheet_locales sheet
-      sheet.row(1).each_with_index do |cell, i|
-        if i > 0
-          @locales << cell
-        end
-      end
-    end
-
-    def parse_sheet sheet
-      (2..sheet.last_row).each do |row_no|
-        key = sheet.row(row_no)[0]
-        localizations = sheet.row(row_no)[1..-1]
-        if key.present?
-          @data << load_translation(key, localizations)
-        end
-      end
-    end
-
-    def load_translation key, localizations
-      translation = Translation.where(key: key).first_or_initialize
-      translation.key = key
-
-      localizations.each_with_index do |localization, i|
-        load_translation_data(translation, @locales[i], localization)
-      end
-
-      translation
-    end
-
-    def load_translation_data translation, locale, localization
-      translation_data = translation.translation_data.find{ |x| x.lang == locale }
-      value = localization.nil? ? '' : localization
-
-      # replace existing locale value only if new one is not blank
-      if translation_data && !value.blank?
-        translation_data.localization = value
-      # always assign value for new locale
-      elsif translation_data.nil?
-        translation_data = translation.translation_data.build(lang: locale, localization: value)
-      end
-    end
-  end
-end