lit 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5dfa0728bf37d5d8ec30cf4e41f35fdbb3b983435dc7bfb13f32dfb6f7a158
-  data.tar.gz: 30790191f771ca56d7e0fa4437a8dc24ef2cabb93ba001165ad1ad1f6d134b6e
+  metadata.gz: ecbd506c6be8279728e5da85a4857dd542c75cdc752efac9745dd7e2ba022a5c
+  data.tar.gz: 45bf91076203d8be22b2da854886657ddb85f07acbc42cd287b9246883e0955d
 SHA512:
-  metadata.gz: d2681e97e1f16e71ecccb21fdd61075538396f02755d14241c157c2d9862ba3d507b0110cfe8dcb052bdd7a85198805b59c1ad42968aa68c1bb5352e132711fa
-  data.tar.gz: e90e44494c18adcc7c6ccbb4fc9d3e6963cba5269daea7eb8f0c53619ba33eb086b09ce692fd7479171f44aa3c6396993bd5fe7cf948b76f8605526b4485ac95
+  metadata.gz: b78bb6b6ef52a2010d0725165a0e898d72dbf5fcf843b4ae756291f5648032e12ac1c6ded47a90418b258627c5ea1521e956dbd3e1387f428d623ec144a0c9cc
+  data.tar.gz: ce87f326e76dce205a987bbb1474a154406afd5fda42a9f3b92017cd8912f621a54ef36a16bd1f0861e6193341a0db24220341a8d1c5120cdfbbb3d2438473c5

data/README.md

@@ -128,7 +128,7 @@ Lit::CloudTranslation.provider = Lit::CloudTranslation::Providers::Google
 
 ...and make sure you have this in your Gemfile:
 ```
-gem 'google-cloud-translate'
+gem 'google-cloud-translate', '~> 1.2.4'
 ```
 
 To use translation via Google, you need to obtain a [service account key](https://cloud.google.com/iam/docs/creating-managing-service-account-keys) containing all the credentials required by the API.
@@ -145,6 +145,13 @@ These credentials can be given in three ways:
       ... # see Google docs link above for reference
     }
   end
