i18n-tasks 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c0656504d782b473cf5f6af625b9c9192ab1a3b
-  data.tar.gz: 96add6aaaf63bf5403d24aa1824e95bf9b42037d
+  metadata.gz: 49fa662d252e8f812eedc6b79d0ecdf4e55b6979
+  data.tar.gz: 97deaf64038b50772fa22ea2c997f8997550fe3f
 SHA512:
-  metadata.gz: 7ef87ed54318dc731fe2122a76cf7a5bd3b6c4fd17ccbaf2b74ee6cdc7b8eaea506f89d93ebbbcc14ede756c4e7040bc22ce98021f68584d451180f6829213ac
-  data.tar.gz: dfd8dc48f5684027dd474cd460dac25018697cd29c50d08511022f4ea430133ede4e5aaca577f0dc90cde6b3e3140c2fce56036a2d1c065be76211de23a3feb1
+  metadata.gz: 0edb92a5f181c337826b617ca8d4d2d6d7d8a7299d6ba1fd7580eb2bf304e6789f69c842dcb8ddfbab57aa44b267e6bbf9d0852be18fb1fc33a683e8bb93dd9f
+  data.tar.gz: 576b66877ab863f4c06f2dffb351d11968e7ea73593c87390108227ba319b3618317f5c63b84697f94d057c4276b76771d20bc92018c9d03eddfdba26a43f347

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-
+#gem 'byebug'
 # Specify your gem's dependencies in i18n-tasks.gemspec
 gemspec
 

data/README.md

@@ -81,21 +81,11 @@ Simply add to Gemfile:
 gem 'i18n-tasks', '~> 0.2.10'
 ```
 
-If you do not use Rails, you will also need to require the tasks in your Rakefile:
+If not using Rails, require the tasks in Rakefile:
 
 ```ruby
 # Rakefile
 load 'tasks/i18n-tasks.rake'
-
-# to prepare the environment add dependency to i18n:setup:
-namespace :i18n do
-  task :setup => 'environment'
-end
-
-task :environment do 
-  # set `I18n.avaliable_locales` and `I18.default_locale`, etc
-  # ...
-end
 ```
 
 ## Configuration
@@ -171,6 +161,18 @@ search:
   pattern: "\\bt[( ]\\s*(:?\".+?\"|:?'.+?'|:\\w+)"
 ```
 
+To configure paths for relative key resolution:
+
+```yaml
+# directories containing relative keys
+relative_roots:
+  # default:
+  - app/views
+  # add a custom one:
+  - app/views-mobile
+```
+
+
 ### Fine-tuning
 
 Tasks may incorrectly report framework i18n keys as missing, also some patterns may not be detected.

data/lib/i18n/tasks/configuration.rb

@@ -38,6 +38,7 @@ module I18n::Tasks::Configuration
       search_config = (config[:search] || {}).with_indifferent_access
       search_config.tap do |conf|
         conf[:paths]   = %w(app/) if conf[:paths].blank?
+        conf[:relative_roots] = %w( app/views ) if conf[:relative_roots].blank?
         conf[:include] = Array(conf[:include]) if conf[:include].present?
         conf[:exclude] = Array(conf[:exclude])
         conf[:pattern] = conf[:pattern].present? ? Regexp.new(conf[:pattern]) : DEFAULT_PATTERN
@@ -45,6 +46,14 @@ module I18n::Tasks::Configuration
     end
   end
 
+  def relative_roots
+    @config_sections[:relative_roots] ||= config[:relative_roots].presence || %w(app/views)
+  end
+
+  def relative_roots=(paths)
+    @config_sections[:relative_roots] = paths
+  end
+
   # translation config
   # @return [Hash{String => String,Hash,Array}]
   def translation_config
@@ -54,4 +63,4 @@ module I18n::Tasks::Configuration
       conf
     end
   end
-end
+end

data/lib/i18n/tasks/fill_tasks.rb

@@ -1,7 +1,7 @@
 module I18n::Tasks::FillTasks
   def add_missing!(locale = base_locale, placeholder = nil)
     normalize_store! locale
-    set_blank_values! locale, locale == base_locale do |keys|
+    set_blank_values! locale do |keys|
       keys.map { |key|
         placeholder || key.split('.').last.to_s.humanize
       }
