babelyoda 2.0.7 → 2.1.0

data/Guardfile

@@ -0,0 +1,9 @@
+notification :gntp, :sticky => true, :host => '127.0.0.1', :password => ENV['GNTP_PASS']
+
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| ["spec/lib/#{m[1]}_spec.rb"] }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/babelyoda.gemspec

@@ -17,7 +17,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec",       '~> 2.8', '>= 2.8.0'
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "ruby_gntp"
   s.add_runtime_dependency "awesome_print",   '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency "rake",            '~> 0.9', '>= 0.9.2.2'
   s.add_runtime_dependency "active_support",  '~> 3.0', '>= 3.0.0'

data/lib/babelyoda/keyset.rb

@@ -59,9 +59,7 @@ module Babelyoda
     
     def ensure_languages!(languages = [])
       @keys.each_value do |key|
-        languages.each do |language| 
-          key.values[language] ||= Babelyoda::LocalizationValue.new(language, '')
-        end
+        key.ensure_languages!(languages)
       end
     end
     

data/lib/babelyoda/localization_key.rb

@@ -1,3 +1,5 @@
+require_relative 'regexp'
+
 module Babelyoda
   class LocalizationKey
     attr_reader :id
@@ -8,14 +10,31 @@ module Babelyoda
       @id = id
       @context = context
       @values = {}
+      @plural = plural_id?(id)
+      @plural_key = plural? ? extract_plural_key(id) : nil
+      @id = depluralize_key(@id) if plural?
     end
     
     def to_s
       "\"#{@id}\" [#{@values.keys.map{|k| ":#{k.to_s}"}.join(', ')}] // #{@context}"
     end
     
+    def plural? ; @plural ; end
+    
     def <<(localization_value)
-      @values[localization_value.language.to_sym] = localization_value.dup
+      raise "Can't merge a plural value into a non-plural key" if !plural? && localization_value.plural?
+      lang = localization_value.language.to_sym
+      value = localization_value.dup
+      if plural?
+        value.pluralize!(@plural_key)
+        if @values[lang]
+          @values[lang].merge!(value, { :preserve => true })
+        else
+          @values[lang] = value
+        end
+      else
+        @values[lang] = value
+      end
       self
     end
     
@@ -23,7 +42,8 @@ module Babelyoda
       updated = false
       
       context_changed = false
-      if @context != localization_key.context
+      new_context = localization_key.context
+      if @context != new_context && new_context != nil && new_context.length > 0
         @context = localization_key.context
         updated = context_changed = true
       end
@@ -56,5 +76,16 @@ module Babelyoda
     def empty?
       @values.empty?
     end
+    
+    def ensure_languages!(languages = [])
+      languages.each do |language|
+        unless self.values[language]
+          self << Babelyoda::LocalizationValue.new(language, '')
+        end 
+      end      
+    end    
+    
+  private
+    include Babelyoda::Regexp
   end
 end

data/lib/babelyoda/localization_value.rb

@@ -1,3 +1,5 @@
+require_relative 'regexp'
+
 module Babelyoda
   class LocalizationValue
     attr_accessor :language
@@ -6,21 +8,62 @@ module Babelyoda
     
     def initialize(language, text, status = :requires_translation)
       @language, @text, @status = language.to_sym, text, status.to_sym
+      pluralize! if plural_id?(@text)
     end
     
+    def pluralize!(plural_key = :one)
+      return if plural?
+      new_text = { :one => nil, :some => nil, :many => nil, :none => nil }
+
+      if plural_id?(text)
+        m = plural_match(text)
+        new_text[m[2].to_sym] = depluralize_value(@text)
+      else
+        new_text[plural_key] = text
+      end
+      
+      @text = new_text
+    end
+    
+    def plural? ; text.kind_of? Hash ; end
+    
     def merge!(other_value, options = {})
       updated = false
       options = { preserve: false }.merge!(options)
+
       unless @language.to_sym == other_value.language.to_sym
-        raise RuntimeError.new("Can't merge values in different languages: #{@language.to_sym} and #{other_value.language.to_sym}") 
+        raise "Can't merge values in different languages: #{@language.to_sym} and #{other_value.language.to_sym}"
       end
-      if (!options[:preserve] || @status.to_sym == :requires_translation)
-        unless @text == other_value.text
-          @text = other_value.text 
-          updated = true
+      
+      raise "Can't merge a plural and a non-plural value!" unless plural? == other_value.plural?
+
+      if plural?
+        [:one, :some, :many, :none].each do |plural_type|
+          key_updated = merge_plural_type!(plural_type, other_value.text[plural_type], options)
+          updated ||= key_updated
+        end
+      else
+        if (!options[:preserve] || @status.to_sym == :requires_translation)
+          if @text != other_value.text && !other_value.nil?
+            @text = other_value.text 
+            updated = true
+          end
         end
       end
       return updated
     end
+    
+  private
+    include Babelyoda::Regexp
+    
+    def merge_plural_type!(type, other_value, options)
+      if (!options[:preserve] || @status.to_sym == :requires_translation)
+        if @text[type] != other_value && !other_value.nil?
+          @text[type] = other_value 
+          return true
+        end
+      end
+      return false
+    end
   end
 end

data/lib/babelyoda/regexp.rb

@@ -0,0 +1,30 @@
+module Babelyoda
+  module Regexp
+    PLURAL_ID = /([^%]|^)%\[(one|some|many|none|plural)\]([^\s])/
+    PLURALIZED_ID = /([^%]|^)%\[(plural)\]([^\s])/
+    
+    def plural_id?(id)
+      plural_match(id) != nil
+    end
+    
+    def plural_match(id)
+      id.match(PLURAL_ID)
+    end
+    
+    def depluralize_value(id)
+      id.gsub(PLURAL_ID, '\1%\3')
+    end
+
+    def depluralize_key(id)
+      id.gsub(PLURAL_ID, '\1%[plural]\3')
+    end
+    
+    def pluralize_key(id, plural_key)
+      id.gsub(PLURALIZED_ID, "\\1%[#{plural_key}]\\3")
+    end
+    
+    def extract_plural_key(id)
+      id.match(PLURAL_ID)[2].to_sym
+    end
+  end
+end

data/lib/babelyoda/specification.rb

@@ -29,7 +29,7 @@ module Babelyoda
     def self.load
       trace_spec = @spec.nil? && ::Rake.application.options.trace
 	    @spec ||= load_from_file(filename = FILENAME)
-	    @spec.dump if trace_spec && @spec
+      @spec.dump if trace_spec && @spec
 	    return @spec
     end
     

data/lib/babelyoda/specification_loader.rb

@@ -17,7 +17,11 @@ module Babelyoda
   	end
 
     def dump
-    	ap self, :indent => -2
+      unless ::Rake.application.options.trace
+      	ap self, :indent => -2
+      else
+      	p self
+      end
     end
     
     module ClassMethods

data/lib/babelyoda/strings.rb

@@ -6,6 +6,31 @@ require_relative 'strings_lexer'
 require_relative 'strings_parser'
 
 module Babelyoda
+  class Keyset
+    def to_strings(io, language)
+      keys.each_value do |key|
+        key.to_strings(io, language)
+      end
+    end
+  end
+  
+  class LocalizationKey
+    def to_strings(io, language)
+      return if self.values[language].nil?
+      io << "/* #{self.context} */\n" if self.context
+      if plural?
+        values[language].text.keys.each do |plural_key|
+          if values[language].text[plural_key] != nil && values[language].text[plural_key].length > 0
+            io << "\"#{pluralize_key(id, plural_key)}\" = \"#{values[language].text[plural_key]}\";\n"
+          end
+        end
+      else
+        io << "\"#{id}\" = \"#{values[language].text}\";\n"
+      end
+      io << "\n"
+    end
+  end
+  
 	class Strings < Keyset
 	  attr_reader :filename
 	  attr_reader :language
@@ -36,12 +61,7 @@ module Babelyoda
     def save!
       FileUtils.mkdir_p(File.dirname(filename))
       File.open(filename, "wb") do |f|
-        keys.each_pair do |id, key|
-          next unless key.values[language]
-          f << "/* #{key.context} */\n" if key.context
-          f << "\"#{id}\" = \"#{key.values[language].text}\";\n"
-          f << "\n"
-        end
+        to_strings(f, language)
       end
     end
     

data/lib/babelyoda/tanker.rb

