vocab 0.1.1 → 0.1.2

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.rvmrc
 *.tmp
 .bundle
 Gemfile.lock

data/lib/vocab/merger/android.rb

@@ -1,8 +1,8 @@
 module Vocab
   module Merger
     class Android < Base
-      FORMAT_PATTERN = /%(.+?)\b/ 
-      ARG_PATTERN = /\$(.+?)\b/
+      FORMAT_PATTERN = /%\w/ 
+      ARG_PATTERN = /\$[a-zA-Z]/
 
       def initialize( locales_dir = nil, updates_dir = nil )
         @locales_dir = locales_dir || 'res'
@@ -72,7 +72,7 @@ module Vocab
         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 ) ) ||
            ( @english_plurals[ key ][ inner_key ].to_s.scan( ARG_PATTERN ) != inner_value.to_s.scan( ARG_PATTERN ) )
-            Vocab.ui.warn( "Format string mismatch for key #{key}, quantity #{inner_key} while merging #{path}. \n English: #{@english_plurals[ key ][ inner_key ]} \n Translation: #{new_value[ inner_key ]}" )
+            Vocab.ui.warn( "Format string mismatch for key #{key}, quantity #{inner_key} while merging #{path}. \n English: #{@english_plurals[ key ][ inner_key ]} \n Translation: #{new_value[ inner_key ]}\n\n" )
           end
         end
       end
@@ -80,7 +80,7 @@ module Vocab
       def string_format_changed?( key, new_value, path )
         if ( @english_strings[ key ].to_s.scan( FORMAT_PATTERN ) != new_value.to_s.scan( FORMAT_PATTERN ) ) ||
            ( @english_strings[ key ].to_s.scan( ARG_PATTERN ) != new_value.to_s.scan( ARG_PATTERN ) )
-          Vocab.ui.warn( "Format string mismatch for key #{key} while merging #{path}. \n English: #{@english_strings[ key ]} \n Translation: #{new_value}" )
+          Vocab.ui.warn( "Format string mismatch for key #{key} while merging #{path}. \n English: #{@english_strings[ key ]} \n Translation: #{new_value}\n\n" )
         end
       end
 

data/lib/vocab/version.rb

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

data/spec/data/android/locales/values-fr/strings.xml

@@ -8,6 +8,9 @@
     <string name="delete">Deletee %2$d</string>
     <string name="not_in_es">This key not in spanish</string>
     <string name="debug_key">Should be ignored</string>
+    <string name="price">Alles zu einem Preis von 3,50 USD pro Monat.</string>
+    <string name="free">%s의 주간 무료 앱!</string>
+    <string name="guarantee">Rimborso garantito al 100%!</string>
 
     <plurals name="user_count">
          <item quantity="one">1 user</item>

data/spec/data/android/locales/values/strings.xml

@@ -8,6 +8,10 @@
     <string name="delete">Delete %1$d</string>
     <string name="not_in_es">This key not in spanish</string>
     <string name="debug_key">Should be ignored</string>
+    <string name="price">All this for only $3.50 a month!</string>
+    <string name="free">%s\'s free weekly app!</string>
+    <string name="guarantee">100% money back guarantee!</string>
+
 
     <plurals name="user_count">
          <item quantity="one">1 user</item>

data/spec/data/rails/locales/bom.yml

@@ -1 +1,2 @@
-bom:
+bom:
+  test: "bogus"

data/spec/extractor/android_spec.rb

@@ -10,7 +10,7 @@ describe "Vocab::Extractor::Android" do
 
     it "extracts hash of current string translations" do
       actual = Vocab::Extractor::Android.current_strings( @locale )
