i18n-tasks 0.9.0.rc2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6bf06f3a6c91c128dd0f3323f4ec13f462c6378
-  data.tar.gz: 820875215de90ebc773b2abf25144fd8107fa953
+  metadata.gz: 2d7150a87197f1366f4f451b84ec214d3f39e86b
+  data.tar.gz: 16d164673b493e94bd45395c49caa208fb8c113c
 SHA512:
-  metadata.gz: e6b2821d3a098e3fbd371c5909d1f9858c70a2627b41f9863ece9cd5b3b2b142430dd081613d1c29dbc6ab5e72d3c9036e6fae603a6d5f8aee5d1273524f9262
-  data.tar.gz: 01841c0c2850a891620310c7a99a682c7b7afdd798701fbc44d317f6961cb600c0897d67b99263d85e80e13c94de4f4b21d9ea8500e4d0f571b0f0a6cf918d33
+  metadata.gz: 5d9d59b0e9cae6e6624a7977717018cc6297ab32b1a381acd7c2215a6d30d4b7eaf896bee0b920fcb13b90df09e993c62951c2e7791cf040a5504778a3502a70
+  data.tar.gz: 9977c0ef0785acb7fe7bf228edbb78b4446bc487e14dd35c2b058f6a03c07404bb9a878ea2e25089e209f56804e5a01d15676899612b0c59f7057141f5692de8

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.0.rc2'
+gem 'i18n-tasks', '~> 0.9.0'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -176,7 +176,7 @@ all the dynamic parts of the key will be considered used, e.g. `cats.tenderlove.
 ## Configuration
 
 Configuration is read from `config/i18n-tasks.yml` or `config/i18n-tasks.yml.erb`.
-Inspect configuration with `i18n-tasks config`.
+Inspect the configuration with `i18n-tasks config`.
 
 Install the [default config file][config] with:
 
@@ -198,7 +198,8 @@ The default data adapter supports YAML and JSON files.
 #### Multiple locale files
 
 i18n-tasks can manage multiple translation files and read translations from other gems.
-To find out more the `data` options in the [config][config].
+To find out more see the `data` options in the [config][config].
+NB: By default, only `%{locale}.yml` files are read, not `namespace.%{locale}.yml`. Make sure to check the config.
 
 For writing to locale files i18n-tasks provides 2 options.
 
@@ -251,8 +252,11 @@ If you have implemented a custom adapter please share it on [the wiki][wiki].
 
 ### Usage search
 
+i18n-tasks uses an AST scanner for `.rb` files, and a regexp scanner for all other files.
+New scanners can be added easily: please refer to [this example](https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example).
+
 See the `search` section in the [config file][config] for all available configuration options.
-Custom scanners are easy to add, an example of one can be found [here](https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example). 
+NB: By default, only the `app/` directory is searched.
 
 ### Fine-tuning
 

data/i18n-tasks.gemspec

@@ -33,11 +33,12 @@ TEXT
   s.require_paths = ['lib']
 
   s.add_dependency 'activesupport', '>= 4.0.2'
+  s.add_dependency 'ast', '>= 2.1.0'
   s.add_dependency 'easy_translate', '>= 0.5.0'
   s.add_dependency 'erubis'
   s.add_dependency 'highline', '>= 1.7.3'
   s.add_dependency 'i18n'
-  s.add_dependency 'parser', '>= 2.2.2.6'
+  s.add_dependency 'parser', '>= 2.2.3.0'
   s.add_dependency 'term-ansicolor', '>= 1.3.2'
   s.add_dependency 'terminal-table', '>= 1.5.1'
   s.add_development_dependency 'axlsx', '~> 2.0'

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

@@ -7,10 +7,11 @@ module I18n::Tasks::Scanners
   # Scan for I18n.translate calls using whitequark/parser
   class RubyAstScanner < FileScanner
     include RelativeKeys
+    include AST::Sexp
 
     MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/.freeze
 
-    def initialize(messages: %i(t translate), receivers: [nil, self.class.const_node(:I18n)], **args)
+    def initialize(messages: %i(t translate), receivers: [nil, s(:const, nil, :I18n)], **args)
       super(args)
       @parser               = ::Parser::CurrentRuby.new
       @magic_comment_parser = ::Parser::CurrentRuby.new
@@ -39,7 +40,7 @@ module I18n::Tasks::Scanners
             @parser.parse(make_buffer(path, comment.text.sub(MAGIC_COMMENT_PREFIX, '').split(/\s+(?=t)/).join('; ')))
         ) do |send_node, _method_name|
           # method_name is not available at this stage
-          send_node_to_key_occurrence(send_node, nil, location: associated_node || comment)
+          send_node_to_key_occurrence(send_node, nil, location: associated_node || comment.location)
         end
       end
     rescue Exception => e
@@ -183,11 +184,5 @@ module I18n::Tasks::Scanners
         buffer.raw_source = contents
       }
     end
-
-    # @param const [Symbol]
-    # @return [AST::Node]
-    def self.const_node(const)
-      AST::Node.new(:const, [nil, const])
-    end
   end
 end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.9.0.rc2'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc2
+  version: 0.9.0
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+- !ruby/object:Gem::Dependency
+  name: ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: easy_translate
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2.6
+        version: 2.2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2.6
+        version: 2.2.3.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -275,8 +289,6 @@ files:
 - lib/i18n/tasks/scanners/ruby_ast_scanner.rb
 - lib/i18n/tasks/scanners/scanner.rb
 - lib/i18n/tasks/scanners/scanner_multiplexer.rb
-- lib/i18n/tasks/scanners/slim_temple_scanner.rb
-- lib/i18n/tasks/scanners/temple_scanner.rb
 - lib/i18n/tasks/split_key.rb
 - lib/i18n/tasks/stats.rb
 - lib/i18n/tasks/string_interpolation.rb
@@ -305,12 +317,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis

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

@@ -1,24 +0,0 @@
-require 'i18n/tasks/scanners/temple_scanner'
-
-module I18n::Tasks::Scanners
-  # Scan slim templates.
-  # Work-in-progress.
-  class SlimTempleScanner < TempleScanner
-
-    def initialize(**args)
-      super(gem_name: 'slim', suggested_gem_version: '~> 3.0', class_name: 'Slim::Parser',
-            requires: %w(slim/parser slim/filter slim/embedded), **args)
-    end
-
-    protected
-
-    def scan_file(path)
-      parser     = parser_class.new(file: path)
-      contents   = read_file(path)
-      temple_ast = parser.call(contents)
-      # todo: the bare parser is not enough, figure out the modules to use to get to the [:code, ...] IR.
-      $stderr.puts temple_ast.inspect
-      []
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-require 'temple'
-
-module I18n::Tasks::Scanners
-  # A base class for {Temple}-based scanners.
-  #
-  # @abstract
-  # @since 0.9.0
-  class TempleScanner < FileScanner
-    def initialize(gem_name:, suggested_gem_version:, class_name:, requires:, **args)
-      super(args)
-      @gem_name     = gem_name
-      @suggested_gem_version  = suggested_gem_version
-      @class_name   = class_name
-      @requires     = requires
-      @parser_class = nil
-    end
-
-    protected
-
-    # @return [Class<Temple::Parser>]
-    def parser_class
-      @parser_class ||= begin
-        begin
-          Array(@requires).each { |dependency| require dependency }
-        rescue LoadError => e
-          raise ::I18n::Tasks::CommandError.new(
-                    e, "#{e.message}: Please add `gem '#{@gem_name}', '#{@suggested_gem_version}'` to the Gemfile.")
-        end
-        ActiveSupport::Inflector.constantize(@class_name)
-      end
-    end
-  end
-end