babelyoda 2.1.4 → 2.1.5

data/lib/babelyoda/string.rb

@@ -0,0 +1,5 @@
+class String
+  def escape_double_quotes
+    self.gsub(/([^\\])"/, "\\1\\\"")
+  end
+end

data/lib/babelyoda/strings.rb

@@ -2,6 +2,7 @@ require 'rchardet19'
 
 require_relative 'file'
 require_relative 'keyset'
+require_relative 'string'
 require_relative 'strings_lexer'
 require_relative 'strings_parser'
 
@@ -21,11 +22,11 @@ module Babelyoda
       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"
+            io << "\"#{pluralize_key(id, plural_key).escape_double_quotes}\" = \"#{values[language].text[plural_key].escape_double_quotes}\";\n"
           end
         end
       else
-        io << "\"#{id}\" = \"#{values[language].text}\";\n"
+        io << "\"#{id.escape_double_quotes}\" = \"#{values[language].text.escape_double_quotes}\";\n"
       end
       io << "\n"
     end

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/spec/lib/babelyoda/string_spec.rb

@@ -0,0 +1,8 @@
+require 'babelyoda/string'
+
+describe "string" do
+  it "should escape double-quotes" do
+    a = 'some "key"'
+    a.escape_double_quotes.should == "some \\\"key\\\""
+  end
+end

data/spec/lib/babelyoda/strings_spec.rb

@@ -40,6 +40,27 @@ describe "strings-based keyset" do
 /* Some comment */
 "Some key" = "Some translation";
 
+EOF
+    end
+  end
+  
+  context "when keys or values have double-quotes in them" do
+    it "should properly escape them when being serialized" 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280580698720 !ruby/object:Gem::Requirement
+  requirement: &70190327060400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280580698720
+  version_requirements: *70190327060400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70280580698300 !ruby/object:Gem::Requirement
+  requirement: &70190327059900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280580698300
+  version_requirements: *70190327059900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70280580697840 !ruby/object:Gem::Requirement
+  requirement: &70190327059220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280580697840
+  version_requirements: *70190327059220
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70280580697380 !ruby/object:Gem::Requirement
+  requirement: &70190327058200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280580697380
+  version_requirements: *70190327058200
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70280580696700 !ruby/object:Gem::Requirement
+  requirement: &70190327056740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70280580696700
+  version_requirements: *70190327056740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70280580695620 !ruby/object:Gem::Requirement
+  requirement: &70190327054460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70280580695620
+  version_requirements: *70190327054460
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70280580694540 !ruby/object:Gem::Requirement
+  requirement: &70190327053240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280580694540
+  version_requirements: *70190327053240
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70280580693760 !ruby/object:Gem::Requirement
+  requirement: &70190327052080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70280580693760
+  version_requirements: *70190327052080
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70280580693020 !ruby/object:Gem::Requirement
+  requirement: &70190327050760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280580693020
+  version_requirements: *70190327050760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70280580681220 !ruby/object:Gem::Requirement
+  requirement: &70190327049380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280580681220
+  version_requirements: *70190327049380
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70280580680480 !ruby/object:Gem::Requirement
+  requirement: &70190327047760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -152,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70280580680480
+  version_requirements: *70190327047760
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70280580679760 !ruby/object:Gem::Requirement
+  requirement: &70190327042720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -163,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70280580679760
+  version_requirements: *70190327042720
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -194,6 +194,7 @@ files:
 - lib/babelyoda/regexp.rb
 - lib/babelyoda/specification.rb
 - lib/babelyoda/specification_loader.rb
+- lib/babelyoda/string.rb
 - lib/babelyoda/strings.rb
 - lib/babelyoda/strings_lexer.rb
 - lib/babelyoda/strings_parser.rb
@@ -203,6 +204,7 @@ files:
 - spec/lib/babelyoda/keyset_spec.rb
 - spec/lib/babelyoda/localization_key_spec.rb
 - spec/lib/babelyoda/localization_value_spec.rb
+- spec/lib/babelyoda/string_spec.rb
 - spec/lib/babelyoda/strings_lexer_spec.rb
 - spec/lib/babelyoda/strings_parser_spec.rb
 - spec/lib/babelyoda/strings_spec.rb