@@ -22,8 +22,13 @@ module I18n::Tasks::FillTasks
     locales = non_base_locales(locales)
     normalize_store! locales
     locales.each do |locale|
-      set_blank_values! locale do |blank_keys|
-        google_translate blank_keys.map { |k| t(k) }, to: locale, from: base_locale
+      blank_keys = find_blank_keys(locale).select { |k|
+        tr = t(k)
+        tr.present? && tr.is_a?(String)
+      }
+      if blank_keys.present?
+        translated   = blank_keys.zip google_translate(blank_keys.map { |k| t(k) }, to: locale, from: base_locale)
+        data[locale] = data[locale].deep_merge(list_to_tree translated)
       end
     end
   end
@@ -41,14 +46,18 @@ module I18n::Tasks::FillTasks
 
   # fill blank values with values from passed block
   # @param [String] locale
-  # @param [true, false] include_missing Include keys present in source but missing from base locale
-  def set_blank_values!(locale = base_locale, include_missing = (locale == base_locale), &fill_with)
+  def set_blank_values!(locale = base_locale, &fill_with)
+    blank_keys   = find_blank_keys locale
+    list         = blank_keys.zip fill_with.call(blank_keys)
+    data[locale] = data[locale].deep_merge(list_to_tree(list))
+  end
+
+
+  def find_blank_keys(locale, include_missing = (locale == base_locale))
     blank_keys = traverse_map_if(data[base_locale]) { |key, value|
       key if !key_value?(key, locale) && !ignore_key?(key, :missing)
     }
     blank_keys += keys_not_in_base if include_missing
-
-    list         = blank_keys.uniq.zip fill_with.call(blank_keys)
-    data[locale] = data[locale].deep_merge(list_to_tree(list))
+    blank_keys.uniq
   end
-end
+end

data/lib/i18n/tasks/relative_keys.rb

@@ -3,11 +3,13 @@ module I18n::Tasks::RelativeKeys
   # @param key [String] relative i18n key (starts with a .)
   # @param path [String] path to the file containing the key
   # @return [String] absolute version of the key
-  def absolutize_key(key, path)
+  def absolutize_key(key, path, roots = relative_roots)
     # normalized path
-    path   = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+    path      = File.expand_path path
+    (path_root = roots.map { |path| File.expand_path path }.sort.reverse.detect { |root| path.start_with?(root + '/') }) or
+      raise "No relative key root detected for \"#{key}\" at #{path}. Please set relative_roots in config/i18n-tasks.yml (currently set to #{relative_roots})"
     # key prefix based on path
-    prefix = path.gsub(%r(app/views/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
+    prefix = path.gsub(%r(#{path_root}/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
     "#{prefix}#{key}"
   end
-end
+end

data/lib/i18n/tasks/reports/terminal.rb

@@ -22,7 +22,7 @@ module I18n
                   base_value = ''
                 else
                   locale     = magenta rec[:locale]
-                  base_value = cyan rec[:base_value].to_s.strip || ''
+                  base_value = cyan rec[:base_value].to_s.strip
                 end
                 [{value: locale, alignment: :center},
                  {value: glyph, alignment: :center},

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.2.12'
+    VERSION = '0.2.13'
   end
 end

data/spec/relative_keys_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+describe 'Relative keys' do
+  let(:task) { I18n::Tasks::BaseTask.new }
+
+  describe 'absolutize_key' do
+
+    context 'default settings' do
+      it 'works' do
+        task.absolutize_key('.title', 'app/views/movies/show.html.slim').should == 'movies.show.title'
+      end
+    end
+
+    context 'custom roots' do
+      it 'works' do
+        task.relative_roots = %w(app/views-mobile)
+        task.absolutize_key('.title', 'app/views-mobile/movies/show.html.slim').should == 'movies.show.title'
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -227,6 +227,7 @@ files:
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/readme_spec.rb
+- spec/relative_keys_spec.rb
 - spec/source_keys_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
@@ -270,6 +271,7 @@ test_files:
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/readme_spec.rb
+- spec/relative_keys_spec.rb
 - spec/source_keys_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb