lit 0.4.0.pre.alpha.1 → 0.4.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df32a49da08696b7996f469dbd9041655750f22
-  data.tar.gz: e642cef48888929647b2782be05bb96339eb8788
+  metadata.gz: 2593f6821f5b28b0ac65d0bd7b746fb117ceca9a
+  data.tar.gz: f5c0079a74026f528f1cab00f50e4cd52bd6d2ff
 SHA512:
-  metadata.gz: c002db4e8d5262e15c4d62a55cbccb44a44c6580dd31a4d1feefdb3eec72b182894d6e72d8d13659cbf0e8e679bea203a1a8344818b841351590b40207e1b100
-  data.tar.gz: 133089d93bc0f5da416480e4fe59a9f27a2779bbab8c859691d0e18644fb2e81fbf24e2341fa0e8c553cb9e056c7ea71afd50ea44b203d40cc533af7b2f7df56
+  metadata.gz: 0a916d4011baf37c64edc6f5f900b08eff704621f8ec32ea82b82fa005115341fdfcf8f5503d80714a36e0e1d417b52e51a239cc95259fbcc898754e3c323f1f
+  data.tar.gz: cbc1c7c864fc53dacf1909353cbfab6b087a1c7e9ef5a4dc417f491a911595f325796118c12cfe6dcede0bdeffe2c25b25853eb5fa7c48c3fbf836f21f56b0fe

data/app/controllers/lit/localizations_controller.rb

@@ -15,7 +15,13 @@ module Lit
     end
 
     def update
-      after_update_operations if @localization.update_attributes(clear_params)
+      # Wrapping it in a transaction leverages the fact that @localization's
+      # :after_commit callback is then executed AFTER whatever's done in
+      # #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)
+      end
       respond_to do |f|
         f.js
         f.json do

data/app/models/lit/base.rb

@@ -0,0 +1,38 @@
+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
+
+  attr_accessor :retried_created, :retried_updated
+
+  def mark_for_retry_on_create
+    @will_retry_create = true
+  end
+
+  def mark_for_retry_on_update
+    @will_retry_update = true
+  end
+
+  after_rollback :retry_lit_model_save
+
+  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
+  end
+
+  def retry_on_create
+    return if self.retried_created
+    self.retried_created = true
+    self.class.create! attributes.merge(retried_created: true)
+  end
+
+  def retry_on_update
+    return if self.retried_updated
+    self.retried_updated = true
+    update! attributes.merge(retried_updated: true)
+  end
+
+end

data/app/models/lit/locale.rb

@@ -1,5 +1,5 @@
 module Lit
-  class Locale < ActiveRecord::Base
+  class Locale < Base
     ## SCOPES
     scope :ordered, -> { order(locale: :asc) }
     scope :visible, -> { where(is_hidden: false) }

data/app/models/lit/localization.rb

@@ -1,5 +1,5 @@
 module Lit
-  class Localization < ActiveRecord::Base
+  class Localization < Lit::Base
     serialize :translated_value
     serialize :default_value
 
@@ -26,9 +26,11 @@ module Lit
     delegate :is_deleted, to: :localization_key
 
     ## VALIDATIONS
-    validates :locale, presence: true
+    validates :locale, :localization_key, presence: true
 
     ## ACCESSORS
+    attr_accessor :full_key_str
+
     unless defined?(::ActionController::StrongParameters)
       attr_accessible :translated_value, :locale_id
     end
@@ -44,7 +46,7 @@ module Lit
     end
 
     def full_key
-      [locale.locale, localization_key.localization_key].join('.')
+      full_key_str || [locale.locale, localization_key.localization_key].join('.')
     end
 
     def translation
@@ -74,7 +76,7 @@ module Lit
     def update_default_value(value)
       return true if persisted? && default_value == value
       if persisted?
-        update_column(:default_value, value)
+        update(default_value: value)
       else
         self.default_value = value
         save!
@@ -92,5 +94,6 @@ module Lit
       translated_value = translated_value_was || default_value
       localization_versions.new(translated_value: translated_value)
     end
+
   end
 end

data/app/models/lit/localization_key.rb

@@ -1,5 +1,5 @@
 module Lit
-  class LocalizationKey < ActiveRecord::Base
+  class LocalizationKey < Lit::Base
     attr_accessor :interpolated_key
 
     ## SCOPES
@@ -31,6 +31,7 @@ module Lit
 
     ## BEFORE AND AFTER
     after_commit :check_completed, on: :update
+    after_commit :remove_from_cache, on: :destroy
 
     def to_s
       localization_key
@@ -75,9 +76,13 @@ module Lit
       ActiveRecord::Base.transaction do
         update is_deleted: true
         change_all_completed
-        I18n.backend.available_locales.each do |l|
-          Lit.init.cache.delete_key "#{l}.#{localization_key}"
-        end
+        remove_from_cache
+      end
+    end
+
+    def remove_from_cache
+      Lit::Locale.pluck(:locale).each do |l|
+        Lit.init.cache.delete_key "#{l}.#{localization_key}"
       end
     end
 
@@ -94,5 +99,9 @@ module Lit
       self.is_completed = localizations.changed.count == localizations.count
       save! if is_completed_changed?
     end
+
+    def lit_attribute_will_change
+      localization_key_will_change!
+    end
   end
 end

data/lib/lit/cache.rb

@@ -23,6 +23,8 @@ module Lit
       @request_info_store = Lit.get_key_value_engine
       @hits_counter_working = true
       @keys = nil
