lit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbd506c6be8279728e5da85a4857dd542c75cdc752efac9745dd7e2ba022a5c
-  data.tar.gz: 45bf91076203d8be22b2da854886657ddb85f07acbc42cd287b9246883e0955d
+  metadata.gz: a051d3c6a1e4a1db24c3818aae84d51f42df73a907c23b787f6f5b3c40f798aa
+  data.tar.gz: e080032aebf0428fdfd9ca2bc3a0c75964774b774c1caed2329cbb337d70cd9e
 SHA512:
-  metadata.gz: b78bb6b6ef52a2010d0725165a0e898d72dbf5fcf843b4ae756291f5648032e12ac1c6ded47a90418b258627c5ea1521e956dbd3e1387f428d623ec144a0c9cc
-  data.tar.gz: ce87f326e76dce205a987bbb1474a154406afd5fda42a9f3b92017cd8912f621a54ef36a16bd1f0861e6193341a0db24220341a8d1c5120cdfbbb3d2438473c5
+  metadata.gz: 679930cd3c4ee3d0c506dce93b471b8df4edbaac0772ef05d0a9caac3878d284d467599234bed06f77876af6dff2a25bded7f8a1f223bfbabfde2ddfe8ab7ed1
+  data.tar.gz: 5c6908710836b9f2c11a5da6933e616883e8fdb8ff497908c5cd2ad37c4279ab2b558fb46b1b87f07ae35adceb11143e093ac82393244cf9b6cf440ad4d79a84

data/app/controllers/lit/api/v1/localizations_controller.rb

@@ -2,34 +2,26 @@ module Lit
   class Api::V1::LocalizationsController < Api::V1::BaseController
     def index
       @localizations = fetch_localizations
-      render json: @localizations.as_json(
-        root: false,
-        only: %i[id localization_key_id locale_id],
-        methods: %i[
-          value localization_key_str locale_str
-          localization_key_is_deleted
-        ]
-      )
+      render json:
+               @localizations.as_json(
+                 root: false,
+                 only: %i[id localization_key_id locale_id],
+                 methods: %i[value localization_key_str locale_str localization_key_is_deleted],
+               )
     end
 
     def last_change
       @localization = Localization.order(updated_at: :desc).first
-      render json: @localization.as_json(
-        root: false, only: [], methods: [:last_change]
-      )
+      render json: @localization.as_json(root: false, only: [], methods: [:last_change])
     end
 
     private
 
     def fetch_localizations
-      scope = Localization.includes(
-        :locale,
-        :localization_key
-      )
+      scope = Localization.includes(:locale, :localization_key)
 
       if params[:after].present?
-        after_date = Time.parse("#{params[:after]} #{Time.zone.name}")
-                         .in_time_zone
+        after_date = Time.parse("#{params[:after]} #{Time.zone.name}").in_time_zone
         scope.after(after_date).to_a
       else
         scope.all

data/app/models/lit/incomming_localization.rb

@@ -36,39 +36,27 @@ module Lit
     def duplicated?(val)
       set_localization
       return false if localization_has_changed?
-      translated_value =
-        localization.read_attribute_before_type_cast('translated_value')
-      if localization.is_changed? && !translated_value.nil?
-        translated_value == val
-      else
-        localization.read_attribute_before_type_cast('default_value') == val
-      end
+
+      localization.translation == val
     end
 
     private
 
     def set_localization
       return if locale.blank? || localization_key.blank?
-      self.localization = localization_key.localizations
-                                          .find_by(locale_id: locale_id)
+      self.localization = localization_key.localizations.find_by(locale_id: locale_id)
     end
 
     def localization_has_changed?
-      localization.blank? ||
-        localization.is_deleted != localization_key_is_deleted
+      localization.blank? || localization.is_deleted != localization_key_is_deleted
     end
 
     def update_existing_localization_data
-      localization.update!(
-        translated_value: translated_value,
-        is_changed: true
-      )
+      localization.update!(translated_value: translated_value, is_changed: true)
     end
 
     def update_existing_localization_key_data
-      localization_key.update!(
-        is_deleted: localization_key_is_deleted
-      )
+      localization_key.update!(is_deleted: localization_key_is_deleted)
     end
 
     def assign_new_localization_data
@@ -83,25 +71,23 @@ module Lit
 
     def assign_new_localization_key
       self.localization_key =
-        Lit::LocalizationKey.where(
-          localization_key: localization_key_str,
-          is_deleted: localization_key_is_deleted
-        ).first_or_create!
+        Lit::LocalizationKey.where(localization_key: localization_key_str, is_deleted: localization_key_is_deleted)
+          .first_or_create!
     end
 
     def assign_new_localization
       self.localization =