-      actual.should eql( { "app_name"   =>"Kid Mode",
+      actual.should include( { "app_name"   =>"Kid Mode",
                            "delete"     =>"Delete %1$d",
                            "cancel"     =>"Cancel",
                            "app_current"=>"current",

data/spec/merger/android_spec.rb

@@ -42,15 +42,34 @@ describe "Vocab::Merger::Android" do
   describe "check_matching_format_strings" do
     it 'warns about format string changes in singular strings' do
       @merger = Vocab::Merger::Android.new( @merge_dir, @update_dir )
-      Vocab.ui.should_receive( :warn ).with( "Format string mismatch for key delete while merging #{@merge_dir}/values-fr/strings.xml. \n English: Delete %1$d \n Translation: Deletee %2$d" )
+      Vocab.ui.should_receive( :warn ).with( "Format string mismatch for key delete while merging #{@merge_dir}/values-fr/strings.xml. \n English: Delete %1$d \n Translation: Deletee %2$d\n\n" )
       @merger.check_matching_format_strings( 'delete', "Deletee %2$d", "#{@merge_dir}/values-fr/strings.xml", :string_format_changed? ) 
     end
 
     it 'warns about format string changes in plurals' do
       @merger = Vocab::Merger::Android.new( @merge_dir, @update_dir )
-      Vocab.ui.should_receive( :warn ).with( "Format string mismatch for key user_count, quantity many while merging #{@merge_dir}/values-fr/strings.xml. \n English: %d users \n Translation: %f users" )
+      Vocab.ui.should_receive( :warn ).with( "Format string mismatch for key user_count, quantity many while merging #{@merge_dir}/values-fr/strings.xml. \n English: %d users \n Translation: %f users\n\n" )
       @merger.check_matching_format_strings( 'user_count', {  "one" => "1 user", "many" => "%f users" }, "#{@merge_dir}/values-fr/strings.xml", :plural_format_changed? ) 
     end
+
+
+    it 'does not warn about $ in currency' do
+      @merger = Vocab::Merger::Android.new( @merge_dir, @update_dir )
+      Vocab.ui.should_not_receive( :warn )
+      @merger.check_matching_format_strings( 'price', "Alles zu einem Preis von 3,50 USD pro Monat.", "#{@merge_dir}/values-fr/strings.xml", :string_format_changed? ) 
+    end
+
+    it 'does not warn about % as actual percent sign' do
+      @merger = Vocab::Merger::Android.new( @merge_dir, @update_dir )
+      Vocab.ui.should_not_receive( :warn )
+      @merger.check_matching_format_strings( 'guarantee', "Rimborso garantito al 100%!", "#{@merge_dir}/values-fr/strings.xml", :string_format_changed? ) 
+    end
+
+    it 'only checks for one character after %' do
+      @merger = Vocab::Merger::Android.new( @merge_dir, @update_dir )
+      Vocab.ui.should_not_receive( :warn )
+      @merger.check_matching_format_strings( 'free', "%s의 주간 무료 앱!", "#{@merge_dir}/values-fr/strings.xml", :string_format_changed? ) 
+    end
   end
 
   describe 'merge_file' do
@@ -114,7 +133,7 @@ describe "Vocab::Merger::Android" do
 
     it 'fetches the english keys' do
       merger = Vocab::Merger::Android.new( @merge_dir )
-      keys = ["app_name", "delete", "cancel", "app_current", "not_in_es", "pd_app_name"]
+      keys = ["app_name", "delete", "cancel", "app_current", "not_in_es", "pd_app_name", "free", "guarantee", "price" ]
       merger.string_keys.should =~ keys
     end
 

data/spec/translator/android_spec.rb

@@ -6,7 +6,7 @@ describe 'Vocab::Translator::Android' do
 
     it 'returns the english keys for a locales dir' do
       locales_dir = "#{vocab_root}/spec/data/android/locales"
-      expected = ["app_name", "delete", "cancel", "app_current", "not_in_es", "pd_app_name"]
+      expected = ["app_name", "delete", "cancel", "app_current", "not_in_es", "pd_app_name", "free", "guarantee", "price"]
       Vocab::Translator::Android.string_keys( locales_dir ).should =~ expected
     end
 

data/spec/validator/android_spec.rb

@@ -15,7 +15,7 @@ describe "Vocab::Validator::Android" do
 
     it 'returns a hash containing the missing keys' do
       result = @validator.validate_file( @path )
-      result[ :missing ].should eql( [ "cancel", "delete", "not_in_es" ] )
+      result[ :missing ].should eql( [ "cancel", "delete", "free", "guarantee", "not_in_es", "price" ] )
     end
 
     it 'returns a hash containing the extra keys' do

data/spec/validator/rails_spec.rb

@@ -11,7 +11,7 @@ describe "Vocab::Validator::Rails" do
 
     it "complains about yml files with leading BOM characters" do
       File.open( "#{@locales_dir}/bom.yml", "w+" ) { |f| f.write( "\xEF\xBB\xBF".force_encoding("UTF-8") ) }
-      File.open( "#{@locales_dir}/bom.yml", "a" ) { |f| f.write( "bom:" ) }
+      File.open( "#{@locales_dir}/bom.yml", "a" ) { |f| f.write( "bom:\n  test: \"bogus\"" ) }
 
       bom_regex = "\xEF\xBB\xBF".force_encoding("UTF-8")
       File.open( "#{@locales_dir}/bom.yml" ) { |f| f.read }.force_encoding( "UTF-8" ).match( bom_regex ).should be_true
@@ -99,4 +99,4 @@ describe "Vocab::Validator::Rails" do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vocab
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -321,3 +321,4 @@ test_files:
 - spec/validator/base_spec.rb
 - spec/validator/rails_spec.rb
 - spec/vocab_spec.rb
+has_rdoc: