babelyoda 2.1.5 → 2.1.6

data/lib/babelyoda/localization_value.rb

@@ -29,7 +29,7 @@ module Babelyoda
     
     def merge!(other_value, options = {})
       updated = false
-      options = { preserve: false }.merge!(options)
+      options = resolve_options options
 
       unless @language.to_sym == other_value.language.to_sym
         raise "Can't merge values in different languages: #{@language.to_sym} and #{other_value.language.to_sym}"
@@ -43,7 +43,7 @@ module Babelyoda
           updated ||= key_updated
         end
       else
-        if (!options[:preserve] || @status.to_sym == :requires_translation)
+        if mergeable?(options)
           if @text != other_value.text && !other_value.nil?
             @text = other_value.text 
             updated = true
@@ -56,8 +56,21 @@ module Babelyoda
   private
     include Babelyoda::Regexp
     
+    def resolve_options(options = {})
+      default_options.merge!(options)
+    end
+    
+    def default_options
+      { preserve: false, plain_text_keys: false }
+    end
+    
+    def mergeable?(options = {})
+      options = resolve_options options
+      !options[:preserve] || (@status.to_sym == :requires_translation && options[:plain_text_keys])
+    end
+    
     def merge_plural_type!(type, other_value, options)
-      if (!options[:preserve] || @status.to_sym == :requires_translation)
+      if mergeable?
         if @text[type] != other_value && !other_value.nil?
           @text[type] = other_value 
           return true

data/lib/babelyoda/specification.rb

@@ -9,6 +9,7 @@ module Babelyoda
     attr_accessor :name
     attr_accessor :development_language
     attr_accessor :localization_languages
+    attr_accessor :plain_text_keys
     attr_accessor :engine
     attr_accessor :source_files    
     attr_accessor :resources_folder
@@ -18,6 +19,11 @@ 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)

data/lib/babelyoda/version.rb

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

data/lib/babelyoda.rb

@@ -177,7 +177,7 @@ namespace :babelyoda do
         end
         
         remote_keyset = spec.engine.load_keyset(local_keyset.name, nil, :unapproved)
-        result = remote_keyset.merge!(local_keyset, preserve: true)
+        result = remote_keyset.merge!(local_keyset, preserve: true, plain_text_keys: spec.plain_text_keys)
         remote_keyset.ensure_languages!(spec.all_languages)
         if result[:new] > 0 || result[:updated] > 0
           langs.each do |lang|

data/spec/lib/babelyoda/localization_value_spec.rb

@@ -14,4 +14,21 @@ describe "localization value" do
     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")
+    value1.status = :translated
+    value2 = Babelyoda::LocalizationValue.new(:en, "Value 2")
+    value1.merge!(value2, { preserve: true })
+    value1.language.should == :en
+    value1.text.should == "Value 1"
+  end
+
+  it "should preserve values in status :requires_translation if the project uses non plain text keys" do
+    value1 = Babelyoda::LocalizationValue.new(:en, "Value 1")
+    value2 = Babelyoda::LocalizationValue.new(:en, "Value 2")
+    value1.merge!(value2, { preserve: true, plain_text_keys: false })
+    value1.language.should == :en
+    value1.text.should == "Value 1"
+  end
 end

data/spec/lib/babelyoda/specification_spec.rb

@@ -0,0 +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

data/templates/Babelfile.erb

@@ -2,11 +2,23 @@ Babelyoda::Specification.new do |s|
 	s.name = 'YOUR PROJECT NAME HERE'
 	s.development_language = :en
 	s.localization_languages = [:ru, :uk, :tr]
+	
+	# Specifies whether human-readable plain text values (usu. in the
+	# development language) are used as localization keys.
+	#
+	# Set to false if you use something like 'views.panel.msg1' as keys in your
+	# project.
+	#
+	# Default is true.
+	#
+	# s.plain_text_keys = true
+	
 	s.engine = Babelyoda::Tanker.new do |t|
 		t.token = 'FIX: TANKER TOKEN HERE'
 		t.project_id = 'FIX: TANKER PROJECT ID HERE'
 		t.endpoint = 'FIX: TANKER END POINT HERE'
 	end
+	
 	s.scm = Babelyoda::Git.new
 	s.source_files = FileList['Classes/**/*.{m,mm,h}']
 	s.resources_folder = 'Resources'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-05-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70190327060400 !ruby/object:Gem::Requirement
+  requirement: &70259722448540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190327060400
+  version_requirements: *70259722448540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70190327059900 !ruby/object:Gem::Requirement
+  requirement: &70259722448120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190327059900
+  version_requirements: *70259722448120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70190327059220 !ruby/object:Gem::Requirement
+  requirement: &70259722447700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190327059220
+  version_requirements: *70259722447700
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70190327058200 !ruby/object:Gem::Requirement
+  requirement: &70259722447280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190327058200
+  version_requirements: *70259722447280
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70190327056740 !ruby/object:Gem::Requirement
+  requirement: &70259722446760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70190327056740
+  version_requirements: *70259722446760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70190327054460 !ruby/object:Gem::Requirement
+  requirement: &70259722445980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70190327054460
+  version_requirements: *70259722445980
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70190327053240 !ruby/object:Gem::Requirement
+  requirement: &70259722445240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70190327053240
+  version_requirements: *70259722445240
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70190327052080 !ruby/object:Gem::Requirement
+  requirement: &70259722444500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70190327052080
+  version_requirements: *70259722444500
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70190327050760 !ruby/object:Gem::Requirement
+  requirement: &70259722443760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70190327050760
+  version_requirements: *70259722443760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70190327049380 !ruby/object:Gem::Requirement
+  requirement: &70259722443020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70190327049380
+  version_requirements: *70259722443020
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70190327047760 !ruby/object:Gem::Requirement
+  requirement: &70259722442260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -152,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70190327047760
+  version_requirements: *70259722442260
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70190327042720 !ruby/object:Gem::Requirement
+  requirement: &70259722441540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -163,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70190327042720
+  version_requirements: *70259722441540
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -204,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/specification_spec.rb
 - spec/lib/babelyoda/string_spec.rb
 - spec/lib/babelyoda/strings_lexer_spec.rb
 - spec/lib/babelyoda/strings_parser_spec.rb
@@ -222,12 +223,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2287830520322804558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2287830520322804558
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10