+      @localization_object_cache = {}
+      @localization_key_object_cache = {}
     end
 
     def [](key)
@@ -79,6 +81,8 @@ module Lit
       locale_key, key_without_locale = split_key(key)
       locale = find_locale(locale_key)
       delete_localization(locale, key_without_locale)
+      @localization_key_object_cache = {}
+      @localization_object_cache = {}
     end
 
     def load_all_translations
@@ -96,6 +100,7 @@ module Lit
       key = key.to_s
       locale_key, key_without_locale = split_key(key)
       locale = find_locale(locale_key)
+      @localization_object_cache.delete(key)
       localization = find_localization(locale, key_without_locale, default_fallback: true)
       localizations[key] = localization.translation if localization
     end
@@ -105,11 +110,15 @@ module Lit
       localizations.delete(key)
       key_without_locale = split_key(key).last
       localization_keys.delete(key_without_locale)
+      @localization_object_cache.delete(key)
+      @localization_key_object_cache.delete(key)
       I18n.backend.reload!
     end
 
     def reset
       @locale_cache = {}
+      @localization_key_object_cache = {}
+      @localization_object_cache = {}
       localizations.clear
       localization_keys.clear
       load_all_translations
@@ -154,9 +163,11 @@ module Lit
 
     def find_localization(locale, key_without_locale, value: nil, force_array: false, update_value: false, default_fallback: false)
       return nil if value.is_a?(Hash)
+      full_key = "#{locale}.#{key_without_locale}"
       ActiveRecord::Base.transaction do
         localization_key = find_localization_key(key_without_locale)
-        localization =
+        localization = @localization_object_cache[full_key]
+        localization ||=
           Lit::Localization.active
                            .where(locale_id: locale.id)
                            .where(localization_key_id: localization_key.id)
@@ -176,11 +187,14 @@ module Lit
           # Prevent overwriting existing default value with nil.
           # However, if the localization record is #new_record?, we still need
           # to insert it with an empty default value.
+          localization.locale = locale
+          localization.localization_key = localization_key
+          localization.full_key_str = full_key
           localization.update_default_value(value) if localization.new_record? || value
+          @localization_object_cache[full_key] = localization
         end
-        return localization
+        localization
       end
-      nil
     end
 
     # fallback to translation in different locale
@@ -229,7 +243,8 @@ module Lit
       new_value = nil
       case v
         when Symbol then
-          lk = Lit::LocalizationKey.where(localization_key: v.to_s).first
+          lk = @localization_key_object_cache[v.to_s] || \
+            Lit::LocalizationKey.where(localization_key: v.to_s).first
           if lk
             loca = Lit::Localization.active.where(locale_id: locale.id).
                         where(localization_key_id: lk.id).first
@@ -258,16 +273,19 @@ module Lit
     end
 
     def find_localization_key(key_without_locale)
-      if localization_keys.key?(key_without_locale)
-        Lit::LocalizationKey.find_by(
-          id: localization_keys[key_without_locale]
-        ) || find_or_create_localization_key(key_without_locale)
-      else
-        find_or_create_localization_key(key_without_locale)
-      end
+      return @localization_key_object_cache[key_without_locale] if @localization_key_object_cache.key?(key_without_locale)
+      @localization_key_object_cache[key_without_locale] = if localization_keys.key?(key_without_locale)
+                                                             Lit::LocalizationKey.find_by(
+                                                               id: localization_keys[key_without_locale]
+                                                             ) || find_or_create_localization_key(key_without_locale)
+                                                           else
+                                                             find_or_create_localization_key(key_without_locale)
+                                                           end
+      @localization_key_object_cache[key_without_locale]
     end
 
     def find_localization_key_for_delete(key_without_locale)
+      return @localization_key_object_cache[key_without_locale] if @localization_key_object_cache.key?(key_without_locale)
       lk = Lit::LocalizationKey.find_by(id: localization_keys[key_without_locale]) if localization_keys.has_key?(key_without_locale)
       lk || Lit::LocalizationKey.where(localization_key: key_without_locale).first
     end

data/lib/lit/i18n_backend.rb

@@ -69,11 +69,9 @@ module Lit
 
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
-
       # check in cache or in simple backend
       content = @cache[key_with_locale] || super
       return content if parts.size <= 1
-
       if content.nil? && should_cache?(key_with_locale, options)
         new_content = @cache.init_key_with_value(key_with_locale, content)
         content = new_content if content.nil? # Content can change when Lit.humanize is true for example
@@ -125,8 +123,8 @@ module Lit
       key = ([locale] + scope).join('.')
       if data.respond_to?(:to_hash)
         # ActiveRecord::Base.transaction do
-          data.to_hash.each do |key, value|
-            store_item(locale, value, scope + [key], startup_process)
+          data.to_hash.each do |k, value|
+            store_item(locale, value, scope + [k], startup_process)
           end
         # end
       elsif data.respond_to?(:to_str) || data.is_a?(Array)

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = '0.4.0-alpha.1'.freeze
+  VERSION = '0.4.0-alpha.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha.1
+  version: 0.4.0.pre.alpha.2
 platform: ruby
 authors:
 - Maciej Litwiniuk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -390,6 +390,7 @@ files:
 - app/helpers/lit/localizations_helper.rb
 - app/helpers/lit/sources_helper.rb
 - app/jobs/lit/synchronize_source_job.rb
+- app/models/lit/base.rb
 - app/models/lit/incomming_localization.rb
 - app/models/lit/locale.rb
 - app/models/lit/localization.rb