-        Lit::Localization.where(localization_key_id: localization_key.id)
-                         .where(locale_id: locale.id)
-                         .first_or_initialize
+        Lit::Localization
+          .where(localization_key_id: localization_key.id)
+          .where(locale_id: locale.id)
+          .first_or_initialize
       localization.translated_value = translated_value
       localization.is_changed = true
       localization.save!
     end
 
     def update_cache
-      Lit.init.cache.update_cache localization.full_key,
-                                  localization.translation
+      Lit.init.cache.update_cache localization.full_key, localization.translation
     end
   end
 end

data/app/models/lit/localization.rb

@@ -6,19 +6,14 @@ module Lit
     ## SCOPES
     scope :changed, -> { where is_changed: true }
     scope :not_changed, -> { where is_changed: false }
+
     # @HACK: dirty, find a way to round date to full second
-    scope :after, lambda { |dt|
-      where('updated_at >= ?', dt + 1.second)
-        .where(is_changed: true)
-    }
-    scope :active, lambda {
-      joins(:localization_key)
-        .where(Lit::LocalizationKey.table_name => { is_deleted: false })
-    }
+    scope :after, lambda { |dt| where('updated_at >= ?', dt + 1.second).where(is_changed: true) }
+    scope :active, lambda { joins(:localization_key).where(Lit::LocalizationKey.table_name => { is_deleted: false }) }
 
     ## ASSOCIATIONS
-    belongs_to :locale
-    belongs_to :localization_key, touch: true
+    belongs_to :locale, required: true
+    belongs_to :localization_key, touch: true, required: true
     has_many :localization_versions, dependent: :destroy
     has_many :versions, class_name: '::Lit::LocalizationVersion'
 
@@ -31,9 +26,7 @@ module Lit
     ## ACCESSORS
     attr_accessor :full_key_str
 
-    unless defined?(::ActionController::StrongParameters)
-      attr_accessible :translated_value, :locale_id
-    end
+    attr_accessible :translated_value, :locale_id unless defined?(::ActionController::StrongParameters)
 
     ## BEFORE & AFTER
     with_options if: :translated_value_changed? do |o|
@@ -94,6 +87,5 @@ module Lit
       translated_value = translated_value_was || default_value
       localization_versions.new(translated_value: translated_value)
     end
-
   end
 end

data/app/services/remote_interactor_service.rb

@@ -27,7 +27,7 @@ class RemoteInteractorService
 
   def initialize_request(uri)
     req = Net::HTTP::Get.new(uri.request_uri)
-    req.add_field('Authorization', %(Token token="#{@source.api_key}"))
+    req.add_field('Authorization', "Token token=\"#{@source.api_key}\"")
     req
   end
 
@@ -41,6 +41,7 @@ class RemoteInteractorService
   def perform_request(connection, request)
     res = connection.start { |http| http.request(request) }
     return res unless res.is_a?(Net::HTTPSuccess)
+
     JSON.parse(res.body)
   end
 end

data/app/services/synchronize_source_service.rb

@@ -12,8 +12,7 @@ class SynchronizeSourceService
 
   def synchronize_localizations
     after_date = @source.last_updated_at&.to_s(:db)
-    result = interactor.send_request Lit::Source::LOCALIZATIONS_PATH,
-                                     after: after_date
+    result = interactor.send_request Lit::Source::LOCALIZATIONS_PATH, after: after_date
     return unless result&.is_a?(Array)
     result.each { |loc| synchronize_localization loc }
   end
@@ -28,19 +27,16 @@ class SynchronizeSourceService
     inc_loc.localization_key = find_localization_key(inc_loc)
     inc_loc.translated_value = loc['value']
     return if inc_loc.duplicated?(loc['value'])
+
     inc_loc.save!
   end
 
   def find_incomming_localization(localization)
-    Lit::IncommingLocalization.find_or_initialize_by(
-      incomming_id: localization['id']
-    )
+    Lit::IncommingLocalization.find_or_initialize_by(incomming_id: localization['id'])
   end
 
   def find_localization_key(inc_loc)
-    Lit::LocalizationKey.find_by(
-      localization_key: inc_loc.localization_key_str
-    )
+    Lit::LocalizationKey.find_by(localization_key: inc_loc.localization_key_str)
   end
 
   def localization_key_deleted?(loc)

data/lib/lit/adapters/redis_storage.rb

@@ -22,14 +22,15 @@ module Lit
     def exists?(key)
       # Use recommended binary-returning method create [with this redis-rb commit](https://github.com/redis/redis-rb/commit/bf42fc9e0db4a1719d9b1ecc65aeb20425d44427).
       return Lit.redis.exists?(key) if Lit.redis.respond_to?(:exists?)
+
       # Fall back with older gem
       Lit.redis.exists(key)
     end
 
     def [](key)
