lit 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7da8c1d5b37a875b54f3640e3767b5101a9aaf15
-  data.tar.gz: b14573576174aa805d17189bd1c2b9e9419d0d71
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTgyNTU3OTU2YmIwNDY3OTBjZTNkMzcyMGE4MWNkYjQyYWE3MjMyZg==
+  data.tar.gz: !binary |-
+    YzY5NzAwMmU5MTM3OGIyMzY4ZThhNzBjM2Q3NzYyMjNjMWU2YzhmNw==
 SHA512:
-  metadata.gz: 170e2b67f08b84f893b5a0f1ce7c94122aaa39798835ab6cc1fe754e236785946f02d3d293dedc47dce0b325165aba039376e2ee69f32fdd67e09c59f91f0a01
-  data.tar.gz: eb22474f0ec620b6d1ed2219da048b01231ea2bbd2c541c405d86099e1d1faa6b4b6c5ffa9647b22c81dedad19e8564bfa20b4e3415467e141ec337f17917b9d
+  metadata.gz: !binary |-
+    NzM2ZjJlNjg3OTllNmEyM2I1OWQ1NzBkNTA3ZDBlMjMwODA4NjVkZjk5Mjhh
+    MmRiZmYxNmNiNWQ4MGZiMDJjZmFhMGFjNDc2YjJjNDg0YjI1MmNiODA2OTg0
+    M2YxNTBiMTc0Yzc2NjI3Mjk1YzQ2Y2JmZjYyNGZkYjViM2Q2NTA=
+  data.tar.gz: !binary |-
+    OWE5MWJmNGYyYWJhNWRhZGYzMjY0MWQ5YWExM2M5NjZiZjRlYzdjM2FhMWI2
+    NDc0NWEyN2NmZTM4Nzc4OWUxMGZlNzE2YzIxNmU3MDcyMGJiMDZiMWYyNmJj
+    MGFlMDIxN2VhMzU4ODY3MWJiM2Y3MDhlNDU4MmZhZjUyZjI3MjI=

data/app/models/lit/localization_key.rb

@@ -79,11 +79,12 @@ module Lit
       end
       if options[:key].present?
         q = "%#{options[:key]}%"
+        q_underscore = "%#{options[:key].parameterize.underscore}%"
         cond = localization_key_col.matches(q).or(
             default_value_col.matches(q).or(
                 translated_value_col.matches(q)
             )
-        )
+        ).or(localization_key_col.matches(q_underscore))
         s = s.joins([:localizations]).where(cond)
       end
       unless options[:include_completed].to_i == 1

data/config/database.yml

@@ -0,0 +1,8 @@
+test:
+  adapter: postgresql
+  database: lit_test
+  username: ebin
+  password: ebin
+  host: localhost
+  pool: 5
+  timeout: 5000

data/lib/lit/cache.rb

@@ -178,40 +178,43 @@ module Lit
 
     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

data/lib/lit/i18n_backend.rb

@@ -41,7 +41,9 @@ module Lit
     # @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 @@ module Lit
 
     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 @@ module Lit
     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
 

data/lib/lit/version.rb

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

metadata

@@ -1,88 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Maciej Litwiniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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: []
@@ -403,6 +403,7 @@ files:
 - app/views/lit/sources/index.html.erb
 - app/views/lit/sources/new.html.erb
 - app/views/lit/sources/show.html.erb
+- config/database.yml
 - config/routes.rb
 - db/migrate/20121103144612_create_lit_locales.rb
 - db/migrate/20121103174049_create_lit_localization_keys.rb
@@ -435,17 +436,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Database powered i18n backend with web gui