Merge pull request #70 from prograils/optimizations

Wrap store_item calls and find_localization body in transactions

Author: mlitwiniuk

Diff for: lib/lit/cache.rb

@@ -178,40 +178,43 @@ def localization_keys
 
     def find_localization(locale, key_without_locale, value = nil, force_array = false, update_value = false)
       unless value.is_a?(Hash)
-        localization_key = find_localization_key(key_without_locale)
-        localization = Lit::Localization.where(locale_id: locale.id).
-                          where(localization_key_id: localization_key.id).first_or_initialize
-        if update_value || localization.new_record?
-          if value.is_a?(Array)
-            unless force_array
-              new_value = nil
-              value_clone = value.dup
-              while (v = value_clone.shift) && v.present?
-                pv = parse_value(v, locale)
-                new_value = pv unless pv.nil?
+        ActiveRecord::Base.transaction do
+          localization_key = find_localization_key(key_without_locale)
+          localization = Lit::Localization.where(locale_id: locale.id).
+                            where(localization_key_id: localization_key.id).first_or_initialize
+          if update_value || localization.new_record?
+            if value.is_a?(Array)
+              unless force_array
+                new_value = nil
+                value_clone = value.dup
+                while (v = value_clone.shift) && v.present?
+                  pv = parse_value(v, locale)
+                  new_value = pv unless pv.nil?
+                end
+                value = new_value
               end
-              value = new_value
+            else
+              value = parse_value(value, locale) unless value.nil?
             end
-          else
-            value = parse_value(value, locale) unless value.nil?
-          end
-          if value.nil?
-            if Lit.fallback
-              @locale_cache.keys.each do |lc|
-                if lc != locale.locale
-                  nk = "#{lc}.#{key_without_locale}"
-                  v = localizations[nk]
-                  value = v if v.present? && value.nil?
+            if value.nil?
+              if Lit.fallback
+                @locale_cache.keys.each do |lc|
+                  if lc != locale.locale
+                    nk = "#{lc}.#{key_without_locale}"
+                    v = localizations[nk]
+                    value = v if v.present? && value.nil?
+                  end
                 end
               end
+              if value.nil? && Lit.humanize_key
+                value = key_without_locale.split('.').last.humanize
+              end
             end
-            if value.nil? && Lit.humanize_key
-              value = key_without_locale.split('.').last.humanize
-            end
+            localization.update_default_value(value)
           end
-          localization.update_default_value(value)
+          return localization
+
         end
-        return localization
       else
         nil
       end

Diff for: lib/lit/i18n_backend.rb

@@ -41,7 +41,9 @@ def reset_available_locales_cache
     # @param [Hash] data nested key-value pairs to be added as blurbs
     def store_translations(locale, data, options = {})
       super
-      store_item(locale, data) if store_items? && valid_locale?(locale)
+      ActiveRecord::Base.transaction do
+        store_item(locale, data)
+      end if store_items? && valid_locale?(locale)
     end
 
     private
@@ -83,9 +85,11 @@ def lookup(locale, key, scope = [], options = {})
 
     def store_item(locale, data, scope = [])
       if data.respond_to?(:to_hash)
-        data.to_hash.each do |key, value|
-          store_item(locale, value, scope + [key])
-        end
+        # ActiveRecord::Base.transaction do
+          data.to_hash.each do |key, value|
+            store_item(locale, value, scope + [key])
+          end
+        # end
       elsif data.respond_to?(:to_str)
         key = ([locale] + scope).join('.')
         @cache[key] ||= data
@@ -96,8 +100,10 @@ def store_item(locale, data, scope = [])
     end
 
     def load_translations_to_cache
-      (@translations || {}).each do |locale, data|
+      ActiveRecord::Base.transaction do
+        (@translations || {}).each do |locale, data|
           store_item(locale, data) if valid_locale?(locale)
+        end
       end
     end