vocab 0.0.2 → 0.0.3

data/spec/translator/rails_spec.rb

@@ -12,18 +12,20 @@ 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" },
-                   :models   =>{ :product=>{ :id_125=>{ :description=>"Green with megawatts",
-                                                        :name       =>"Lazer" },
-                                             :id_55 =>{ :description=>"A new nested description",
-                                                        :name       =>"a new nested name" },
-                                             :id_36 =>{ :description=>"Polarized and lazer resistant",
-                                                        :name       =>"This nested value has changed" } } },
-                   :menu     =>{ :second=>"Second menu item",
-                                 :first=>"First menu item" },
-                   :dashboard=>{ :chart  =>"This value has changed",
-                                 :details=>"This key/value has been added" },
-                   :not_in_es=>"This key not in spanish" }
+      expected = {:marketing=>{:banner=>"This product is so good"},
+                  :dashboard=>{:chart=>"This value has changed",
+                               :details=>"This key/value has been added"},
+                  :menu=>{:first=>"First menu item",
+                          :second=>"Second menu item"},
+                  :not_in_es=>"This key not in spanish",
+                  :users=>{:one=>"1 user",
+                           :other=>"%{count} users"},
+                  :models=>{:product=>{:id_125=>{:description=>"Green with megawatts",
+                                                 :name=>"Lazer"},
+                                       :id_36=>{:description=>"Polarized and lazer resistant",
+                                                :name=>"This nested value has changed"},
+                                       :id_55=>{:description=>"A new nested description",
+                                                :name=>"a new nested name"}}}}
       actual.should eql( expected )
     end
 
@@ -95,18 +97,20 @@ describe 'Vocab::Translator::Rails' do
       translator = Vocab::Translator::Rails.new
       translator.load_dir( "#{vocab_root}/spec/data/rails/locales" )
       actual = translator.flattened_translations
-      expected = { :"dashboard.details"                =>"This key/value has been added",
-                   :"models.product.id_125.name"       =>"Lazer",
-                   :"models.product.id_55.name"        =>"a new nested name",
-                   :"models.product.id_36.name"        =>"This nested value has changed",
-                   :"menu.second"                      =>"Second menu item",
-                   :"dashboard.chart"                  =>"This value has changed",
-                   :"menu.first"                       =>"First menu item",
-                   :"marketing.banner"                 =>"This product is so good",
-                   :"models.product.id_125.description"=>"Green with megawatts",
-                   :"models.product.id_55.description" =>"A new nested description",
-                   :"models.product.id_36.description" =>"Polarized and lazer resistant",
-                   :"not_in_es"                        =>"This key not in spanish" }
+      expected = {:"marketing.banner"=>"This product is so good",
+                  :"dashboard.chart"=>"This value has changed",
+                  :"dashboard.details"=>"This key/value has been added",
+                  :"menu.first"=>"First menu item",
+                  :"menu.second"=>"Second menu item",
+                  :not_in_es=>"This key not in spanish",
+                  :"users.one"=>"1 user",
+                  :"users.other"=>"%{count} users",
+                  :"models.product.id_125.description"=>"Green with megawatts",
+                  :"models.product.id_125.name"=>"Lazer",
+                  :"models.product.id_36.description"=>"Polarized and lazer resistant",
+                  :"models.product.id_36.name"=>"This nested value has changed",
+                  :"models.product.id_55.description"=>"A new nested description",
+                  :"models.product.id_55.name"=>"a new nested name"}
       actual.should == expected
     end
 

data/spec/validator/android_spec.rb

@@ -19,7 +19,7 @@ describe "Vocab::Validator::Android" do
     end
 
     it 'returns a hash containing the extra keys' do
-      @validator.should_receive( :english_keys ).and_return( [ 'foo' ] )
+      @validator.should_receive( :string_keys ).and_return( [ 'foo' ] )
       @validator.should_receive( :other_keys ).and_return( [ 'foo', 'extra', 'stuff' ] )
       result = @validator.validate_file( @path )
       result[ :extra ].should eql( [ 'extra', 'stuff' ] )
@@ -40,7 +40,7 @@ describe "Vocab::Validator::Android" do
 
     it 'validates android locales files' do
       files = @validator.files_to_validate
-      files.each { |file| @validator.should_receive( :validate_file ).with( file ) }
+      files.each { |file| @validator.should_receive( :validate_file ).with( file ).and_return( {} ) }
       @validator.should_receive( :print ).exactly( files.size ).times
       @validator.validate
     end

data/spec/validator/base_spec.rb

@@ -1,5 +1,28 @@
 require "spec_helper"
 
 describe "Vocab::Validator::Base" do
+  
+  before( :each ) do
+    @files = [ 'foo', 'bar' ]
+    @good = { :missing => [], :extra => [] }
+    @bad = { :missing => [ 'bad' ], :extra => [] }
+    
+    @validator = Vocab::Validator::Base.new
+    @validator.should_receive( :files_to_validate ).and_return( @files )
+  end
+  
+  describe "validate" do
+    
+    it "returns true if no files have missing keys" do
+      @validator.should_receive( :validate_file ).exactly( @files.size ).times.and_return( @good )
+      @validator.validate.should be_true
+    end
+          
+    it "returns false if any files have missing keys" do
+      @validator.should_receive( :validate_file ).exactly( @files.size ).times.and_return( @bad )
+      @validator.validate.should be_false  
+    end
+    
+  end
 
 end

data/spec/validator/rails_spec.rb

@@ -15,11 +15,11 @@ describe "Vocab::Validator::Rails" do
 
     it 'returns a hash containing the missing keys' do
       result = @validator.validate_file( @path )
-      result[ :missing ].should =~ [ "menu.first", "menu.second", "not_in_es" ]
+      result[ :missing ].should =~ ["menu.first", "menu.second", "not_in_es", "users.one", "users.other"]
     end
 
     it 'returns a hash containing the extra keys' do
-      @validator.should_receive( :english_keys ).and_return( [ 'foo' ] )
+      @validator.should_receive( :string_keys ).and_return( [ 'foo' ] )
       @validator.should_receive( :other_keys ).and_return( [ 'foo', 'extra', 'stuff' ] )
       result = @validator.validate_file( @path )
       result[ :extra ].should eql( [ 'extra', 'stuff' ] )
@@ -41,7 +41,7 @@ describe "Vocab::Validator::Rails" do
 
     it 'validates android locales files' do
       files = @validator.files_to_validate
-      files.each { |file| @validator.should_receive( :validate_file ).with( file ) }
+      files.each { |file| @validator.should_receive( :validate_file ).with( file ).and_return( {} ) }
       @validator.should_receive( :print ).exactly( files.size ).times
       @validator.validate
     end
@@ -66,7 +66,7 @@ describe "Vocab::Validator::Rails" do
 
   end
 
-  describe 'english_keys' do
+  describe 'string_keys' do
 
     before( :each ) do
       @file = "#{@locales_dir}/es.yml"
@@ -74,8 +74,8 @@ describe "Vocab::Validator::Rails" do
     end
 
     it 'returns the flattened keys from english equivalent file' do
-      keys = ["dashboard.chart", "dashboard.details", "marketing.banner", "menu.first", "menu.second", "not_in_es"]
-      @validator.english_keys( @file ).should =~ keys
+      keys = ["dashboard.chart", "dashboard.details", "marketing.banner", "menu.first", "menu.second", "not_in_es", "users.one", "users.other"]
+      @validator.string_keys( @file ).should =~ keys
     end
 
   end

data/vocab.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n"
   s.add_dependency "nokogiri"
   s.add_development_dependency "rspec", "~> 2.7.0"
+  s.add_development_dependency "simplecov"
   # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vocab
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000Z
+date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152232980 !ruby/object:Gem::Requirement
+  requirement: &2157421200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152232980
+  version_requirements: *2157421200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152232140 !ruby/object:Gem::Requirement
+  requirement: &2157420580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152232140
+  version_requirements: *2157420580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152230840 !ruby/object:Gem::Requirement
+  requirement: &2157419820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,18 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152230840
+  version_requirements: *2157419820
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2157418700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157418700
 description: Export strings that need to be translated and integrate the completed
   translations
 email:
@@ -54,7 +65,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - bin/vocab
@@ -88,6 +101,7 @@ files:
 - spec/data/android/previous.xml
 - spec/data/android/translations/values-es/es-string-file.xml
 - spec/data/android/write.xml
+- spec/data/android/write_plurals.xml
 - spec/data/rails/locales/en.yml
 - spec/data/rails/locales/es.yml
 - spec/data/rails/locales/models/product/en.yml
@@ -146,6 +160,7 @@ test_files:
 - spec/data/android/previous.xml
 - spec/data/android/translations/values-es/es-string-file.xml
 - spec/data/android/write.xml
+- spec/data/android/write_plurals.xml
 - spec/data/rails/locales/en.yml
 - spec/data/rails/locales/es.yml
 - spec/data/rails/locales/models/product/en.yml