Merge branch 'rails_6_i18n_1.6_compat'

Author: mlitwiniuk

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.5.8

.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
+  - 2.5.8
+  - 2.6.6
 gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 services:
   - postgresql
   - redis-server

Appraisals

@@ -1,24 +1,6 @@
-appraise 'rails-4.2' do
-  source 'https://rubygems.org'
-  gem 'rails', '~> 4.2.0'
-  gem 'devise'
-  gem 'pg', '~> 0.18.4'
-  gem 'redis'
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'test_declarative'
-  gem 'mocha'
-  gem 'webmock'
-  gem 'sass-rails'
-  gem 'jquery-rails'
-  gem 'coffee-rails'
-  gem 'pry-rails'
-  gem 'test_after_commit'
-end
-
-appraise 'rails-5.0' do
+appraise 'rails-5.1' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 5.0.0'
+  gem 'rails', '~> 5.1.0'
   gem 'devise'
   gem 'pg', '~> 0.21.0'
   gem 'redis'
@@ -32,14 +14,14 @@ appraise 'rails-5.0' do
   gem 'coffee-rails'
   gem 'pry-rails'
   gem 'rails-controller-testing'
-  gem 'minitest', '~> 5.10'
+  gem 'minitest'
 end
 
-appraise 'rails-5.1' do
+appraise 'rails-5.2' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 5.1.0'
+  gem 'rails', '~> 5.2.0'
   gem 'devise'
-  gem 'pg', '~> 0.21.0'
+  gem 'pg', '~> 1.1.3'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -54,11 +36,11 @@ appraise 'rails-5.1' do
   gem 'minitest'
 end
 
-appraise 'rails-5.2' do
+appraise 'rails-6.0' do
   source 'https://rubygems.org'
-  gem 'rails', '~> 5.2.0'
+  gem 'rails', '~> 6.0.0.beta3'
   gem 'devise'
-  gem 'pg', '~> 1.1.3'
+  gem 'pg', '~> 1.1.4'
   gem 'redis'
   gem 'capybara'
   gem 'database_cleaner'
@@ -71,5 +53,4 @@ appraise 'rails-5.2' do
   gem 'pry-rails'
   gem 'rails-controller-testing'
   gem 'minitest'
-end
-
+end

app/controllers/lit/localizations_controller.rb

@@ -20,7 +20,7 @@ def update
       # #after_update_operations. So it'll first set :is_changed to true
       # and then it will be properly read in the cache setting routine.
       @localization.transaction do
-        after_update_operations if @localization.update_attributes(clear_params)
+        after_update_operations if @localization.update(clear_params)
       end
       respond_to do |f|
         f.js

app/controllers/lit/sources_controller.rb

@@ -40,7 +40,7 @@ def create
     end
 
     def update
-      if @source.update_attributes(clear_params)
+      if @source.update(clear_params)
         redirect_to @source, notice: 'Source was successfully updated.'
       else
         render action: 'edit'

app/helpers/lit/frontend_helper.rb

@@ -9,7 +9,7 @@ def translate(key, options = {})
         key = scope_key_by_partial(key)
         key = pluralized_key(key, count) if count
 
-        content = super(key, options)
+        content = super(key, options.symbolize_keys)
         if !options[:skip_lit] && lit_authorized?
           content = get_translateable_span(key, content)
         end

app/helpers/lit/localizations_helper.rb

@@ -9,6 +9,15 @@ def ejs(val)
       escape_javascript val.to_s
     end
 
+    def locale_flag locale
+      locale = locale.to_s.upcase[0,2]
+      locale = case locale
+               when 'EN' then 'GB'
+               else locale
+               end
+      locale.tr('A-Z', "\u{1F1E6}-\u{1F1FF}")
+    end
+
     def allow_wysiwyg_editor?(key)
       Lit.all_translations_are_html_safe || key.to_s =~ /(\b|_|\.)html$/
     end

app/models/lit/base.rb

@@ -1,38 +1,54 @@
 class Lit::Base < ActiveRecord::Base
   self.abstract_class = true
 
-  before_save :mark_for_retry_on_create, on: :create
-  before_save :mark_for_retry_on_update, on: :update
+  before_save :mark_for_retry
 
   attr_accessor :retried_created, :retried_updated
 
-  def mark_for_retry_on_create
+  def mark_for_retry
     @will_retry_create = true
   end
 
-  def mark_for_retry_on_update
-    @will_retry_update = true
+  after_rollback :retry_lit_model_save
+
+  def rolledback_after_insert?
+    persisted? && @was_saved_with_insert && @was_rolled_back
   end
 
-  after_rollback :retry_lit_model_save
+  def rolledback_after_update?
+    persisted? && @was_saved_with_update && @was_rolled_back
+  end
 
   private
 
-  def retry_lit_model_save
-    retry_on_create if instance_variable_defined?(:@will_retry_create) && @will_retry_create
-    retry_on_update if instance_variable_defined?(:@will_retry_update) && @will_retry_update
+  def create_or_update(*args, &block)
+    @was_saved_with_insert = true if new_record?
+    @was_saved_with_update = true if persisted?
+
+    super
   end
 
-  def retry_on_create
-    return if self.retried_created
-    self.retried_created = true
-    self.class.create! attributes.merge(retried_created: true)
+  def retry_lit_model_save
+    return if @was_rolled_back
+    @was_rolled_back = true
+    do_retry if instance_variable_defined?(:@will_retry_create) && @will_retry_create
   end
 
-  def retry_on_update
-    return if self.retried_updated
-    self.retried_updated = true
-    update! attributes.merge(retried_updated: true)
+  def do_retry
+    if !retried_created
+      self.retried_created = true
+      if rolledback_after_insert?
+        self.class.create! attributes.merge(retried_created: true)
+      end
+    elsif !retried_updated
+      # Why elsif and not just if? Because if a record object was first saved
+      # with INSERT and then with UPDATE (still being the same Ruby object),
+      # it makes no sense to retry both create and upadte. Let's only retry create.
+      self.retried_updated = true
+      if rolledback_after_update?
+        update_columns(attributes)
+      end
+    end
   end
 
 end

app/models/lit/incomming_localization.rb

@@ -59,14 +59,14 @@ def localization_has_changed?
     end
 
     def update_existing_localization_data
-      localization.update_attributes!(
+      localization.update!(
         translated_value: translated_value,
         is_changed: true
       )
     end
 
     def update_existing_localization_key_data
-      localization_key.update_attributes!(
+      localization_key.update!(
         is_deleted: localization_key_is_deleted
       )
     end