lit 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c57fed1785a83aafbf202508c1e7ef19bace46e
-  data.tar.gz: b82b1ed7715c0dc5e240742ff74555c2fc52cdbf
+  metadata.gz: 4c4bb066b08ec7f1bb1cbd9992dca9e572acde0e
+  data.tar.gz: 704bb8463f8f8f6ff83bd5f0c5b63937323db920
 SHA512:
-  metadata.gz: 262e34d65d5a9b15fafbeec7dc791ee51d2d134a91fabd0824cbd8270ada54bd708d1f65f4d54cd9886a3d4e32662edb9c13b4d09a86f0973cb3382981c0b1c6
-  data.tar.gz: f58f715c589870c276ced4ede59e619320afed3f07290a32f01345c40816a7f252a6ef0d9e0505bfb9c04877cae7a9690982726f26c760d116ff21fafe5bdfe0
+  metadata.gz: 63086561d6b158cbe8ae12a97cc3c6a29d78f1905a4bec3378247f9bb12a13a0cae19d5c0cdcbf4edcb2cfb626058feceb13199a7e290a43b05fdafdb6da9c15
+  data.tar.gz: 8413129a9c31d0c01cd2b6c97dd497d4a018f46848833685e4b27cd77fb5fc6872fe55da123e08c761edc2b0bab264af0ece86052bc159a7bb6a315dd6a632bc

data/README.md

@@ -82,7 +82,7 @@ $ LOCALES=en,de rake lit:export
 ### On-site live translations
 
 1. Add `Lit::FrontendHelper` to your `ApplicationController`
-2. 
+
 	```ruby
 	helper Lit::FrontendHelper
 	```
@@ -97,8 +97,9 @@ $ LOCALES=en,de rake lit:export
 
 3. You're good to go - now log in to lit (if required) and open your frontend in separate tab (to have session persisted). On the bottom-right of your page you should see "Enable / disable lit highlight" - after enabling it you'll be able to click and translate phrases directly in your frontend
 
-4. Once enabled, all translations called via `t` helper function be rendered inside `<span />` tag, what may break your layout (ie if you're using translated values as button values or
-   as placeholders, etc). To avoid that add `skip_lit: true` to `t()` call or use `I18n.t`.
+4. Once enabled, all translations called via `t` helper function be rendered inside `<span />` tag, what may break your layout (ie if you're using translated values as button values or as placeholders, etc). To avoid that add `skip_lit: true` to `t()` call or use `I18n.t`.
+
+5. This feature requires jQuery! (at least for now)
 
 ### Storing request info
 
@@ -139,7 +140,7 @@ Lit.store_request_info = true
 
 4. From now on you'll be able to see all translation keys that were used to render current page. This feature works great with on-site live translations!
 
-5. Lit authorized user must be signed in for this feature to work!
+5. Lit authorized user must be signed in for this feature to work! This feature requires jQuery!
 
 
 

data/app/controllers/lit/application_controller.rb

@@ -23,5 +23,17 @@ module Lit
     def restore_hits_counter
       Lit.init.cache.restore_hits_counter
     end
+
+    def redirect_to_back_or_default(fallback_location: lit.localization_keys_path)
+      if respond_to?(:redirect_back)
+        redirect_back fallback_location: fallback_location
+      else
+        if request.env["HTTP_REFERER"].present? and request.env["HTTP_REFERER"] != request.env["REQUEST_URI"]
+          redirect_to :back
+        else
+          redirect_to fallback_location
+        end
+      end
+    end
   end
 end

data/app/controllers/lit/incomming_localizations_controller.rb

@@ -13,7 +13,7 @@ module Lit
       @incomming_localization.accept
       Lit.init.cache.refresh_key @incomming_localization.full_key
       respond_to do |format|
-        format.html { redirect_to :back }
+        format.html { redirect_to_back_or_default(fallback_location: source_incomming_localizations_path(@source)) }
         format.js
       end
     end
@@ -23,12 +23,12 @@ module Lit
         li.accept
         Lit.init.cache.refresh_key li.full_key
       end
-      redirect_to :back
+      redirect_to_back_or_default(fallback_location: source_incomming_localizations_path(@source))
     end
 
     def reject_all
       @source.incomming_localizations.destroy_all
-      redirect_to :back
+      redirect_to_back_or_default(fallback_location: source_incomming_localizations_path(@source))
     end
 
     def destroy

data/app/models/lit/localization_key.rb

@@ -70,13 +70,13 @@ module Lit
       s = self
       if options[:order] && order_options.include?(options[:order])
         column, order = options[:order].split(' ')
-        s = s.order("#{Lit::LocalizationKey.quoted_table_name}.#{connection.quote_column_name(column)} #{order}")
+        s = s.order(FakeLocalizationKey.arel_table[column.to_sym].send(order.to_sym))
       else
         s = s.ordered
       end
-      localization_key_col = Lit::LocalizationKey.arel_table[:localization_key]
-      default_value_col = Lit::Localization.arel_table[:default_value]
-      translated_value_col = Lit::Localization.arel_table[:translated_value]
+      localization_key_col = FakeLocalizationKey.arel_table[:localization_key]
+      default_value_col = FakeLocalization.arel_table[:default_value]
+      translated_value_col = FakeLocalization.arel_table[:translated_value]
       if options[:key_prefix].present?
         q = "#{options[:key_prefix]}%"
         s = s.where(localization_key_col.matches(q))
@@ -96,5 +96,12 @@ module Lit
       end
       s
     end
+
+    class FakeLocalizationKey < ActiveRecord::Base
+      self.table_name = 'lit_localization_keys'
+    end
+    class FakeLocalization < ActiveRecord::Base
+      self.table_name = 'lit_localizations'
+    end
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.3'.freeze
 end

data/lib/tasks/lit_tasks.rake

@@ -8,7 +8,7 @@ namespace :lit do
     end
   end
 
-  desc 'Reads config/locales/#{ENV["FILES"]} files and calls I18n.t() on keys forcing Lit to import given LOCALE to cache / to display them in UI'
+  desc 'Reads config/locales/#{ENV["FILES"]} files and calls I18n.t() on keys forcing Lit to import given LOCALE to cache / to display them in UI. Skips nils by default (change by setting ENV["SKIP_NIL"] = false'
   task raw_import: :environment do
     return 'you need to define FILES env' if ENV['FILES'].blank?
     return 'you need to define LOCALE env' if ENV['LOCALE'].blank?
@@ -19,6 +19,7 @@ namespace :lit do
         locale_file = File.open(Rails.root.join('config', 'locales', file))
         yml = YAML.load(locale_file)[locale]
         Hash[*Lit::Cache.flatten_hash(yml)].each do |key, default_translation|
+          next if default_translation.nil? && ENV.fetch('SKIP_NIL', 'true') == 'true'
           puts key
           I18n.t(key, default: default_translation)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Maciej Litwiniuk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n