@@ -5,19 +5,15 @@ require 'stringio'
 
 require_relative 'logger'
 require_relative 'specification_loader'
+require_relative 'localization_key'
+require_relative 'localization_value'
 
 module Babelyoda
   class Keyset 
     def to_xml(xml, language = nil)
       xml.keyset(:id => name) do
         keys.each_value do |key|
-          xml.key(:id => key.id, :is_plural => 'False') do
-            xml.context(key.context)
-            key.values.each_value do |value|
-              next if language && (value.language.to_s != language.to_s)
-              xml.value(value.text, :language => value.language, :status => value.status)
-            end
-          end
+          key.to_xml(xml, language)
         end
       end
     end
@@ -42,14 +38,67 @@ module Babelyoda
       end
       result
     end
+    
+    def to_xml(xml, language = nil)
+      xml.key(:id => self.id, :is_plural => (plural? ? 'True' : 'False')) do |key|
+        xml << "<context>#{self.context}</context>"
+        self.values.each_value do |value|
+          next if language && (value.language.to_s != language.to_s)
+          value.to_xml(xml)
+        end
+      end
+    end
   end
   
   class LocalizationValue
     def self.parse_xml(node)
-      if node.text.length > 0
+      if node.css('plural').first
+        plural = node.css('plural').first
+
+        plural_key = plural.css('one').first
+        value_one = self.new(node[:language], plural_key.text, node[:status])
+        value_one.pluralize!(:one)
+
+        plural_key = plural.css('some').first
+        value_some = self.new(node[:language], plural_key.text, node[:status])
+        value_some.pluralize!(:some)
+
+        plural_key = plural.css('many').first
+        value_many = self.new(node[:language], plural_key.text, node[:status])
+        value_many.pluralize!(:many)
+
+        plural_key = plural.css('none').first
+        value_none = self.new(node[:language], plural_key.text, node[:status])
+        value_none.pluralize!(:none)
+
+        value_one.merge!(value_some)
+        value_one.merge!(value_many)
+        value_one.merge!(value_none)
+        
+        value_one.text.keys.each do |k|
+          value_one.text[k] = nil if value_one.text[k] == ''
+        end
+        
+        value_one
+      elsif node.text.length > 0
         self.new(node[:language], node.text, node[:status])
       end
     end
+    
+    def to_xml(xml)
+      unless plural?
+        xml.value(self.text, :language => self.language, :status => self.status)
+      else
+        xml.value(:language => self.language, :status => self.status) do |value|
+          value.plural do |plural|
+            plural.one text[:one] || ''
+            plural.some text[:some] || ''
+            plural.many text[:many] || ''
+            plural.none text[:none] || ''
+          end
+        end
+      end
+    end
   end
   
 	class Tanker
@@ -124,13 +173,14 @@ module Babelyoda
     end
 
     def project_xml(&block)
-      xml = Builder::XmlMarkup.new
-      xml.instruct!(:xml, :encoding => "UTF-8")
-      xml.tanker do
-        xml.project(:id => project_id) do
-          yield xml
+      xml = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+        xml.tanker do
+          xml.project(:id => project_id) do
+            yield xml
+          end
         end
       end
+      xml.to_xml(:indent => 2)
     end
 
     def multipart_data(payload = {}, boundary = MULTIPART_BOUNDARY)

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.0.7"
+  VERSION = "2.1.0"
 end

data/spec/lib/babelyoda/keyset_spec.rb

