tolk 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b753e133065f79384722a0bc6bebc2c1f7813b883416edd21f6c77865781aa49
-  data.tar.gz: 9fb51fd436c27206dd90c1d4fe07ab79a02e5abb7d3dfb0ce95df7f447f562a9
+  metadata.gz: b8f6680d4fdb375f50c14ea1725d32cf73c395b3825578f9e2f25b1ce6e593d7
+  data.tar.gz: b07c28ea6939450e7f46947d894db437b65142684994d47e6dfa8527356b4cae
 SHA512:
-  metadata.gz: 0dd502da4768842fb90b22c4429a274527da26429383bc8778c525cd6bdaa4b2f98dd0fa1a16c143e84a7a07dae38bf5a34d0a495e51a9220f032728160be8ca
-  data.tar.gz: cf90e11178f701c1526dec760bf6717b341bbd1754deba6ccffed62d9c8059fe6c24d95ff060a1bb043ea2a0a350fe106e99ab52309855b5921ab342d421ad7d
+  metadata.gz: '0980d8b70e512963c7be3ca8af3c5519b482370a8e5510f00606e6f93e066218583f19627f02df641dffba02476f1ed185ba63f2986e66a7c278c7bd744f607d'
+  data.tar.gz: c329d8a59897919e8a652c314115514d3f532cd6b23067e911f76651fcc5121ffe9eba4034923ab4504c8ee8ad0900f043f20ec1a5240938e2da7d2f5663b412

data/lib/tolk/config.rb

@@ -30,6 +30,9 @@ module Tolk
       # in the same context than the rest of your app
       attr_accessor :base_controller
 
+      # Ignore specific keys
+      attr_accessor :ignore_keys
+
       def reset
         @exclude_gems_token = false
 
@@ -89,6 +92,8 @@ module Tolk
         @yaml_line_width = Psych::Handler::OPTIONS.line_width # Psych::Handler::DumperOptions uses 0 as "default" for unset
 
         @base_controller =  'ActionController::Base'
+
+        @ignore_keys = []
       end
     end
 

data/lib/tolk/import.rb

@@ -24,27 +24,27 @@ module Tolk
         data = locale.read_locale_file
         return unless data
 
-        phrases = Tolk::Phrase.all
+        phrases_by_key = Tolk::Phrase.all.index_by(&:key)
+        translated_phrase_ids = Set.new(locale.translations.pluck(:phrase_id))
         count = 0
 
         data.each do |key, value|
-          phrase = phrases.detect {|p| p.key == key}
-
-          if phrase
-            translation = locale.translations.new(:text => value, :phrase => phrase)
-            if translation.save
-              count = count + 1
-            elsif translation.errors[:variables].present?
-              puts "[WARN] Key '#{key}' from '#{locale_name}.yml' could not be saved: #{translation.errors[:variables].first}"
-            end
-          else
+          phrase = phrases_by_key[key]
+          unless phrase
             puts "[ERROR] Key '#{key}' was found in '#{locale_name}.yml' but #{Tolk::Locale.primary_language_name} translation is missing"
+            next
+          end
+          next if translated_phrase_ids.include?(phrase.id)
+          translation = locale.translations.new(:text => value, :phrase => phrase)
+          if translation.save
+            count = count + 1
+          elsif translation.errors[:variables].present?
+            puts "[WARN] Key '#{key}' from '#{locale_name}.yml' could not be saved: #{translation.errors[:variables].first}"
           end
         end
 
         puts "[INFO] Imported #{count} keys from #{locale_name}.yml"
       end
-
     end
 
     def read_locale_file

data/lib/tolk/sync.rb

@@ -30,7 +30,8 @@ module Tolk
           I18n.backend.send :init_translations unless I18n.backend.initialized? # force load
         end
         translations = flat_hash(I18n.backend.send(:translations)[primary_locale.name.to_sym])
-        filter_out_i18n_keys(translations.merge(read_primary_locale_file))
+        filtered = filter_out_i18n_keys(translations.merge(read_primary_locale_file))
+        filter_out_ignored_keys(filtered)
       end
 
       def read_primary_locale_file
@@ -62,30 +63,44 @@ module Tolk
         primary_locale = self.primary_locale
 
         # Handle deleted phrases
-        translations.present? ? Tolk::Phrase.where(["tolk_phrases.key NOT IN (?)", translations.keys]).destroy_all : Tolk::Phrase.destroy_all
+        Tolk::Phrase.where.not(:key => translations.keys).destroy_all
 
-        phrases = Tolk::Phrase.all
+        phrases_by_key = Tolk::Phrase.all.index_by(&:key)
+        primary_translation_by_phrase_id = primary_locale.translations.index_by(&:phrase_id)
 
         translations.each do |key, value|
           next if value.is_a?(Proc)
           # Create phrase and primary translation if missing
-          existing_phrase = phrases.detect {|p| p.key == key} || Tolk::Phrase.create!(:key => key)
-          translation = existing_phrase.translations.primary || primary_locale.translations.build(:phrase_id => existing_phrase.id)
+          phrase = phrases_by_key[key] || Tolk::Phrase.create!(:key => key)
+          translation = primary_translation_by_phrase_id[phrase.id]
+          translation ||= primary_locale.translations.build(:phrase => phrase)
           translation.text = value
 
           if translation.changed? && !translation.new_record?
             # Set the primary updated flag if the primary translation has changed and it is not a new record.
-            existing_phrase.translations.where(Tolk::Translation.arel_table[:locale_id].not_eq(primary_locale.id)).update_all({ :primary_updated => true })
+            phrase.translations.where.not(:locale_id => primary_locale.id).update_all({ :primary_updated => true })
           end
 
           translation.primary = true
-          translation.save!
+          translation.save! if translation.changed?
         end
       end
 
       def filter_out_i18n_keys(flat_hash)
         flat_hash.reject { |key, value| key.starts_with? "i18n" }
       end
+
+      def filter_out_ignored_keys(flat_hash)
+        ignored = Tolk.config.ignore_keys
+
+        return flat_hash unless ignored.any?
+
+        ignored_escaped = ignored.map { |key| Regexp.escape(key) }
+
+        regexp = Regexp.new(/\A#{ignored_escaped.join('|')}/)
+
+        flat_hash.reject { |key, _| regexp === key }
+      end
     end
   end
 end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,16 +74,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -197,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files