t_t 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ab6bc258b192373b542a9d1ed3b5cab2e8bc59
-  data.tar.gz: b68173a8d400edbfeed308562e3e8fbf9b2a6b64
+  metadata.gz: db067791facedb6247eff1b9fed82785f6bd325a
+  data.tar.gz: ced2994ee972a2956c9799e4b1ba8c0e79ff3dc2
 SHA512:
-  metadata.gz: e8cd5cccaf09832f11f17f21052b3ebdac483f6b704a7198796a9ee77e71fbce59a04f78d5e4a1153453aeb729eb593f1577db4df48917db8c68a2fd3ec6973d
-  data.tar.gz: d24a5680945464b25a18650877b0bd86f5da8586273e9130b713c5eccb336282d08d650ba19fbba9fcf2cf1cd684e4bd345298d6de326a303e23156aaee8eb44
+  metadata.gz: cfe464540b1e363083f4bd74e5a647379e7f86f627b3d665f2eeab8f8a1cb90258a1a4ba42fb764707b7edb35b5ad44b4ed2717781e053a716863ac06f4e550b
+  data.tar.gz: 407fc17c5b26f170fbc58235d070e9e4483a63fa65502b4b44d5d39b2cf03658e2e64551cee614ea5dadab34d57cec95387e3b372749d11414340870098162a0

data/docs/synchronisation.md

@@ -29,6 +29,19 @@ Rails.application.configure do
 end
 ```
 
+By default missing translations marked as ":t_t: translations". You can override it:
+
+```ruby
+# config/environments/development.rb
+
+Rails.application.configure do
+  config.tt.sync = { locale: :en, mark: "you custom string" }
+
+  # sets mark to zero width space symbol
+  config.tt.sync = { locale: :en, mark: :space }
+end
+```
+
 Also you can synchronise files without a page reload. Add the next line at the bottom `%rails_root%/Rakefile`:
 
 ```ruby

data/lib/t_t/i18n_sync.rb

@@ -3,8 +3,6 @@ require 'yaml'
 
 module TT
   class I18nSync
-    MARK = ":t_t: "
-
     module Utils
       extend self
 
@@ -29,11 +27,11 @@ module TT
         end
       end
 
-      def sync_file(path, locale, standard)
+      def sync_file(path, locale, standard, mark)
         old_review = {}
         source = load_file(path, locale) { |content| old_review.merge!(content.fetch('review', {})) }
         new_review = {}
-        content = { locale => sync_level(standard, source, new_review) }
+        content = { locale => sync_level(standard, source, new_review, mark) }
         review = old_review.merge(flat_hash(new_review))
         content['review'] = review unless review.empty?
         write_file(path, content)
@@ -45,19 +43,19 @@ module TT
 
       private
 
-      def sync_level(st_level, source, review)
+      def sync_level(st_level, source, review, mark)
         level = st_level.inject({}) do |r, (key, st_node)|
           node = source[key]
 
           r[key] = case st_node
           when Hash
             sub_review = {}
-            sub_level = sync_level(st_node, (node.is_a?(Hash) ? node : {}), sub_review)
+            sub_level = sync_level(st_node, (node.is_a?(Hash) ? node : {}), sub_review, mark)
             review[key] = sub_review unless sub_review.empty?
             sub_level
-          when Array then node.is_a?(Array) ? node : st_node.map { |v| "#{ MARK }#{ v }" }
+          when Array then node.is_a?(Array) ? node : st_node.map { |v| "#{ mark }#{ v }" }
           else
-            node.nil? ? "#{ MARK }#{ st_node }" : node
+            node.nil? ? "#{ mark }#{ st_node }" : node
           end
           r
         end
@@ -69,12 +67,13 @@ module TT
     end
 
     class FileGroup
-      attr_reader :st_locale, :standard, :list
+      attr_reader :st_locale, :standard, :list, :mark
 
-      def initialize(st_locale, standard, list)
+      def initialize(st_locale, standard, list, mark)
         @st_locale = st_locale
         @standard = standard
         @list = list
+        @mark = mark
       end
 
       def execute
@@ -82,7 +81,7 @@ module TT
         return if defined?(@prev_updated_at) && file_updated_at == @prev_updated_at
 
         st_source = Utils.load_file(standard, st_locale)
-        list.each { |l, path| Utils.sync_file(path, l, st_source) }
+        list.each { |l, path| Utils.sync_file(path, l, st_source, mark) }
 
         @prev_updated_at = file_updated_at
       end
@@ -93,8 +92,8 @@ module TT
         Utils.flat_file(standard, st_locale).inject([]) do |list, (k, st_v)|
           item = flat_list.inject({ st_locale => st_v }) { |r, (l, h)| r.merge!(l => h[k]) }
 
-          if item.any? { |_, v| v.nil? || v.to_s.include?(MARK) }
-            item.each { |l, v| item[l] = nil if v.to_s.include?(MARK) }
+          if item.any? { |_, v| v.nil? || v.to_s.include?(mark) }
+            item.each { |l, v| item[l] = nil if v.to_s.include?(mark) }
             list << item
           end
 
