babelyoda 2.1.9 → 2.1.10

data/lib/babelyoda/localization_value.rb

@@ -61,7 +61,7 @@ module Babelyoda
     end
     
     def default_options
-      { preserve: false, plain_text_keys: false }
+      { preserve: false, plain_text_keys: true }
     end
     
     def mergeable?(options = {})

data/lib/babelyoda/specification.rb

@@ -19,11 +19,6 @@ module Babelyoda
     
     FILENAME = 'Babelfile'
     
-    def initialize(*args)
-      super
-      @plain_text_keys = true
-    end
-    
     def self.generate_default_babelfile
       template_file_name = File.join(BABELYODA_PATH, 'templates', 'Babelfile.erb')
       template = File.read(template_file_name)
@@ -35,6 +30,7 @@ module Babelyoda
     def self.load
       trace_spec = @spec.nil? && ::Rake.application.options.trace
 	    @spec ||= load_from_file(filename = FILENAME)
+      @spec.plain_text_keys = true if @spec.plain_text_keys.nil?
       @spec.dump if trace_spec && @spec
 	    return @spec
     end

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.1.9"
+  VERSION = "2.1.10"
 end

data/spec/lib/babelyoda/localization_value_spec.rb

@@ -14,6 +14,14 @@ describe "localization value" do
     value1.language.should == :en
     value1.text.should == "Value 2"
   end
+
+  it "should merge values if allowed so in options and the status == :translation_required" do
+    value1 = Babelyoda::LocalizationValue.new(:en, "Value 1")
+    value2 = Babelyoda::LocalizationValue.new(:en, "Value 2")
+    value1.merge!(value2, { preserve: false })
+    value1.language.should == :en
+    value1.text.should == "Value 2"
+  end
   
   it "should preserve values if specified so in options and the status != :translation_required" do
     value1 = Babelyoda::LocalizationValue.new(:en, "Value 1")

data/spec/lib/babelyoda/specification_spec.rb

@@ -1,8 +1,8 @@
 require 'babelyoda/specification'
 
-describe "specification" do
-  it "should specify plain text keys by default" do
-    spec = Babelyoda::Specification.new
-    spec.plain_text_keys.should == true
-  end
-end
+# describe "specification" do
+#   it "should specify plain text keys by default" do
+#     spec = Babelyoda::Specification.new
+#     spec.plain_text_keys.should == true
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243930814540 !ruby/object:Gem::Requirement
+  requirement: &70122967413760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243930814540
+  version_requirements: *70122967413760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70243930814120 !ruby/object:Gem::Requirement
+  requirement: &70122967413340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243930814120
+  version_requirements: *70122967413340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70243930813700 !ruby/object:Gem::Requirement
+  requirement: &70122967412760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243930813700
+  version_requirements: *70122967412760
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70243930813280 !ruby/object:Gem::Requirement
+  requirement: &70122967412340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243930813280
+  version_requirements: *70122967412340
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70243930812760 !ruby/object:Gem::Requirement
+  requirement: &70122967411760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70243930812760
+  version_requirements: *70122967411760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70243930811980 !ruby/object:Gem::Requirement
+  requirement: &70122967410940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70243930811980
+  version_requirements: *70122967410940
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70243930811240 !ruby/object:Gem::Requirement
+  requirement: &70122967410100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243930811240
+  version_requirements: *70122967410100
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70243930810500 !ruby/object:Gem::Requirement
+  requirement: &70122967409260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70243930810500
+  version_requirements: *70122967409260
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70243930809760 !ruby/object:Gem::Requirement
+  requirement: &70122967408520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243930809760
+  version_requirements: *70122967408520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70243930809020 !ruby/object:Gem::Requirement
+  requirement: &70122967407680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243930809020
+  version_requirements: *70122967407680
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70243930808240 !ruby/object:Gem::Requirement
+  requirement: &70122967406940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -152,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70243930808240
+  version_requirements: *70122967406940
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70243930807520 !ruby/object:Gem::Requirement
+  requirement: &70122967406060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -163,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70243930807520
+  version_requirements: *70122967406060
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 428589512485018676
+      hash: -2741879986356815734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 428589512485018676
+      hash: -2741879986356815734
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10