vocab 0.1.0 → 0.1.1

data/lib/vocab/application.rb

@@ -20,6 +20,7 @@ module Vocab
 
         parser.banner = 'Usage: vocab [-h] command [platform] [type] [path]'
         parser.on( '-h', '--help', 'Show this usage message' ) { options.help = true }
+        parser.on( '-s', '--strict', 'Require matching order of interpolations' ) { options.strict = true }
         parser.separator ""
         parser.separator "    vocab init"
         parser.separator "    vocab extract rails"
@@ -28,10 +29,12 @@ module Vocab
         parser.separator "    vocab clean rails"
         parser.separator "    vocab convert rails xml2yml <infile>"
         parser.separator "    vocab convert rails yml2xml <infile>"
-        parser.separator "    vocab merge rails"
+        parser.separator "    vocab merge rails [-s]"
         parser.separator "    vocab merge android"
         parser.separator "    vocab validate android"
         parser.separator "    vocab validate rails"
+        parser.separator "    vocab interpolation rails <file> [-s]"
+        parser.separator "    vocab interpolation android <file>"
         parser.separator ""
 
         commands = parser.parse( ARGV )
@@ -63,13 +66,17 @@ module Vocab
         elsif( options.command == 'extract' && options.platform == 'android' )
           Extractor::Android.extract
         elsif( options.command == 'merge' && options.platform == 'rails' )
-          Merger::Rails.new.merge
+          Merger::Rails.new.merge( options.strict )
         elsif( options.command == 'merge' && options.platform == 'android' )
           Merger::Android.new.merge
         elsif( options.command == 'validate' && options.platform == 'android' )
           success = Validator::Android.new.validate
         elsif( options.command == 'validate' && options.platform == 'rails' )
           success = Validator::Rails.new.validate
+        elsif( options.command == 'interpolation' && options.platform == 'rails' && !options.type.nil? )
+            Vocab::Merger::Rails.new.check_all_interpolations( options.type, options.strict )
+        elsif( options.command == 'interpolation' && options.platform == 'android' && !options.type.nil? )
+          Vocab::Merger::Android.new.check_all_format_strings( options.type )
         else
           puts parser.help
         end

data/lib/vocab/merger/android.rb

@@ -14,7 +14,7 @@ module Vocab
         end
       end
 
-      def merge_file( path )
+      def merge_file( path, strict = true )
         strings = strings( path )
         plurals = plurals( path )
         Vocab::Translator::Android.write( strings, plurals, path )
@@ -63,6 +63,11 @@ module Vocab
         send( format_checker, key, new_value, path) 
       end
 
+      def check_all_format_strings( file )
+        strings( file )
+        plurals( file )
+      end
+
       def plural_format_changed?( key, new_value, path )
         new_value.each do |inner_key,inner_value|
           if ( @english_plurals[ key ][ inner_key ].to_s.scan( FORMAT_PATTERN ) != inner_value.to_s.scan( FORMAT_PATTERN ) ) ||

data/lib/vocab/merger/base.rb

@@ -4,10 +4,10 @@ module Vocab
 
       attr_accessor :locales_dir, :updates_dir
 
-      def merge
+      def merge( strict = false )
         files_to_merge.each do |file|
           Vocab.ui.say( "Merging file: #{file}" )
-          merge_file( file )
+          merge_file( file, strict )
         end
       end
     end

data/lib/vocab/merger/rails.rb

@@ -1,14 +1,14 @@
 module Vocab
   module Merger
     class Rails < Base
-      INTERPOLATION_PATTERN = /%{(.+?)}/
+      INTERPOLATION_PATTERN = /%{(.*?)}/
 
       def initialize( locales_dir = nil, updates_dir = nil )
         @locales_dir = locales_dir || 'config/locales'
         @updates_dir = updates_dir || 'tmp/translations'
       end
 
-      def merge_file( locales_path )
+      def merge_file( locales_path, strict = false )
         return unless translatable?( locales_path )
         create_if_missing( locales_path )
 
@@ -16,7 +16,6 @@ module Vocab
         keys = Vocab::Merger::Rails.keys_for_file( locales_path )
         english = Vocab::Merger::Rails.load_english( locales_path )
 
-
         # existing translations already in the file
         locales_translator = translator( locales_path )
         locales = locales_translator.flattened_translations
@@ -38,7 +37,7 @@ module Vocab
           value = updates[ key ] || locales[ key ]
           if value
             locales_translator.store( key, value )
-            check_matching_interpolations( key, english[ key ], value, locales_path )
+            check_matching_interpolations( key, english[ key ], value, locales_path, strict )
           else
             Vocab.ui.warn( "No translation found for key #{key} while merging #{locales_path}" )
           end
@@ -47,10 +46,37 @@ module Vocab
         locales_translator.write_file( locales_path )
       end
 
-      def check_matching_interpolations( key, old_value, new_value, locales_path )
-        if old_value.to_s.scan( INTERPOLATION_PATTERN ) != new_value.to_s.scan( INTERPOLATION_PATTERN )
-          Vocab.ui.warn( "Interpolation mismatch for key #{key} while merging #{locales_path}. \n English: #{old_value} Translation: #{new_value}" )
+      def check_matching_interpolations( key, old_value, new_value, locales_path, strict = false )
+        old_interpolations = old_value.to_s.scan( INTERPOLATION_PATTERN )
+        new_interpolations = new_value.to_s.scan( INTERPOLATION_PATTERN )
+        unless strict
+          old_interpolations.sort!
+          new_interpolations.sort!
+        end
+
+        if old_interpolations != new_interpolations
+          Vocab.ui.warn( "Interpolation mismatch for key #{key} in #{locales_path}. \n English: #{old_value} Translation: #{new_value}" )
+        end
+      end
+
+      def check_all_interpolations( file, strict = false )
+        # list of keys that need to be in the translated file
+        keys = Vocab::Merger::Rails.keys_for_file( file )
+        english = Vocab::Merger::Rails.load_english( file )
+
+        # existing translations already in the file
+        locales_translator = translator( file )
+        locales = locales_translator.flattened_translations
+
+        keys.each do |key|
+          next if Vocab::Translator::Base.ignore_key?( key )
+
+          value = locales[ key ]
+          if value
+            check_matching_interpolations( key, english[ key ], value, file, strict )
+          end
         end
+        return nil
       end
 
       def self.keys_for_file( path )

data/lib/vocab/version.rb

@@ -1,3 +1,3 @@
 module Vocab
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/data/rails/locales/en.yml

@@ -1,6 +1,6 @@
 en:
   marketing:
-    banner: This product is so good
+    banner: This product is so good %{user}
   dashboard:
     chart: This value has changed
     details: This key/value has been added

data/spec/data/rails/locales/es.yml

@@ -1,6 +1,6 @@
 es:
   marketing:
-    banner: hola
+    banner: hola %{user }
   dashboard:
     chart: Es muy bonita
     details: grande

data/spec/extractor/rails_spec.rb

@@ -91,7 +91,7 @@ describe "Vocab::Extractor::Rails" do
 
     it "creates a hash of the english translation strings currently in the config" do
       actual = Vocab::Extractor::Rails.current_strings( @locales_root )
-      expected = {:"en.marketing.banner"=>"This product is so good",
+      expected = {:"en.marketing.banner"=>"This product is so good %{user}",
                   :"en.dashboard.chart"=>"This value has changed",
                   :"en.dashboard.details"=>"This key/value has been added",
                   :"en.menu.first"=>"First menu item",

data/spec/merger/base_spec.rb

@@ -12,7 +12,7 @@ describe "Vocab::Extractor::Base" do
       files = [ 'es.yml', 'zh.yml' ]
       @merger.should_receive( :files_to_merge ).and_return( files )
       files.each do |file|
-        @merger.should_receive( :merge_file ).with( file )
+        @merger.should_receive( :merge_file ).with( file, false )
         Vocab.ui.should_receive( :say ).with( "Merging file: #{file}" )
       end
       @merger.merge

data/spec/merger/rails_spec.rb

@@ -149,7 +149,7 @@ describe "Vocab::Merger::Rails" do
   describe "check_matching_interpolations" do
     it 'warns about interpolation changes' do
       @merger = Vocab::Merger::Rails.new
-      Vocab.ui.should_receive( :warn ).with( "Interpolation mismatch for key test_key while merging test.yml. \n English: %{test_name} Translation: %{best_name}" )
+      Vocab.ui.should_receive( :warn ).with( "Interpolation mismatch for key test_key in test.yml. \n English: %{test_name} Translation: %{best_name}" )
       @merger.check_matching_interpolations( 'test_key', "%{test_name}", "%{best_name}", "test.yml") 
     end
   end

data/spec/translator/rails_spec.rb

@@ -12,7 +12,7 @@ describe 'Vocab::Translator::Rails' do
     it 'loads translations from a directory of yml files' do
 
       actual = @translator.translations
-      expected = {:marketing=>{:banner=>"This product is so good"},
+      expected = {:marketing=>{:banner=>"This product is so good %{user}"},
                   :dashboard=>{:chart=>"This value has changed",
                                :details=>"This key/value has been added"},
                   :menu=>{:first=>"First menu item",
@@ -97,7 +97,7 @@ describe 'Vocab::Translator::Rails' do
       translator = Vocab::Translator::Rails.new
       translator.load_dir( "#{vocab_root}/spec/data/rails/locales" )
       actual = translator.flattened_translations
-      expected = {:"marketing.banner"=>"This product is so good",
+      expected = {:"marketing.banner"=>"This product is so good %{user}",
                   :"dashboard.chart"=>"This value has changed",
                   :"dashboard.details"=>"This key/value has been added",
                   :"menu.first"=>"First menu item",
@@ -119,7 +119,7 @@ describe 'Vocab::Translator::Rails' do
       translator.load_dir( "#{vocab_root}/spec/data/rails/locales" )
       actual = translator.flattened_translations
       expected = { :"models.product.id_125.name"       =>"Lazero",
-                   :"marketing.banner"                 =>"hola",
+                   :"marketing.banner"                 =>"hola %{user }",
                    :"models.product.id_55.name"        =>"Muy bonita",
                    :"models.product.id_125.description"=>"Verde",
                    :"models.product.id_36.name"        =>"No Lazero",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vocab
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n