-      if self.exists?(_prefixed_key_for_array(key))
+      if exists?(_prefixed_key_for_array(key))
         Lit.redis.lrange(_prefixed_key(key), 0, -1)
-      elsif self.exists?(_prefixed_key_for_nil(key))
+      elsif exists?(_prefixed_key_for_nil(key))
         nil
       else
         val = Lit.redis.get(_prefixed_key(key))
@@ -69,7 +70,7 @@ module Lit
     end
 
     def has_key?(key)
-      self.exists?(_prefixed_key(key))
+      exists?(_prefixed_key(key))
     end
     alias key? has_key?
 

data/lib/lit/cache.rb

@@ -18,6 +18,9 @@ end
 
 module Lit
   class Cache
+    @@last_update = nil
+    @@localization_cache = {}
+
     def initialize
       @hits_counter = Lit.get_key_value_engine
       @request_info_store = Lit.get_key_value_engine
@@ -32,6 +35,7 @@ module Lit
 
     def [](key)
       value = nil
+      check_and_clean_if_required
       unless localization_cache.key?(key)
         value = localizations[key]
         localization_cache[key] = value
@@ -81,6 +85,7 @@ module Lit
       locale = find_locale(locale_key)
       localization = find_localization(locale, key_without_locale, value: value, force_array: force_array, update_value: true)
       return localization.translation if startup_process && localization.is_changed?
+
       localizations[key] = localization.translation if localization
       localization_cache[key] = localizations[key]
     end
@@ -120,6 +125,7 @@ module Lit
       @localization_object_cache.delete(key)
       localization = find_localization(locale, key_without_locale, default_fallback: true)
       localizations[key] = localization.translation if localization
+      clear_localization_cache
     end
 
     def delete_key(key)
@@ -175,11 +181,26 @@ module Lit
     end
 
     def localization_cache
-      Thread.current[:lit_thread_cache] ||= {}
+      # Thread.current[:lit_thread_cache] ||= {}
+      @@localization_cache ||= {}
     end
 
     def clear_localization_cache
-      Thread.current[:lit_thread_cache] = {}
+      # Thread.current[:lit_thread_cache] = {}
+      @@localization_cache = {}
+    end
+
+    def check_and_clean_if_required
+      # we want this method to run only once during a request or background job
+      return if Thread.current[:localization_cache_valid]
+
+      # get most recently updated translation and compare with what we store in class var
+      last_up = Lit::Localization.order(updated_at: :desc).limit(1).pluck(:updated_at).first.to_i
+      if last_up != @@last_update
+        clear_localization_cache
+        @@last_update = last_up
+      end
+      Thread.current[:localization_cache_valid] = true
     end
 
     private

data/lib/lit/middleware.rb

@@ -0,0 +1,29 @@
+require 'rack/body_proxy'
+
+# A middleware that ensures the lit thread value is cleared after
+# the last part of the body is rendered. This is useful when
+# using streaming.j
+#
+# Uses Rack::BodyProxy, adapted from Rack::Lock's usage of the
+# same pattern.
+#
+
+module Lit
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      Thread.current[:localization_cache_valid] = false
+      response = @app.call(env)
+
+      # for streaming support wrap request in Rack::BodyProxy
+      response << Rack::BodyProxy.new(response.pop) do
+        Thread.current[:localization_cache_valid] = false
+      end
+    ensure
+      Thread.current[:localization_cache_valid] = false
+    end
+  end
+end

data/lib/lit/rails.rb

@@ -11,6 +11,7 @@ module Lit
 end
 
 if defined?(Rails::Railtie)
+  require 'lit/middleware'
   require 'lit/railtie'
 else
   Lit::Rails.initialize

data/lib/lit/railtie.rb

@@ -1,12 +1,11 @@
 module Lit
   class Railtie < ::Rails::Railtie
-    ## INITIALIZE IN config/initialize if you want to use redis!!!
-    initializer :initialize_lit_rails, after: :before_initialize do
-      # Lit::Rails.initialize
-    end
+    initializer :lit_middleware do |app|
+      app.config.middleware.insert_after ActionDispatch::RequestId, Lit::Middleware
 
-    # rake_tasks do
-    # load "tasks/lit_tasks.rake"
-    # end
+      ActiveSupport::Reloader.to_complete do
+        Thread.current[:localization_cache_valid] = false
+      end
+    end
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Maciej Litwiniuk
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -319,6 +319,7 @@ files:
 - lib/lit/i18n_backend.rb
 - lib/lit/import.rb
 - lib/lit/loader.rb
+- lib/lit/middleware.rb
 - lib/lit/rails.rb
 - lib/lit/railtie.rb
 - lib/lit/services/localization_keys_to_hash_service.rb
@@ -343,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Database powered i18n backend with web gui