lit 0.2.4 → 0.2.5

data/lib/lit/engine.rb

@@ -2,8 +2,7 @@ module Lit
   class Engine < ::Rails::Engine
     isolate_namespace Lit
 
-
-    initializer "lit.assets.precompile" do |app|
+    initializer 'lit.assets.precompile' do |app|
       app.config.assets.precompile += %w(lit/application.css lit/application.js)
     end
   end

data/lib/lit/i18n_backend.rb

@@ -8,10 +8,11 @@ module Lit
 
     def initialize(cache)
       @cache = cache
+      @available_locales_cache = nil
     end
 
     def translate(locale, key, options = {})
-      content = super(locale, key, options.merge(:fallback => true))
+      content = super(locale, key, options.merge(fallback: Lit.fallback))
       if Lit.all_translations_are_html_safe && content.respond_to?(:html_safe)
         content.html_safe
       else
@@ -20,12 +21,18 @@ module Lit
     end
 
     def available_locales
+      return @available_locales_cache unless @available_locales_cache.nil?
       locales = ::Rails.configuration.i18n.available_locales
-      if locales and !locales.empty?
-        locales
+      if locales && !locales.empty?
+        @available_locales_cache = locales.map(&:to_sym)
       else
-        Lit::Locale.ordered.visible.map{|l| l.locale.to_sym }
+        @available_locales_cache = Lit::Locale.ordered.visible.map { |l| l.locale.to_sym }
       end
+      @available_locales_cache
+    end
+
+    def reset_available_locales_cache
+      @available_locales_cache = nil
     end
 
     # Stores the given translations.
@@ -34,16 +41,14 @@ module Lit
     # @param [Hash] data nested key-value pairs to be added as blurbs
     def store_translations(locale, data, options = {})
       super
-      locales = ::Rails.configuration.i18n.available_locales
-      if !locales || locales.map(&:to_s).include?(locale.to_s)
-        store_item(locale, data)
-      end
+      store_item(locale, data) if store_items? && valid_locale?(locale)
     end
 
-
     private
 
     def lookup(locale, key, scope = [], options = {})
+      init_translations unless initialized?
+
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
 
@@ -51,7 +56,7 @@ module Lit
       content = @cache[key_with_locale] || super
       return content if parts.size <= 1
 
-      unless @cache.has_key?(key_with_locale)
+      if should_cache?(key_with_locale)
         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
 
@@ -90,10 +95,52 @@ module Lit
       end
     end
 
-    def load_translations(*filenames)
+    def load_translations_to_cache
+      (@translations || {}).each do |locale, data|
+          store_item(locale, data) if valid_locale?(locale)
+      end
+    end
+
+    def init_translations
+      # Load all translations from *.yml, *.rb files to @translations variable.
+      # We don't want to store translations in lit cache just yet. We'll do it
+      # with `load_translations_to_cache` when all translations form yml (rb)
+      # files will be loaded.
+      without_store_items { load_translations }
+      # load translations from database to cache
       @cache.load_all_translations
-      super
+      # load translations from @translations to cache
+      load_translations_to_cache
+      @initialized = true
+    end
+
+    def without_store_items
+      @store_items = false
+      yield
+    ensure
+      @store_items = true
+    end
+
+    def store_items?
+      @store_items.nil? || @store_items
+    end
+
+    def valid_locale?(locale)
+      locales = ::Rails.configuration.i18n.available_locales
+      !locales || locales.map(&:to_s).include?(locale.to_s)
     end
 
+    def is_ignored_key(key_without_locale)
+      Lit.ignored_keys.any?{ |k| key_without_locale.start_with?(k) }
+    end
+
+    def should_cache?(key_with_locale)
+      return false if @cache.has_key?(key_with_locale)
+
+      _, key_without_locale = ::Lit::Cache.split_key(key_with_locale)
+      return false if is_ignored_key(key_without_locale)
+
+      true
+    end
   end
 end

data/lib/lit/loader.rb

@@ -8,10 +8,9 @@ module Lit
     attr_accessor :logger
     def initialize
       self.logger ||= Logger.new($stdout)
-      self.logger.info "initializing Lit"
+      self.logger.info 'initializing Lit'
       self.cache ||= Cache.new
       I18n.backend = I18nBackend.new(self.cache)
     end
-
   end
 end

data/lib/lit/railtie.rb

@@ -1,12 +1,12 @@
 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
+    initializer :initialize_lit_rails, after: :before_initialize do
+      # Lit::Rails.initialize
     end
 
-    #rake_tasks do
-      #load "tasks/lit_tasks.rake"
-    #end
+    # rake_tasks do
+    # load "tasks/lit_tasks.rake"
+    # end
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.2.4"
+  VERSION = '0.2.5'
 end

data/lib/tasks/lit_tasks.rake

@@ -1,8 +1,8 @@
 namespace :lit do
-  desc "Exports translated strings from lit to config/locales/lit.yml file."
-  task :export => :environment do
+  desc 'Exports translated strings from lit to config/locales/lit.yml file.'
+  task export: :environment do
     if yml = Lit.init.cache.export
-      PATH = "config/locales/lit.yml"
+      PATH = 'config/locales/lit.yml'
       File.new("#{Rails.root}/#{PATH}", 'w').write(yml)
       puts "Successfully exported #{PATH}."
     end

metadata

@@ -1,89 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Maciej Litwiniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Translate your apps with pleasure (sort of...) and for free. It''s
-  simple i18n web interface, build on top of twitter bootstrap, that one may find
-  helpful in translating app by non-technicals. '
+description: 'Translate your apps with pleasure (sort of...) and for free. It''s simple
+  i18n web interface, build on top of twitter bootstrap, that one may find helpful
+  in translating app by non-technicals. '
 email:
 - maciej@litwiniuk.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/images/lit/famfamfam_flags/ad.png
 - app/assets/images/lit/famfamfam_flags/ae.png
 - app/assets/images/lit/famfamfam_flags/af.png
@@ -375,6 +383,8 @@ files:
 - app/views/layouts/lit/_navigation.html.erb
 - app/views/layouts/lit/application.html.erb
 - app/views/lit/dashboard/index.html.erb
+- app/views/lit/incomming_localizations/accept.js.erb
+- app/views/lit/incomming_localizations/destroy.js.erb
 - app/views/lit/incomming_localizations/index.html.erb
 - app/views/lit/locales/_hide_link.html.erb
 - app/views/lit/locales/hide.js.erb
@@ -404,6 +414,7 @@ files:
 - db/migrate/20130924151910_create_lit_incomming_localizations.rb
 - lib/generators/lit/install/templates/initializer.rb
 - lib/generators/lit/install_generator.rb
+- lib/lit.rb
 - lib/lit/adapters/hash_storage.rb
 - lib/lit/adapters/redis_storage.rb
 - lib/lit/cache.rb
@@ -413,34 +424,29 @@ files:
 - lib/lit/rails.rb
 - lib/lit/railtie.rb
 - lib/lit/version.rb
-- lib/lit.rb
 - lib/tasks/lit_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/prograils/lit
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Database powered i18n backend with web gui
 test_files: []