i18n-tasks 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c8f584095c296651d391ff4d7bda8f7976ed897
-  data.tar.gz: '0886ab5028387f20c2b6a5a246fb9435a7285ce1'
+  metadata.gz: a645618f76025d6f6c0e9c1e82d19cf049aa5f7a
+  data.tar.gz: b5d360c72ce14d141757a177c3f4a906ad84588d
 SHA512:
-  metadata.gz: 84624f8fda11ae08790761f4e6f2490abe6cd3f04d8783b2e3bfd0e809b40eecaae7dfa6643b6db45e3c92152fedf9ca8e131808295b9ff08469e8c8bfe82c53
-  data.tar.gz: 660b804e12dec65e30ccd96f0441fd8eea8fcc0b20a8eb3a64b8fb7e5f5bce18927f45c5fddb8844a058d3d98faaa17a0ae785599b026215a317db3088140e70
+  metadata.gz: 2ec7dd16adc0fe0aba80ea32f4ba7f60d665646be16f0c58fd7f5b34a6b8e5412a55678068f1e1daf5be5c660e4a2baf9216e80be6a8bef6e8dcc000fd425d6c
+  data.tar.gz: b4f7c9a678a51534a5fdc15c3efc09e8e3ccec18de6b08246b4ae456a412c4190db148a621e6b933b6228db6193146aa9b3bbfd809500e0219c0d81280c26ed2

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.9.18'
+gem 'i18n-tasks', '~> 0.9.19'
 ```
 
 Copy the default [configuration file](#configuration):

data/lib/i18n/tasks/configuration.rb

@@ -37,9 +37,8 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   end
 
   def config=(conf)
-    @config          = file_config.deep_merge(conf)
+    @config = file_config.deep_merge(conf)
     @config_sections = {}
-    @config
   end
 
   # data config
@@ -110,7 +109,7 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
 
   def config_for_inspect
     to_hash_from_indifferent(config_sections.reject { |_k, v| v.blank? }).tap do |sections|
-      sections.each do |_k, section|
+      sections.each_value do |section|
         section.merge! section.delete('config') if section.is_a?(Hash) && section.key?('config')
       end
     end

data/lib/i18n/tasks/data.rb

@@ -59,12 +59,16 @@ module I18n::Tasks
       !t(key, locale).nil?
     end
 
+    def external_key?(key, locale = base_locale)
+      data.external(locale)[locale.to_s][key]
+    end
+
     # Normalize all the locale data in the store (by writing to the store).
     #
     # @param [Array<String>] locales locales to normalize. Default: all.
     # @param [Boolean] force_pattern_router Whether to use pattern router regardless of the config.
     def normalize_store!(locales: nil, force_pattern_router: false)
-      locales = self.locales unless locales
+      locales ||= self.locales
       router = force_pattern_router ? ::I18n::Tasks::Data::Router::PatternRouter.new(data, data.config) : data.router
       data.with_router(router) do
         Array(locales).each do |target_locale|

data/lib/i18n/tasks/data/file_system_base.rb

@@ -32,27 +32,45 @@ module I18n::Tasks
         end
       end
 
-      # get locale tree
+      # @param [String, Symbol] locale
+      # @return [::I18n::Tasks::Data::Siblings]
       def get(locale)
         locale = locale.to_s
-        @trees         ||= {}
-        @trees[locale] ||= Tree::Siblings[locale => {}].merge!(
-          read_locale(locale)
-        )
+        @trees ||= {}
+        @trees[locale] ||= read_locale(locale)
       end
 
       alias [] get
 
+      # @param [String, Symbol] locale
+      # @return [::I18n::Tasks::Data::Siblings]
+      def external(locale)
+        locale = locale.to_s
+        @external ||= {}
+        @external[locale] ||= read_locale(locale, paths: config[:external])
+      end
+
       # set locale tree
+      # @param [String, Symbol] locale
+      # @param [::I18n::Tasks::Data::Siblings] tree
       def set(locale, tree)
         locale = locale.to_s
+        @trees.delete(locale) if @trees
+        paths_before = Set.new(get(locale)[locale].leaves.map { |node| node.data[:path] })
+        paths_after = Set.new([])
         router.route locale, tree do |path, tree_slice|
+          paths_after << path
           write_tree path, tree_slice
         end
+        (paths_before - paths_after).each do |path|
+          FileUtils.remove_file(path) if File.exist?(path)
+        end
         @trees.delete(locale) if @trees
         @available_locales = nil
       end
 
+      alias []= set
+
       # @param [String] locale
       # @return [Array<String>] paths to files that are not normalized
       def non_normalized_paths(locale)
@@ -62,7 +80,7 @@ module I18n::Tasks
       end
 
       def write(forest)
-        forest.each { |root| set(root.key, root) }
+        forest.each { |root| set(root.key, root.to_siblings) }
       end
 
       def merge!(forest)
@@ -76,15 +94,14 @@ module I18n::Tasks
 
       def remove_by_key!(forest)
         forest.inject(Tree::Siblings.new) do |removed, root|
-          locale_data = get(root.key)
+          locale = root.key
+          locale_data = get(locale)
           subtracted = locale_data.subtract_by_key(forest)
-          set root.key, subtracted
+          set locale, subtracted
           removed.merge! locale_data.subtract_by_key(subtracted)
         end
       end
 
-      alias []= set
-
       # @return self
       def reload
         @trees             = nil
@@ -145,17 +162,17 @@ module I18n::Tasks
 
       protected
 
-      def read_locale(locale)
-        Array(config[:read]).map do |path|
+      def read_locale(locale, paths: config[:read])
+        Array(paths).flat_map do |path|
           Dir.glob format(path, locale: locale)
-        end.reduce(:+).map do |path|
+        end.map do |path|
           [path.freeze, load_file(path) || {}]
         end.map do |path, data|
           filter_nil_keys! path, data
           Data::Tree::Siblings.from_nested_hash(data).tap do |s|
             s.leaves { |x| x.data.update(path: path, locale: locale) }
           end
-        end.reduce(:merge!) || Tree::Siblings.null
+        end.reduce(Tree::Siblings[locale => {}], :merge!)
       end
 
       def filter_nil_keys!(path, data, suffix = [])

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -23,7 +23,9 @@ module I18n::Tasks
       end
 
       # Route keys to destinations
-      # @param forest [I18n::Tasks::LocaleTree::Siblings] forest roots are locales.
+      # @param forest [I18n::Tasks::Data::Tree::Siblings] forest roots are locales.
+      # @yieldparam [String] dest_path
+      # @yieldparam [I18n::Tasks::Data::Tree::Siblings] tree_slice
       # @return [Hash] mapping of destination => [ [key, value], ... ]
       def route(locale, forest, &block)
         return to_enum(:route, locale, forest) unless block

data/lib/i18n/tasks/data/tree/traversal.rb

@@ -181,7 +181,7 @@ module I18n::Tasks
         if key_pattern.present?
           pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern)
         end
-        keys.each do |key, node|
+        keys.each do |key, node| # rubocop:disable Performance/HashEachMethods
           next if pattern_re && key !~ pattern_re
           node.value = value_proc.call(node)
         end

data/lib/i18n/tasks/missing_keys.rb

@@ -85,7 +85,7 @@ module I18n::Tasks
     end
 
     def locale_key_missing?(locale, key)
-      !key_value?(key, locale) && !ignore_key?(key, :missing)
+      !key_value?(key, locale) && !external_key?(key) && !ignore_key?(key, :missing)
     end
 
     # @param [::I18n::Tasks::Data::Tree::Siblings] forest

data/lib/i18n/tasks/scanners/pattern_scanner.rb

@@ -65,7 +65,7 @@ module I18n::Tasks::Scanners
       re && re =~ line
     end
 
-    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/
+    VALID_KEY_RE_DYNAMIC = /^(#{VALID_KEY_CHARS}|[:\#{@}\[\]])+$/ # rubocop:disable Lint/InterpolationCheck
 
     def valid_key?(key)
       if @config[:strict]

data/lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb

@@ -34,12 +34,12 @@ module I18n::Tasks::Scanners
 
     # parse expressions with literals and variable
     def first_argument_re
-      /(?: (?: #{literal_re} ) | #{variable_re} )/x
+      /(?: (?: #{literal_re} ) | #{expr_re} )/x
     end
 
     # strip literals, convert expressions to #{interpolations}
     def strip_literal(val)
-      if val =~ /\A\w/
+      if val =~ /\A[\w@]/
         "\#{#{val}}"
       else
         super(val)
@@ -54,17 +54,9 @@ module I18n::Tasks::Scanners
         ) (\[[^\n)%#]*\]|[^\n)%#,]*)/x
     end
 
-    # match code expression
-    # matches characters until , as a heuristic to parse scopes like [:categories, cat.key]
-    # can be massively improved by matching parenthesis
+    # match a limited subset of code expressions (no parenthesis, commas, etc)
     def expr_re
-      /[\w():"'.\s]+/x
-    end
-
-    # match variable key
-    # e.g: t(key, scope: 'scope') => t('scope.#{key}')
-    def variable_re
-      /\w+/
+      /[\w@.&|\s?!]+/
     end
 
     # extract literal or array of literals

data/lib/i18n/tasks/scanners/ruby_ast_scanner.rb

@@ -115,7 +115,7 @@ module I18n::Tasks::Scanners
     def extract_string(node, array_join_with: nil, array_flatten: false, array_reject_blank: false)
       if %i[sym str int].include?(node.type)
         node.children[0].to_s
-      elsif %i[true false].include?(node.type)
+      elsif %i[true false].include?(node.type) # rubocop:disable Lint/BooleanSymbol
         node.type.to_s
       elsif node.type == :nil
         ''
@@ -149,7 +149,7 @@ module I18n::Tasks::Scanners
     # @return [String, nil] `nil` is returned only when a dynamic value is encountered in strict mode.
     def extract_array_as_string(node, array_join_with:, array_flatten: false, array_reject_blank: false)
       children_strings = node.children.map do |child|
-        if %i[sym str int true false].include?(child.type)
+        if %i[sym str int true false].include?(child.type) # rubocop:disable Lint/BooleanSymbol
           extract_string child
         else
           # ignore dynamic argument in strict mode

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.18'
+    VERSION = '0.9.19'
   end
 end

data/templates/config/i18n-tasks.yml

@@ -19,8 +19,6 @@ data:
     # - config/locales/%{locale}.yml
     ## More files:
     # - config/locales/**/*.%{locale}.yml
-    ## Another gem (replace %#= with %=):
-    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
@@ -30,6 +28,12 @@ data:
     ## Catch-all default:
     # - config/locales/%{locale}.yml
 
+  # External locale data (e.g. gems).
+  # This data is not considered unused and is never written to.
+  external:
+    ## Example (replace %#= with %=):
+    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
   # router: conservative_router
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport