i18n-tasks 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6dc7facc584ec90bee3fd89b5222c645c0207d
-  data.tar.gz: 0c09aea76d0b9c8494f6544c99e7b698374887dc
+  metadata.gz: 7cc5711c56c707bafd3ee3c344220c54976c2a7a
+  data.tar.gz: 8d90bbc68292fd2ee20a843f1770013542cd50bc
 SHA512:
-  metadata.gz: b1f5f755ef3f26541331ecf6aaee38bf68958018b28bd22d94b8aa2b6e930277789d36186debb785fb7a139ec68fdf1024df8e18d5145a263a99d8c4d91f8237
-  data.tar.gz: 976c51c8ad42d3c538713d353172b7db8bc0b519fc50cf37e613b03e665b9a19d535352138fd484aa9534a9c51e65a1a18091440b32fbc03cf21f1cbbe053553
+  metadata.gz: 71bcef7b28fe7a5ad8fcd0b0c3c69d13b15e279cd288b07616999234faea165c84c8bba2860fc76353366c7242746210264cabedc46f63ea8111c397b173db85
+  data.tar.gz: a603c30adaa7d37be7439bc9063da2d41406cce3a2021bbff4f6f655bb4e699ce5c72a1bc3797a997eb92fa056f0f14e55285f3c0ea57efd9a6b6a5c5bcebc29

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.14'
+gem 'i18n-tasks', '~> 0.9.15'
 ```
 
 Copy the default [configuration file](#configuration):

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

@@ -12,10 +12,20 @@ module I18n::Tasks::Scanners
     include OccurrenceFromPosition
     include RubyKeyLiterals
 
+    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:ranslate)?/
+    IGNORE_LINES = {
+      'opal' => /^\s*#(?!\si18n-tasks-use)/,
+      'haml' => /^\s*-\s*#(?!\si18n-tasks-use)/,
+      'slim' => %r{^\s*(?:-#|/)(?!\si18n-tasks-use)},
+      'coffee' => /^\s*#(?!\si18n-tasks-use)/,
+      'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/
+    }.freeze
+
     def initialize(**args)
       super
+      @translate_call_re = config[:translate_call].present? ? Regexp.new(config[:translate_call]) : TRANSLATE_CALL_RE
       @pattern = config[:pattern].present? ? Regexp.new(config[:pattern]) : default_pattern
-      @ignore_lines_res = (config[:ignore_lines] || []).each_with_object({}) do |(ext, re), h|
+      @ignore_lines_res = (config[:ignore_lines] || IGNORE_LINES).each_with_object({}) do |(ext, re), h|
         h[ext.to_s] = Regexp.new(re)
       end
     end
@@ -75,9 +85,8 @@ module I18n::Tasks::Scanners
       method && method.strip.sub(/^def\s*/, '').sub(/[\(\s;].*$/, '')
     end
 
-    def translate_call_re
-      /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:ranslate)?/
-    end
+    # This method only exists for backwards compatibility with monkey-patches and plugins
+    attr_reader :translate_call_re
 
     def default_pattern
       # capture only the first argument

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

@@ -17,11 +17,13 @@ module I18n::Tasks::Scanners
     MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/
     RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t translate])
 
-    def initialize(receiver_messages: RECEIVER_MESSAGES, **args)
+    def initialize(**args)
       super(args)
-      @parser               = ::Parser::CurrentRuby.new
+      @parser = ::Parser::CurrentRuby.new
       @magic_comment_parser = ::Parser::CurrentRuby.new
-      @call_finder          = RubyAstCallFinder.new(receiver_messages: receiver_messages)
+      @call_finder = RubyAstCallFinder.new(
+        receiver_messages: config[:receiver_messages] || RECEIVER_MESSAGES
+      )
     end
 
     protected

data/lib/i18n/tasks/used_keys.rb

@@ -15,19 +15,14 @@ require 'i18n/tasks/scanners/pattern_mapper'
 module I18n::Tasks
   module UsedKeys # rubocop:disable Metrics/ModuleLength
     SEARCH_DEFAULTS = {
-      paths:          %w[app/].freeze,
+      paths: %w[app/].freeze,
       relative_roots: %w[app/controllers app/helpers app/mailers app/presenters app/views].freeze,
-      scanners:       [['::I18n::Tasks::Scanners::RubyAstScanner', only: %w[*.rb]]],
-      strict:         true
-    }.tap do |defaults|
-      defaults[:scanners] << ['::I18n::Tasks::Scanners::PatternWithScopeScanner',
-                              exclude:      defaults[:scanners].map { |(_, opts)| opts[:only] }.reduce(:+).freeze,
-                              ignore_lines: { 'opal' => %q(^\s*#(?!\si18n-tasks-use)),
-                                              'haml'   => %q(^\s*-\s*#(?!\si18n-tasks-use)),
-                                              'slim'   => %q(^\s*(?:-#|/)(?!\si18n-tasks-use)),
-                                              'coffee' => %q(^\s*#(?!\si18n-tasks-use)),
-                                              'erb'    => %q(^\s*<%\s*#(?!\si18n-tasks-use)) }.freeze]
-    end
+      scanners: [
+        ['::I18n::Tasks::Scanners::RubyAstScanner', only: %w[*.rb]],
+        ['::I18n::Tasks::Scanners::PatternWithScopeScanner', exclude: %w[*.rb]]
+      ],
+      strict: true
+    }.freeze
 
     ALWAYS_EXCLUDE = %w[*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
                         *.yml *.json *.zip *.tar.gz *.swf *.flv].freeze

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.14'
+    VERSION = '0.9.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - glebm