+  
+  # For example, for Rails 6, from encrypted credentials file (HashWithIndifferentAccess is used, because the keys in
+   the credentials.config could be strings or, as well, symbols):
+  
+  Lit::CloudTranslation.configure do |config|
+    config.keyfile_hash = HashWithIndifferentAccess.new(Rails.application.credentials.config[:google_translate_api])
+  end
   ```
 * directly via `GOOGLE_TRANSLATE_API_<element>` environment variables, where e.g. the `GOOGLE_TRANSLATE_API_PROJECT_ID` variable corresponds to the `project_id` element of a JSON keyfile. Typically, only the following variables are mandatory:
   * `GOOGLE_TRANSLATE_API_PROJECT_ID`
@@ -273,7 +280,8 @@ Lit.store_request_info = true
 1. `gem install bundler && bundle install` - ensure Bundler and all required gems are installed
 2. `bundle exec appraisal install` - install gems from appraisal's gemfiles
 3. `cp test/dummy/config/database.yml.sample test/dummy/config/database.yml` - move a database.yml in place (remember to fill your DB credentials in it)
-4. `RAILS_ENV=test appraisal rails-5.2 rake db:setup` - setup lit DB (see test/config/database.yml); do it only once, it does not matter which Rails version you use for `appraisal`
+4. `RAILS_ENV=test bundle exec appraisal rails-5.2 rake db:setup` - setup lit DB (see test/config/database.yml); do it
+ only once, it does not matter which Rails version you use for `appraisal`
 5. `bundle exec appraisal rake` - run the tests!
 
 ### License

data/app/assets/javascripts/lit/backend/bootstrap.min.js

@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+if("undefined"==typeof jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]'),b=!0;if(a.length){var c=this.$element.find("input");"radio"===c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?b=!1:a.find(".active").removeClass("active")),b&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}b&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i<h.length-1&&i++,~i||(i=0),h.eq(i).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu]",f.prototype.keydown)}(jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.load(this.options.remote)};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show(),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h<o?"right":d,c.removeClass(k).addClass(d)}var p=this.getCalculatedOffset(d,g,h,i);this.applyPlacement(p,d),this.$element.trigger("shown.bs."+this.type)}},b.prototype.applyPlacement=function(a,b){var c,d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),a.top=a.top+g,a.left=a.left+h,d.offset(a).addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;if("top"==b&&j!=f&&(c=!0,a.top=a.top+f-j),/bottom|top/.test(b)){var k=0;a.left<0&&(k=-2*a.left,a.left=0,d.offset(a),i=d[0].offsetWidth,j=d[0].offsetHeight),this.replaceArrow(k-e+i,i,"left")}else this.replaceArrow(j-f,j,"top");c&&d.offset(a)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach()}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.$element.trigger("hidden.bs."+this.type),this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);

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

@@ -22,12 +22,17 @@ module Lit
     private
 
     def fetch_localizations
+      scope = Localization.includes(
+        :locale,
+        :localization_key
+      )
+
       if params[:after].present?
         after_date = Time.parse("#{params[:after]} #{Time.zone.name}")
                          .in_time_zone
-        Localization.after(after_date).to_a
+        scope.after(after_date).to_a
       else
-        Localization.all
+        scope.all
       end
     end
   end

data/app/controllers/lit/localization_keys_controller.rb

@@ -37,6 +37,10 @@ module Lit
          @scope.respond_to?(Kaminari.config.page_method_name)
         @scope = @scope.send(Kaminari.config.page_method_name, params[:page])
       end
+      if defined?(WillPaginate) &&
+         @scope.respond_to?(:paginate)
+        @scope = @scope.paginate(page: params[:page])
+      end
       get_localization_keys
       render action: :index
     end
@@ -88,6 +92,8 @@ module Lit
       end
       if defined?(Kaminari) and @scope.respond_to?(Kaminari.config.page_method_name)
         @localization_keys = @scope.send(Kaminari.config.page_method_name, params[:page])
+      elsif defined?(WillPaginate) and @scope.respond_to?(:paginate)
+        @localization_keys = @scope.paginate(page: params[:page])
       else
         @localization_keys = @scope
       end

data/app/controllers/lit/localizations_controller.rb

@@ -20,7 +20,7 @@ module Lit
       # #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)
+        after_update_operations if @localization.update(clear_params)
       end
       respond_to do |f|
         f.js

data/app/controllers/lit/sources_controller.rb

@@ -40,7 +40,7 @@ module Lit
     end
 
     def update
-      if @source.update_attributes(clear_params)
+      if @source.update(clear_params)
         redirect_to @source, notice: 'Source was successfully updated.'
       else
         render action: 'edit'

data/app/helpers/lit/frontend_helper.rb

@@ -9,7 +9,7 @@ module Lit
         key = scope_key_by_partial(key)
         key = pluralized_key(key, count) if count
 
-        content = super(key, options)
+        content = super(key, options.symbolize_keys)
         if !options[:skip_lit] && lit_authorized?
           content = get_translateable_span(key, content)
         end

data/app/helpers/lit/localizations_helper.rb

@@ -9,6 +9,15 @@ module Lit
       escape_javascript val.to_s
     end
 
+    def locale_flag locale
+      locale = locale.to_s.upcase[0,2]
+      locale = case locale
+               when 'EN' then 'GB'
+               else locale
+               end
+      locale.tr('A-Z', "\u{1F1E6}-\u{1F1FF}")
+    end
+
     def allow_wysiwyg_editor?(key)
       Lit.all_translations_are_html_safe || key.to_s =~ /(\b|_|\.)html$/
     end

data/app/models/lit/base.rb

@@ -1,38 +1,54 @@
 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
+  before_save :mark_for_retry
 
   attr_accessor :retried_created, :retried_updated
 
-  def mark_for_retry_on_create
+  def mark_for_retry
     @will_retry_create = true
   end
 
-  def mark_for_retry_on_update
-    @will_retry_update = true
+  after_rollback :retry_lit_model_save
+
+  def rolledback_after_insert?
+    persisted? && @was_saved_with_insert && @was_rolled_back
   end
 
-  after_rollback :retry_lit_model_save
+  def rolledback_after_update?
+    persisted? && @was_saved_with_update && @was_rolled_back
+  end
 
   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
+  def create_or_update(*args, &block)
+    @was_saved_with_insert = true if new_record?
+    @was_saved_with_update = true if persisted?
+
+    super
   end
 
-  def retry_on_create
-    return if self.retried_created
-    self.retried_created = true
-    self.class.create! attributes.merge(retried_created: true)
+  def retry_lit_model_save
+    return if @was_rolled_back
+    @was_rolled_back = true
+    do_retry if instance_variable_defined?(:@will_retry_create) && @will_retry_create
   end
 
-  def retry_on_update
-    return if self.retried_updated
-    self.retried_updated = true
-    update! attributes.merge(retried_updated: true)
+  def do_retry
+    if !retried_created
+      self.retried_created = true
+      if rolledback_after_insert?
+        self.class.create! attributes.merge(retried_created: true)
+      end
+    elsif !retried_updated
+      # Why elsif and not just if? Because if a record object was first saved
+      # with INSERT and then with UPDATE (still being the same Ruby object),
+      # it makes no sense to retry both create and upadte. Let's only retry create.
+      self.retried_updated = true
+      if rolledback_after_update?
+        update_columns(attributes)
+      end
+    end
   end
 
 end

data/app/models/lit/incomming_localization.rb

@@ -59,14 +59,14 @@ module Lit
     end
 
     def update_existing_localization_data
-      localization.update_attributes!(
+      localization.update!(
         translated_value: translated_value,
         is_changed: true
       )
     end
 
     def update_existing_localization_key_data
-      localization_key.update_attributes!(
+      localization_key.update!(
         is_deleted: localization_key_is_deleted
       )
     end

data/app/services/remote_interactor_service.rb

@@ -11,6 +11,7 @@ class RemoteInteractorService
   rescue => e
     return unless defined?(Rails)
     ::Rails.logger.error { "Lit remote error: #{e}" }
+    nil # Return nil to be consistent with checks for .nil? otherwise returns True
   end
 
   private

data/app/views/layouts/lit/application.html.erb

@@ -10,7 +10,6 @@
     <%= stylesheet_link_tag    '//netdna.bootstrapcdn.com/bootswatch/3.0.3/yeti/bootstrap.min.css', media: 'all' %>
     <%= stylesheet_link_tag    'lit/application', media: 'all' %>
     <%= javascript_include_tag 'lit/application' %>
-    <%= javascript_include_tag '//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js' %>
     <%= csrf_meta_tags %>
   </head>
   <body class="<%= params[:controller] %>">

data/app/views/lit/localization_keys/index.html.erb

@@ -4,6 +4,8 @@
 
 <% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
+<% elsif defined?(WillPaginate)  %>
+  <%= will_paginate @localization_keys %>
 <% end %>
 
 <%= render 'sidebar' %>

data/app/views/lit/localization_keys/not_translated.html.erb

@@ -4,6 +4,8 @@
 
 <% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
+<% elsif defined?(WillPaginate)  %>
+  <%= will_paginate @localization_keys %>
 <% end %>
 
 <%= render 'sidebar' %>

data/app/views/lit/localization_keys/visited_again.html.erb

@@ -4,6 +4,9 @@
 
 <% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
+<% elsif defined?(WillPaginate)  %>
+  <%= will_paginate @localization_keys %>
 <% end %>
 
+
 <%= render 'sidebar' %>

data/lib/generators/lit/install/templates/initializer.rb

@@ -29,11 +29,14 @@ Lit.all_translations_are_html_safe = false
 # <span title="translation missing string"></span>
 Lit.humanize_key = false
 
-# If set to `true` will always parse yaml files upon startup and update cache
-# values with ones with yaml - but only, if those keys haven't been changed via
-# web ui before
+# If set to `false` will always parse yaml files upon startup and update cached
+# values with ones with yaml (but only, if those keys haven't been changed via
+# web ui before)
 Lit.ignore_yaml_on_startup = true
 
+# Array of ignored keys or key prefixes
+Lit.ignored_keys = ['i18n.transliterate'].freeze
+
 # API enabled? API allows third party browsing your translations, as well as
 # synchronizing them between environments
 Lit.api_enabled = false

data/lib/lit.rb

@@ -17,6 +17,8 @@ module Lit
   mattr_accessor :all_translations_are_html_safe
   mattr_accessor :set_last_updated_at_upon_creation
   mattr_accessor :store_request_info
+  mattr_accessor :store_request_keys
+  mattr_accessor :hits_counter_enabled
 
   class << self
     attr_accessor :loader
@@ -30,13 +32,16 @@ module Lit
       Lit.humanize_key_ignored_keys = [] if Lit.humanize_key_ignored_keys.nil?
       Lit.humanize_key_ignored = %w[i18n date datetime number time support ]
       Lit.humanize_key_ignored |= Lit.humanize_key_ignored_keys
-      Lit.humanize_key_ignored = %r{(#{Lit.humanize_key_ignored.join('|')}).*}
-      if Lit.ignored_keys.is_a?(String)
-        keys = Lit.ignored_keys.split(',').map(&:strip)
-        Lit.ignored_keys = keys
-      end
+      Lit.humanize_key_ignored = Regexp.new("(#{Lit.humanize_key_ignored.join('|')}).*")
       Lit.ignore_yaml_on_startup = true if Lit.ignore_yaml_on_startup.nil?
+
+      Lit.ignored_keys = Lit.ignored_keys.split(',').map(&:strip) if Lit.ignored_keys.is_a?(String)
       Lit.ignored_keys = [] unless Lit.ignored_keys.is_a?(Array)
+      Lit.ignored_keys = Lit.ignored_keys.map(&:freeze).freeze
+
+      Lit.hits_counter_enabled = false if Lit.hits_counter_enabled.nil?
+      Lit.store_request_info = false if Lit.store_request_info.nil?
+      Lit.store_request_keys = false if Lit.store_request_keys.nil?
       # if loading all translations on start, migrations have to be already
       # performed, fails on first deploy
       # self.loader.cache.load_all_translations
@@ -47,7 +52,15 @@ module Lit
 
   def self.check_if_table_exists
     Lit::Locale.table_exists?
-  rescue
+  rescue ActiveRecord::ActiveRecordError => e
+    log_txt =
+      "An #{e.class} error has been raised during Lit initialization. " \
+      "Lit assumes that database tables do not exist.\n\n" \
+      "Error: #{e.message}\n\n" \
+      "Backtrace:\n" \
+      "#{e.backtrace.join("\n")}"
+    Logger.new(STDOUT).error(log_txt) if ::Rails.env.test? # ensure this is logged to stdout in test
+    ::Rails.logger.error(log_txt)
     false
   end
 

data/lib/lit/adapters/hash_storage.rb

@@ -2,11 +2,45 @@ module Lit
   class HashStorage < Hash
     def incr(key)
       self[key] ||= 0
-      self[key] += 1
+      if self[key].is_a?(Integer)
+        self[key] += 1
+      else
+        subtree_keys(key).each { |k| self[k] += 1 }
+      end
     end
 
     def prefix
       nil
     end
+
+    def [](key)
+      super || subtree_of_key(key)
+    end
+
+    private
+
+    def subtree_of_key(key)
+      keys_of_subtree = subtree_keys(key)
+      return nil if keys_of_subtree.empty?
+
+      cache_localizations = form_cache_localizations(keys_of_subtree)
+
+      full_subtree = Lit::LocalizationKeysToHashService.call(cache_localizations)
+      requested_part = full_subtree.dig(*key.split('.'))
+      return nil if requested_part.blank?
+      return requested_part if requested_part.is_a?(String)
+
+      requested_part.deep_transform_keys(&:to_sym)
+    end
+
+    def subtree_keys(key)
+      keys.select { |k| k.match?(/\A#{key}*/) }
+    end
+
+    def form_cache_localizations(keys_of_subtree)
+      self_copy = self.select { |k, _| k.in?(keys_of_subtree) }
+      values_of_subtree = keys_of_subtree.map { |k| self_copy[k] }
+      Hash[keys_of_subtree.zip(values_of_subtree)]
+    end
   end
 end

data/lib/lit/adapters/redis_storage.rb

@@ -1,4 +1,6 @@
 require 'redis'
+require 'lit/services/localization_keys_to_hash_service'
+
 module Lit
   extend self
   def redis
@@ -16,13 +18,24 @@ module Lit
       Lit.redis
     end
 
+    # This handles a change in the redis-rb gem that changes exists => exists?
+    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 Lit.redis.exists(_prefixed_key_for_array(key))
+      if self.exists?(_prefixed_key_for_array(key))
         Lit.redis.lrange(_prefixed_key(key), 0, -1)
-      elsif Lit.redis.exists(_prefixed_key_for_nil(key))
+      elsif self.exists?(_prefixed_key_for_nil(key))
         nil
       else
-        Lit.redis.get(_prefixed_key(key))
+        val = Lit.redis.get(_prefixed_key(key))
+        return val if val.present?
+
+        subtree_of_key(key)
       end
     end
 
@@ -56,7 +69,7 @@ module Lit
     end
 
     def has_key?(key)
-      Lit.redis.exists(_prefixed_key(key))
+      self.exists?(_prefixed_key(key))
     end
     alias key? has_key?
 
@@ -77,11 +90,13 @@ module Lit
     private
 
     def _prefix
-      prefix = 'lit:'
+      return @prefix_cached if @prefix_cached.present?
+
+      @prefix_cached = 'lit:'
       if Lit.storage_options.is_a?(Hash) && Lit.storage_options.key?(:prefix)
-        prefix += "#{Lit.storage_options[:prefix]}:"
+        @prefix_cached += "#{Lit.storage_options[:prefix]}:"
       end
-      prefix
+      @prefix_cached
     end
 
     def _prefixed_key(key = '')
@@ -95,5 +110,24 @@ module Lit
     def _prefixed_key_for_nil(key = '')
       _prefix + 'nil_flags:' + key.to_s
     end
+
+    def subtree_of_key(key)
+      keys_of_subtree = Lit.redis.keys("#{_prefixed_key(key)}*")
+      return nil if keys_of_subtree.empty?
+
+      values_of_subtree = Lit.redis.mget(keys_of_subtree)
+      cache_localizations = form_cache_localizations(keys_of_subtree, values_of_subtree)
+
+      full_subtree = Lit::LocalizationKeysToHashService.call(cache_localizations)
+      requested_part = full_subtree.dig(*key.split('.'))
+      return nil if requested_part.blank?
+      return requested_part if requested_part.is_a?(String)
+
+      requested_part.deep_transform_keys(&:to_sym)
+    end
+
+    def form_cache_localizations(keys, values)
+      Hash[keys.map { |k| k.sub(_prefix, '') }.zip(values)]
+    end
   end
 end

data/lib/lit/cache.rb

@@ -21,19 +21,32 @@ module Lit
     def initialize
       @hits_counter = Lit.get_key_value_engine
       @request_info_store = Lit.get_key_value_engine
-      @hits_counter_working = true
+      @hits_counter_working = Lit.hits_counter_enabled
       @keys = nil
+
+      # current instance cache
       @localization_object_cache = {}
       @localization_key_object_cache = {}
+      clear_localization_cache
     end
 
     def [](key)
-      key_without_locale = split_key(key).last
-      update_hits_count(key)
-      store_request_info(key_without_locale)
-      localization = localizations[key]
-      update_request_keys(key_without_locale, localization)
-      localization
+      value = nil
+      unless localization_cache.key?(key)
+        value = localizations[key]
+        localization_cache[key] = value
+      else
+        value = localization_cache[key]
+      end
+      update_hits_count(key) if @hits_counter_working
+
+      if Lit.store_request_info ||
+         Lit.store_request_keys
+        key_without_locale = split_key(key).last
+        store_request_info(key_without_locale)
+        update_request_keys(key_without_locale, value)
+      end
+      value
     end
 
     def []=(key, value)
@@ -45,7 +58,8 @@ module Lit
     end
 
     def has_key?(key)
-      localizations.has_key?(key)
+      # check for instance cache first
+      localization_cache.has_key?(key) || localizations.has_key?(key)
     end
 
     def sync
@@ -68,11 +82,13 @@ module Lit
       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
 
     def update_cache(key, value)
       key = key.to_s
       localizations[key] = value
+      localization_cache[key] = value
     end
 
     def delete_locale(key)
@@ -83,6 +99,7 @@ module Lit
       delete_localization(locale, key_without_locale)
       @localization_key_object_cache = {}
       @localization_object_cache = {}
+      clear_localization_cache
     end
 
     def load_all_translations
@@ -119,6 +136,8 @@ module Lit
       @locale_cache = {}
       @localization_key_object_cache = {}
       @localization_object_cache = {}
+      @localization_cache = {}
+      clear_localization_cache
     end
 
     def reset
@@ -132,7 +151,7 @@ module Lit
     def find_locale(locale_key)
       locale_key = locale_key.to_s
       @locale_cache ||= {}
-      unless @locale_cache.key?(locale_key)
+      unless @locale_cache.key?(locale_key) && @locale_cache[locale_key].id
         locale = Lit::Locale.where(locale: locale_key).first_or_create!
         @locale_cache[locale_key] = locale
       end
@@ -155,6 +174,14 @@ module Lit
       @hits_counter_working = true
     end
 
+    def localization_cache
+      Thread.current[:lit_thread_cache] ||= {}
+    end
+
+    def clear_localization_cache
+      Thread.current[:lit_thread_cache] = {}
+    end
+
     private
 
     def localizations
@@ -309,6 +336,7 @@ module Lit
 
     def update_hits_count(key)
       return unless @hits_counter_working
+
       key_without_locale = split_key(key).last
       @hits_counter.incr('hits_counter.' + key)
       @hits_counter.incr('global_hits_counter.' + key_without_locale)
@@ -317,6 +345,7 @@ module Lit
     def store_request_info(key_without_locale)
       return unless Lit.store_request_info
       return unless Thread.current[:lit_current_request_path].present?
+
       info = get_request_info(key_without_locale)
       parts = info.split(' ').push(Thread.current[:lit_current_request_path]).uniq
       parts.shift if parts.count > 10
@@ -324,7 +353,9 @@ module Lit
     end
 
     def update_request_keys(key_without_locale, localization)
+      return unless Lit.store_request_keys
       return if Thread.current[:lit_request_keys].nil?
+
       Thread.current[:lit_request_keys] ||= {}
       Thread.current[:lit_request_keys][key_without_locale] = localization
     end

data/lib/lit/engine.rb

@@ -9,12 +9,6 @@ module Lit
     initializer 'lit.assets.precompile' do |app|
       app.config.assets.precompile += %w[lit/application.css lit/application.js]
       app.config.assets.precompile += %w[lit/lit_frontend.css lit/lit_frontend.js]
-      # add language flags to list of precompiled assets
-      if app.config.i18n.available_locales
-        app.config.i18n.available_locales.each do |l|
-          app.config.assets.precompile << "lit/famfamfam_flags/#{l.to_s[0,2]}.png"
-        end
-      end
     end
 
     initializer 'lit.reloader' do |app|
@@ -30,5 +24,11 @@ module Lit
         end
       end
     end
+
+    initializer :append_before_action do
+      ActionController::Base.send :before_action do
+        Thread.current[:lit_thread_cache] = {}
+      end
+    end
   end
 end

data/lib/lit/export.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'lit/services/localization_keys_to_hash_service'
 
 module Lit
   class Export
@@ -17,7 +18,7 @@ module Lit
 
       case format
       when :yaml
-        exported_keys = nested_string_keys_to_hash(db_localizations)
+        exported_keys = Lit::LocalizationKeysToHashService.call(db_localizations)
         exported_keys.to_yaml
       when :csv
         relevant_locales = locale_keys.presence || I18n.available_locales.map(&:to_s)
@@ -55,23 +56,6 @@ module Lit
       end
     end
 
-    private_class_method def self.nested_string_keys_to_hash(db_localizations)
-      # http://subtech.g.hatena.ne.jp/cho45/20061122
-      deep_proc = proc do |_k, s, o|
-        if s.is_a?(Hash) && o.is_a?(Hash)
-          next s.merge(o, &deep_proc)
-        end
-        next o
-      end
-      nested_keys = {}
-      db_localizations.sort.each do |k, v|
-        key_parts = k.to_s.split('.')
-        converted = key_parts.reverse.reduce(v) { |a, n| { n => a } }
-        nested_keys.merge!(converted, &deep_proc)
-      end
-      nested_keys
-    end
-
     # This is like Array#transpose but ignores size differences between inner arrays.
     private_class_method def self.transpose(matrix)
       maxlen = matrix.max { |x| x.length }.length

data/lib/lit/i18n_backend.rb

@@ -69,11 +69,20 @@ module Lit
 
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
+
+      # we might want to return content later, but we first need to check if it's in cache.
+      # it's important to rememver, that accessing non-existen key modifies cache by creating one
+      had_key = @cache.has_key?(key_with_locale)
+
       # check in cache or in simple backend
       content = @cache[key_with_locale] || super
+
+      # return if content is in cache - it CAN be `nil`
+      return content if had_key && !options[:default]
+
       return content if parts.size <= 1
 
-      if content.nil? && should_cache?(key_with_locale, options)
+      if content.nil? && should_cache?(key_with_locale, options, had_key)
         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
         # so there is no content in cache - it might not be if ie. we're doing
@@ -107,7 +116,7 @@ module Lit
           # it anyway if we return nil, but then it will wrap it also in
           # translation_missing span.
           # Humanizing key should be last resort
-          if content.nil? && Lit.humanize_key && key.match(Lit.humanize_key_ignored).nil?
+          if content.nil? && Lit.humanize_key && Lit.humanize_key_ignored.match(key).nil?
             content = key.to_s.split('.').last.humanize
             if content.present?
               @cache[key_with_locale] = content
@@ -130,7 +139,7 @@ module Lit
         # end
       elsif data.respond_to?(:to_str) || data.is_a?(Array)
         key = ([locale] + scope).join('.')
-        return if startup_process && @cache.keys.member?(key) && Lit.ignore_yaml_on_startup
+        return if startup_process && Lit.ignore_yaml_on_startup && (Thread.current[:lit_cache_keys] || @cache.keys).member?(key)
         @cache.update_locale(key, data, data.is_a?(Array), startup_process)
       elsif data.nil?
         return if startup_process
@@ -140,11 +149,13 @@ module Lit
     end
 
     def load_translations_to_cache
+      Thread.current[:lit_cache_keys] = @cache.keys
       ActiveRecord::Base.transaction do
         (@translations || {}).each do |locale, data|
           store_item(locale, data, [], true) if valid_locale?(locale)
         end
       end
+      Thread.current[:lit_cache_keys] = nil
     end
 
     def init_translations
@@ -156,7 +167,7 @@ module Lit
       # load translations from database to cache
       @cache.load_all_translations
       # load translations from @translations to cache
-      load_translations_to_cache
+      load_translations_to_cache unless Lit.ignore_yaml_on_startup
       @initialized = true
     end
 
@@ -180,8 +191,9 @@ module Lit
       Lit.ignored_keys.any?{ |k| key_without_locale.start_with?(k) }
     end
 
-    def should_cache?(key_with_locale, options)
-      if @cache.has_key?(key_with_locale)
+    # checks if should cache. `had_key` is passed, as once cache has been accesed, it's already modified and key exists
+    def should_cache?(key_with_locale, options, had_key)
+      if had_key
         return false unless options[:default] && !options[:default].is_a?(Array)
       end
 

data/lib/lit/import.rb

@@ -136,17 +136,20 @@ module Lit
         # is the array
         val = value.is_a?(Array) ? [value] : value
         I18n.t(key, default: val)
-        unless @raw
-          # this indicates that this translation already exists
-          existing_translation =
-            Lit::Localization.joins(:locale, :localization_key)
-                             .find_by('localization_key = ? and locale = ?',
-                                      key, locale)
-          if existing_translation
-            existing_translation.update(translated_value: value, is_changed: true)
-            lkey = existing_translation.localization_key
-            lkey.update(is_deleted: false) if lkey.is_deleted
-          end
+
+        # this indicates that this translation already exists
+        existing_translation =
+        Lit::Localization.joins(:locale, :localization_key)
+                         .find_by('localization_key = ? and locale = ?', key, locale)
+
+        return unless existing_translation
+        
+        if @raw
+          existing_translation.update(default_value: value)
+        else
+          existing_translation.update(translated_value: value, is_changed: true)
+          lkey = existing_translation.localization_key
+          lkey.update(is_deleted: false) if lkey.is_deleted
         end
       end
     end

data/lib/lit/services/localization_keys_to_hash_service.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Lit
+  # Converts flat hash with localization_keys as keys and translations as values to nested hash
+  # by nesting on '.' localization key dots
+  class LocalizationKeysToHashService
+    # http://subtech.g.hatena.ne.jp/cho45/20061122
+    def self.call(db_localizations)
+      deep_proc = proc do |_k, s, o|
+        next s.merge(o, &deep_proc) if s.is_a?(Hash) && o.is_a?(Hash)
+
+        next o
+      end
+      nested_keys = {}
+      db_localizations.sort.each do |k, v|
+        key_parts = k.to_s.split('.')
+        converted = key_parts.reverse.reduce(v) { |a, n| { n => a } }
+        nested_keys.merge!(converted, &deep_proc)
+      end
+      nested_keys
+    end
+  end
+end

data/lib/lit/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Maciej Litwiniuk
 - Piotr Boniecki
 - Michał Buszkiewicz
 - Szymon Soppa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: google-cloud-translate
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +210,7 @@ files:
 - app/assets/images/lit/jquery-te.png
 - app/assets/javascripts/lit/application.js
 - app/assets/javascripts/lit/backend/bootstrap.js.coffee
+- app/assets/javascripts/lit/backend/bootstrap.min.js
 - app/assets/javascripts/lit/backend/dashboard.js
 - app/assets/javascripts/lit/backend/jquery-te-1.4.0.min.js
 - app/assets/javascripts/lit/backend/localizations.js.coffee
@@ -320,13 +321,14 @@ files:
 - lib/lit/loader.rb
 - lib/lit/rails.rb
 - lib/lit/railtie.rb
+- lib/lit/services/localization_keys_to_hash_service.rb
 - lib/lit/version.rb
 - lib/tasks/lit_tasks.rake
 homepage: https://github.com/prograils/lit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,8 +343,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Database powered i18n backend with web gui
 test_files: []