@@ -0,0 +1,43 @@
+require 'babelyoda/strings_lexer'
+require 'babelyoda/strings_parser'
+require 'babelyoda/keyset'
+
+describe "keyset" do
+  it "can be created" do
+    keyset = Babelyoda::Keyset.new('Combined')
+    keyset.name.should == 'Combined'
+    keyset.keys.size.should == 0
+  end
+  
+  it "should correctly merge plural keys" do
+    lexer = Babelyoda::StringsLexer.new    
+    parser = Babelyoda::StringsParser.new(lexer, :en)
+    str = <<-EOF
+    /* Some comment */
+    "Some plural %[one]u key" = "Some translation for one %u";
+    /* Some comment */
+    "Some plural %[some]u key" = "Some translation for some %u";
+    /* Some comment */
+    "Some plural %[many]u key" = "Some translation for many %u";
+    /* Some comment */
+    "Some plural %[none]u key" = "Some translation for none %u";
+    EOF
+    keyset = Babelyoda::Keyset.new('Combined')
+    parser.parse(str) do |record|
+      keyset.merge_key!(record)
+    end
+    keyset.keys.size.should == 1
+    key = keyset.keys['Some plural %[plural]u key']
+    key.should_not == nil
+    key.id.should == 'Some plural %[plural]u key'
+    key.values.size.should == 1
+    value = key.values[:en]
+    value.should_not == nil
+    value.plural?.should == true
+    text = value.text
+    text[:one].should == 'Some translation for one %u'
+    text[:some].should == 'Some translation for some %u'
+    text[:many].should == 'Some translation for many %u'
+    text[:none].should == 'Some translation for none %u'
+  end
+end

data/spec/lib/babelyoda/localization_key_spec.rb

@@ -0,0 +1,152 @@
+require 'babelyoda/localization_key'
+require 'babelyoda/localization_value'
+
+describe "basic localization key" do
+  it "can be created" do
+    key = Babelyoda::LocalizationKey.new("Hello world!", "Some translator comment")
+    key.values.size.should == 0
+  end
+  
+  it "should not be marked as plural" do
+    key = Babelyoda::LocalizationKey.new("Hello world!", "Some translator comment")
+    key.plural?.should == false
+  end
+
+  it "ensures the set of languages is present" do
+    key = Babelyoda::LocalizationKey.new("Hello world!", "Some translator comment")
+    key.ensure_languages!([:en, :ru])
+    [:en, :ru].each do |lang|
+      value = key.values[lang]
+      value.should_not == nil
+      value.plural?.should == false
+    end
+    [:tr, :uk].each do |lang|
+      value = key.values[lang]
+      value.should == nil
+    end
+  end
+
+end
+
+describe "plural localization key" do
+  it "can be created with a plural id of [one]" do
+    key = Babelyoda::LocalizationKey.new("%[one]d organization nearby", "The number of organizations")
+    key.plural?.should == true
+    key.id.should == "%[plural]d organization nearby"
+  end
+
+  it "can be created with a plural id of [some]" do
+    key = Babelyoda::LocalizationKey.new("%[some]d organization nearby", "The number of organizations")
+    key.plural?.should == true
+    key.id.should == "%[plural]d organization nearby"
+  end
+
+  it "can be created with a plural id of [many]" do
+    key = Babelyoda::LocalizationKey.new("%[many]d organization nearby", "The number of organizations")
+    key.plural?.should == true
+    key.id.should == "%[plural]d organization nearby"
+  end
+
+  it "can be created with a plural id of [none]" do
+    key = Babelyoda::LocalizationKey.new("%[none]d organization nearby", "The number of organizations")
+    key.plural?.should == true
+    key.id.should == "%[plural]d organization nearby"
+  end
+
+  it "%% should be ignored and the key be singular" do
+    key = Babelyoda::LocalizationKey.new("%%[none]d organization nearby", "The number of organizations")
+    key.plural?.should == false
+    key.id.should == "%%[none]d organization nearby"
+  end
+  
+  context "after a pluralized key has been created" do
+    
+    before(:each) do
+      @key = Babelyoda::LocalizationKey.new("%[one]d organization nearby", "The number of organizations")
+    end
+    
+    it "should pluralize given values" do
+      value = Babelyoda::LocalizationValue.new(:en, "%[one]d organization nearby")
+      @key << value
+      @key.values.size.should == 1
+      value = @key.values[:en]
+      value.plural?.should == true
+      value.text.kind_of?(Hash).should == true
+    end
+    
+    it "should merge plural values for different plurals of the same key" do
+      value1 = Babelyoda::LocalizationValue.new(:en, "%[one]d organization nearby")
+      value2 = Babelyoda::LocalizationValue.new(:en, "%[some]d organization nearby")
+      @key << value1
+      @key << value2
+      @key.values.size.should == 1
+      value = @key.values[:en]
+      value.plural?.should == true
+      value.text[:one].should == '%d organization nearby'
+      value.text[:some].should == '%d organization nearby'
+      value.text[:many].should == nil
+      value.text[:none].should == nil
+    end
+      
+  end
+  
+  it "should correctly merge non-plural value into the correct plural key :one" do
+    key = Babelyoda::LocalizationKey.new("%[one]d organization nearby", "The number of organizations")
+    value = Babelyoda::LocalizationValue.new(:en, "%d organization nearby")
+    key << value
+    value = key.values[:en]
+    value.text[:one].should == '%d organization nearby'
+  end
+  
+  it "should correctly merge non-plural value into the correct plural key :some" do
+    key = Babelyoda::LocalizationKey.new("%[some]d organization nearby", "The number of organizations")
+    value = Babelyoda::LocalizationValue.new(:en, "%d organization nearby")
+    key << value
+    value = key.values[:en]
+    value.text[:some].should == '%d organization nearby'
+  end
+  
+  it "should correctly depluralize the key with the plural key in the middle of the key" do
+    key = Babelyoda::LocalizationKey.new("Some plural %[none]u key", "The number of organizations")
+    key.id.should == 'Some plural %[plural]u key'
+    key.plural?.should == true
+  end
+  
+  it "should correctly depluralize the key with the plural key at the beginning of the key" do
+    key = Babelyoda::LocalizationKey.new("%[none]u key", "The number of organizations")
+    key.id.should == '%[plural]u key'
+    key.plural?.should == true
+  end
+  
+  it "should correctly depluralize the key with the plural key at the end of the key" do
+    key = Babelyoda::LocalizationKey.new("the key is %[none]u", "The number of organizations")
+    key.id.should == 'the key is %[plural]u'
+    key.plural?.should == true
+  end
+  
+  it "should not override a non-empty context with an empty context on merge" do
+    key1 = Babelyoda::LocalizationKey.new("the key is %[none]u", "Non empty context")
+    key2 = Babelyoda::LocalizationKey.new("the key is %[none]u", "")
+    key1.merge!(key2)
+    key1.context.should == "Non empty context"
+  end
+
+  it "ensures the set of languages is present" do
+    key = Babelyoda::LocalizationKey.new("the key is %[none]u", "Non empty context")
+    key.ensure_languages!([:en, :ru])
+    [:en, :ru].each do |lang|
+      value = key.values[lang]
+      value.should_not == nil
+      value.plural?.should == true
+      [:one, :some, :many].each do |plural_key|
+        value.text[plural_key].should == nil
+      end
+      value.text[:none].should == ''
+    end
+    [:tr, :uk].each do |lang|
+      value = key.values[lang]
+      value.should == nil
+    end
+  end
+  
+end

data/spec/lib/babelyoda/localization_value_spec.rb

@@ -0,0 +1,17 @@
+require 'babelyoda/localization_value'
+
+describe "localization value" do
+  it "can be created" do
+    value = Babelyoda::LocalizationValue.new(:en, "Value 1")
+    value.language.should == :en
+    value.text.should == "Value 1"
+  end
+  
+  it "should merge non-plural values" do
+    value1 = Babelyoda::LocalizationValue.new(:en, "Value 1")
+    value2 = Babelyoda::LocalizationValue.new(:en, "Value 2")
+    value1.merge!(value2)
+    value1.language.should == :en
+    value1.text.should == "Value 2"
+  end
+end

data/spec/lib/babelyoda/strings_lexer_spec.rb

@@ -0,0 +1,37 @@
+require "babelyoda/strings_lexer"
+
+describe "strings lexer" do
+  it "can be created" do
+    lexer = Babelyoda::StringsLexer.new
+  end
+  
+  context "basic strings lexer" do
+
+    before(:each) do
+      @lexer = Babelyoda::StringsLexer.new
+    end
+
+    it "can parse tokens" do
+      str = <<-EOF
+      /* Some comment */
+      "Some key" = "Some translation";
+      EOF
+      result = []
+      @lexer.lex(str) do |token, value|
+        result << { :token => token, :value => value }
+      end
+      result.size.should == 5
+      result[0][:token].should == :multiline_comment
+      result[0][:value].should == "/* Some comment */"
+      result[1][:token].should == :string
+      result[1][:value].should == "\"Some key\""
+      result[2][:token].should == :equal_sign
+      result[2][:value].should == "="
+      result[3][:token].should == :string
+      result[3][:value].should == "\"Some translation\""
+      result[4][:token].should == :semicolon
+      result[4][:value].should == ";"
+    end
+
+  end  
+end

data/spec/lib/babelyoda/strings_parser_spec.rb

@@ -0,0 +1,57 @@
+require 'babelyoda/strings_lexer'
+require 'babelyoda/strings_parser'
+
+describe "strings parser" do
+  before(:each) do
+    @lexer = Babelyoda::StringsLexer.new    
+  end
+  
+  it "can be created" do
+    parser = Babelyoda::StringsParser.new(@lexer, :en)
+  end
+  
+  context "parsing" do
+    before(:each) do
+      @parser = Babelyoda::StringsParser.new(@lexer, :en)
+    end
+    
+    it "should parse simple keys" do
+      str = <<-EOF
+      /* Some comment */
+      "Some key" = "Some translation";
+      EOF
+      result = []
+      @parser.parse(str) do |record|
+        result << record
+      end
+      result.size.should == 1
+      result[0].context.should == "Some comment"
+      result[0].id.should == "Some key"
+      result[0].values.size.should == 1
+      result[0].plural?.should == false
+      result[0].values[:en].language.should == :en
+      result[0].values[:en].status.should == :requires_translation
+      result[0].values[:en].text.should == "Some translation"
+    end
+
+    it "should parse plural keys" do
+      str = <<-EOF
+      // Some comment
+      "%[one]d organizations" = "%[one]d organizations";
+      EOF
+      result = []
+      @parser.parse(str) do |record|
+        result << record
+      end
+      result.size.should == 1
+      result[0].context.should == "Some comment"
+      result[0].id.should == "%[plural]d organizations"
+      result[0].values.size.should == 1
+      result[0].plural?.should == true
+      result[0].values[:en].language.should == :en
+      result[0].values[:en].status.should == :requires_translation
+      result[0].values[:en].text[:one].should == "%d organizations"
+    end
+  end
+  
+end

data/spec/lib/babelyoda/strings_spec.rb

@@ -0,0 +1,71 @@
+require 'babelyoda/strings'
+
+describe "strings-based keyset" do
+  it "can be created with a filename and language" do
+    strings = Babelyoda::Strings.new('Combined.strings', :en)
+  end
+  
+  context "when empty" do
+    it "serializes to an IO object" do
+      strings = Babelyoda::Strings.new('Combined.strings', :en)
+      io = StringIO.new
+      strings.to_strings(io, :en)
+      io.read.should == ''
+    end
+  end
+  
+  context "when has only non-plural keys" do
+    it "merges keys in" do
+      strings = Babelyoda::Strings.new('Combined.strings', :en)
+      value = Babelyoda::LocalizationValue.new(:en, 'Some translation')
+      key = Babelyoda::LocalizationKey.new('Some key', 'Some comment')
+      key << value
+      strings.merge_key!(key)
+      strings.keys.size.should == 1
+    end
+    
+    it "serializes to an IO object" do
+      strings = Babelyoda::Strings.new('Combined.strings', :en)
+      
+      value = Babelyoda::LocalizationValue.new(:en, 'Some translation')
+      key = Babelyoda::LocalizationKey.new('Some key', 'Some comment')
+      key << value
+      strings.merge_key!(key)
+      
+      io = StringIO.new
+      strings.to_strings(io, :en)
+      io.rewind
+      io.read.should == 
+<<-EOF
+/* Some comment */
+"Some key" = "Some translation";
+
+EOF
+    end
+  end
+  
+  context "with plural keys" do
+    it "serializes to an IO object" do
+      strings = Babelyoda::Strings.new('Combined.strings', :en)
+
+      value_one = Babelyoda::LocalizationValue.new(:en, 'Some translation for %d one')
+      value_some = Babelyoda::LocalizationValue.new(:en, 'Some translation for %d some')
+      value_some.pluralize!(:some)
+      key = Babelyoda::LocalizationKey.new('Some %[one]d plural key', 'Some comment')
+      key << value_one
+      key << value_some
+      strings.merge_key!(key)
+
+      io = StringIO.new
+      strings.to_strings(io, :en)
+      io.rewind
+      io.read.should == 
+<<-EOF
+/* Some comment */
+"Some %[one]d plural key" = "Some translation for %d one";
+"Some %[some]d plural key" = "Some translation for %d some";
+
+EOF
+    end
+  end
+end

data/spec/lib/babelyoda/tanker_spec.rb

@@ -0,0 +1,164 @@
+require 'babelyoda/tanker'
+
+describe "tanker XML serialization" do
+  it "should serialize non-plural values" do
+    value = Babelyoda::LocalizationValue.new(:en, "Some translation")
+
+    builder = Nokogiri::XML::Builder.new do |xml|
+      value.to_xml(xml)
+    end
+
+    builder.to_xml.should == "<?xml version=\"1.0\"?>\n<value language=\"en\" status=\"requires_translation\">Some translation</value>\n"
+  end
+
+  it "should serialize plural values" do
+    value = Babelyoda::LocalizationValue.new(:en, "some plural %u translation")
+    value.pluralize!
+
+    builder = Nokogiri::XML::Builder.new do |xml|
+      value.to_xml(xml)
+    end
+
+    builder.to_xml.should == '<?xml version="1.0"?>' + "\n" +
+                             '<value language="en" status="requires_translation">' + "\n" +
+                             '  <plural>' + "\n" +
+                             '    <one>some plural %u translation</one>' + "\n" +
+                             '    <some></some>' + "\n" +
+                             '    <many></many>' + "\n" +
+                             '    <none></none>' + "\n" +
+                             '  </plural>' + "\n" +
+                             '</value>' + "\n"
+  end
+
+  it "should serialize non-plural keys" do
+    key = Babelyoda::LocalizationKey.new("Some key", "Some context")
+    value = Babelyoda::LocalizationValue.new(:en, "Some translation")
+    key << value
+
+    builder = Nokogiri::XML::Builder.new do |xml|
+      key.to_xml(xml)
+    end
+
+    builder.to_xml.should == "<?xml version=\"1.0\"?>\n" + 
+                             "<key id=\"Some key\" is_plural=\"False\">\n" +
+                             "  <context>Some context</context>\n" +
+                             "  <value language=\"en\" status=\"requires_translation\">Some translation</value>\n" +
+                             "</key>\n"
+  end
+
+  it "should serialize plural keys" do
+    key = Babelyoda::LocalizationKey.new("Some %[one]d plural key", "Some context")
+
+    value = Babelyoda::LocalizationValue.new(:en, "Some translation for one")
+    value.pluralize!(:one)
+    key << value
+
+    value = Babelyoda::LocalizationValue.new(:en, "Some translation for some")
+    value.pluralize!(:some)
+    key << value
+
+    builder = Nokogiri::XML::Builder.new do |xml|
+      key.to_xml(xml)
+    end
+
+    builder.to_xml.should == 
+<<-EOF
+<?xml version="1.0"?>
+<key id="Some %[plural]d plural key" is_plural="True">
+  <context>Some context</context>
+  <value language="en" status="requires_translation">
+    <plural>
+      <one>Some translation for one</one>
+      <some>Some translation for some</some>
+      <many></many>
+      <none></none>
+    </plural>
+  </value>
+</key>
+EOF
+  end
+  
+  it "should parse non-plural value" do
+    doc = Nokogiri::XML.parse(
+      <<-EOF
+      <?xml version="1.0"?>
+      <value language="en" status="requires_translation">Some translation</value>
+      EOF
+    )
+    value = Babelyoda::LocalizationValue.parse_xml(doc.root)
+    value.language.should == :en
+    value.status.should == :requires_translation
+    value.text.should == 'Some translation'
+    value.plural?.should == false
+  end
+
+  it "should parse plural value" do
+    doc = Nokogiri::XML.parse(
+      <<-EOF
+      <?xml version="1.0"?>
+      <value language="en" status="requires_translation">
+        <plural>
+          <one>Some translation for one</one>
+          <some>Some translation for some</some>
+          <many></many>
+          <none></none>
+        </plural>
+      </value>
+      EOF
+    )
+    value = Babelyoda::LocalizationValue.parse_xml(doc.root)
+    value.language.should == :en
+    value.status.should == :requires_translation
+    value.plural?.should == true
+    value.text[:one].should == 'Some translation for one'
+    value.text[:some].should == 'Some translation for some'
+    value.text[:many].should == nil
+    value.text[:noen].should == nil
+  end
+
+  it "should parse non-plural key" do
+    doc = Nokogiri::XML.parse(
+      <<-EOF
+      <?xml version="1.0"?>
+      <key id="Some key" is_plural="False">
+        <value language="en" status="requires_translation">Some translation</value>
+      </key>
+      EOF
+    )
+    key = Babelyoda::LocalizationKey.parse_xml(doc.root)
+    key.id.should == "Some key"
+    key.plural?.should == false
+    key.values.size.should == 1
+    value = key.values[:en]
+    value.should_not == nil
+    value.text.should == "Some translation"
+  end
+
+  it "should parse plural key" do
+    doc = Nokogiri::XML.parse(
+      <<-EOF
+      <?xml version="1.0"?>
+      <key id="Some %[plural]d key" is_plural="True">
+        <value language="en" status="requires_translation">
+          <plural>
+            <one>Some translation for %d one</one>
+            <some>Some translation for %d some</some>
+            <many></many>
+            <none></none>
+          </plural>
+        </value>
+      </key>
+      EOF
+    )
+    key = Babelyoda::LocalizationKey.parse_xml(doc.root)
+    key.id.should == "Some %[plural]d key"
+    key.plural?.should == true
+    key.values.size.should == 1
+    value = key.values[:en]
+    value.should_not == nil
+    value.text[:one].should == 'Some translation for %d one'
+    value.text[:some].should == 'Some translation for %d some'
+    value.text[:many].should == nil
+    value.text[:none].should == nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346691069900 !ruby/object:Gem::Requirement
+  requirement: &70220783285460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70220783285460
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70220783285040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70220783285040
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70220783284600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70220783284600
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70220783284180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346691069900
+  version_requirements: *70220783284180
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70346691067000 !ruby/object:Gem::Requirement
+  requirement: &70220783283640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70346691067000
+  version_requirements: *70220783283640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346691064320 !ruby/object:Gem::Requirement
+  requirement: &70220783282840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -52,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70346691064320
+  version_requirements: *70220783282840
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70346691060660 !ruby/object:Gem::Requirement
+  requirement: &70220783282100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70346691060660
+  version_requirements: *70220783282100
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70346691057880 !ruby/object:Gem::Requirement
+  requirement: &70220783281360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70346691057880
+  version_requirements: *70220783281360
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70346691048740 !ruby/object:Gem::Requirement
+  requirement: &70220783280620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70346691048740
+  version_requirements: *70220783280620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70346691045860 !ruby/object:Gem::Requirement
+  requirement: &70220783279860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -108,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70346691045860
+  version_requirements: *70220783279860
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70346691044020 !ruby/object:Gem::Requirement
+  requirement: &70220783279120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70346691044020
+  version_requirements: *70220783279120
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70346691024920 !ruby/object:Gem::Requirement
+  requirement: &70220783278400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70346691024920
+  version_requirements: *70220783278400
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -145,6 +175,7 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -160,6 +191,7 @@ files:
 - lib/babelyoda/localization_value.rb
 - lib/babelyoda/logger.rb
 - lib/babelyoda/rake.rb
+- lib/babelyoda/regexp.rb
 - lib/babelyoda/specification.rb
 - lib/babelyoda/specification_loader.rb
 - lib/babelyoda/strings.rb
@@ -168,6 +200,13 @@ files:
 - lib/babelyoda/tanker.rb
 - lib/babelyoda/version.rb
 - lib/babelyoda/xib.rb
+- spec/lib/babelyoda/keyset_spec.rb
+- spec/lib/babelyoda/localization_key_spec.rb
+- spec/lib/babelyoda/localization_value_spec.rb
+- spec/lib/babelyoda/strings_lexer_spec.rb
+- spec/lib/babelyoda/strings_parser_spec.rb
+- spec/lib/babelyoda/strings_spec.rb
+- spec/lib/babelyoda/tanker_spec.rb
 - templates/Babelfile.erb
 homepage: http://github.com/eploko/babelyoda
 licenses: []
@@ -183,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1238750056866448662
+      hash: -2015034540121504841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1238750056866448662
+      hash: -2015034540121504841
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10