@@ -105,7 +104,7 @@ module TT
 
     attr_reader :checker, :groups
 
-    def initialize(st_locale, files)
+    def initialize(st_locale, files, mark)
       @groups = []
 
       files.inject({}) do |r, file|
@@ -119,7 +118,7 @@ module TT
         locales = group.keys
         next unless locales.include?(st_locale) && locales.size > 1
         list = group.reject { |l, v| l == st_locale }
-        groups << FileGroup.new(st_locale, group[st_locale], list)
+        groups << FileGroup.new(st_locale, group[st_locale], list, mark)
       end
 
       @checker = ActiveSupport::FileUpdateChecker.new(groups.map(&:standard)) { execute }

data/lib/t_t/rails.rb

@@ -39,14 +39,18 @@ module TT
 
         locale = :en
         glob = 'config/locales/**/*.yml'
+        mark = ':t_t: '
         if options.is_a?(Symbol) || options.is_a?(String)
           locale = options
         elsif options.is_a?(Hash)
           locale = options[:locale] if options.has_key?(:locale)
           glob = options[:glob] if options.has_key?(:glob)
+          if options[:mark]
+            mark = (options[:mark] == :space) ? "\u200B" : options[:mark]
+          end
         end
 
-        file_sync = ::TT::I18nSync.new(locale.to_s, Dir.glob(glob))
+        file_sync = ::TT::I18nSync.new(locale.to_s, Dir.glob(glob), mark)
         TT::Rails.sync(file_sync)
         ::Rails.application.reloaders << file_sync.checker
         ActionDispatch::Reloader.to_prepare { file_sync.checker.execute_if_updated }

data/readme.md

@@ -102,6 +102,10 @@ Just add `gem "t_t"` into your Gemfile and run `bundle`.
 Dos-T is tested against Ruby 1.9.3+ & JRuby(1.9+ compatible). If your application uses Ruby on Rails the framework version should be 3.2+
 
 ## Changelog
+- 1.3.0
+  - Allow specify a custom mark for locale file synchonization
+- 1.2.2
+  - Fix rails 5 integration
 - 1.2.0
   - Deprecate TT::Translator in favour of TT::Base & TT::Rails
   - Introduce a real-time watcher for [translation file synchronisation](./docs/synchronisation.md)

data/t_t.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "t_t"
-  spec.version       = "1.2.2"
+  spec.version       = "1.3.0"
   spec.authors       = ["Sergey Pchelintsev"]
   spec.email         = ["mail@sergeyp.me"]
   spec.summary       = %q{An opinioned I18n helper}

data/tests/lib/i18n_sync_test.rb

@@ -8,7 +8,7 @@ describe 'I18n synchronisation' do
     }
 
     YAML.stub :load_file, store do
-      group = TT::I18nSync::FileGroup.new('en', __FILE__, { 'de' => 'de.yml' })
+      group = TT::I18nSync::FileGroup.new('en', __FILE__, { 'de' => 'de.yml' }, ':t_t: ')
       expectation = lambda do |path, content|
         assert_equal path, 'de.yml'
         assert_equal content, {
@@ -35,7 +35,7 @@ describe 'I18n synchronisation' do
       'de' => { 'b' => 'de-b' }
     }
     YAML.stub :load_file, store do
-      group = TT::I18nSync::FileGroup.new('de', __FILE__, { 'en' => 'en.yml' })
+      group = TT::I18nSync::FileGroup.new('de', __FILE__, { 'en' => 'en.yml' }, ':t_t: ')
       expectation = lambda do |path, content|
         assert_equal path, 'en.yml'
         assert_equal content['en'], { 'b' => 'b' }
@@ -48,7 +48,7 @@ describe 'I18n synchronisation' do
   end
 
   it 'combines files into a full groups' do
-    groupMock = Struct.new(:locale, :standard, :list) do
+    groupMock = Struct.new(:locale, :standard, :list, :mark) do
       def execute
       end
     end
@@ -60,7 +60,7 @@ describe 'I18n synchronisation' do
         'config/locales/es.yml', 'config/locales/views.en-US.yml', 'config/locales/models/orm.de.yml',
         'config/locales/en-US.yml', 'config/locales/views.es.yml', 'config/locales/models/orm.es.yml',
         'config/locales/fix.en-US.yml', 'config/locales/skip.de.yml'
-      ])
+      ], ':t_t: ')
 
       assert_equal 3, sync.groups.length
 
@@ -81,7 +81,7 @@ describe 'I18n synchronisation' do
       'de' => { 'a' => ':t_t: a', 'b' => 'de-b' }
     }
     YAML.stub :load_file, store do
-      sync = TT::I18nSync.new('en', ['en.yml', 'de.yml'])
+      sync = TT::I18nSync.new('en', ['en.yml', 'de.yml'], ':t_t: ')
       result = sync.missed
 
       assert_equal 1, result.size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t_t
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Sergey Pchelintsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n