translation 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fdbfc3366fc33e98b990f1ef6769f483e54b36a
-  data.tar.gz: bfef13d4a532bb6b17a2a390c7dd3803e8a9068e
+  metadata.gz: e6055d7b901a7e9feef192da60bb4313b73fcff3
+  data.tar.gz: 75fc068a3a457b753c0712dd062cb4930533a93d
 SHA512:
-  metadata.gz: 9e3cdc31a4db0fa2966d33c23dd8be0115a788fd2962b450acdc7f95596178b67cba27a5420342465b8c6c6ef059e06f6711598f67fd1e2cf67f00014e686f19
-  data.tar.gz: f004b789f120a27803f3d37e04a849cdba04d6e261b2e3de4cf63d535f6ce13cc2a9355bdbe9662d7d2af31480643a528b8e42e20bc5bd286b16bf3b6ab354b1
+  metadata.gz: 5f8e4d890eadb175c48ae56065fa2546bb2bd3d0a089a5d50ffba13091d7745cb3bdbe83295e6abe0f715764e6e462be48ee4b14f4827bf02e3daa705d1f55ce
+  data.tar.gz: 6ed57c9f6a19e138aaba17ba9c117b1ebd2ea370dfb5d5e3c87efe5b563d7333882f800889d1a2c1c64829486b3ee3a8838f987b2b18cb9052ed7bd7a868d555

data/lib/translation_io/client/base_operation/save_special_yaml_files_step.rb

@@ -21,7 +21,7 @@ module TranslationIO
           end
 
           all_flat_special_translations = all_flat_translations.select do |key, value|
-            TranslationIO::YamlEntry.localization?(key, value)
+            YamlEntry.localization?(key, value)
           end
 
           @target_locales.each do |target_locale|
@@ -30,7 +30,7 @@ module TranslationIO
             TranslationIO.info yaml_path, 2, 2
 
             target_flat_special_translations = all_flat_special_translations.select do |key|
-              TranslationIO::YamlEntry.from_locale?(key, target_locale) && !TranslationIO::YamlEntry.ignored?(key)
+              YamlEntry.from_locale?(key, target_locale) && !YamlEntry.ignored?(key)
             end
 
             yaml_data = YAMLConversion.get_yaml_data_from_flat_translations(target_flat_special_translations)

data/lib/translation_io/client/init_operation.rb

@@ -11,10 +11,6 @@ module TranslationIO
 
         haml_source_files = config.haml_source_files
         slim_source_files = config.slim_source_files
-
-        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
-
         source_files      = config.source_files
         pot_path          = config.pot_path
         source_locale     = config.source_locale
@@ -23,6 +19,9 @@ module TranslationIO
         yaml_locales_path = config.yaml_locales_path
         yaml_file_paths   = config.yaml_file_paths
 
+        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
+        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+
         UpdatePotFileStep.new(pot_path, source_files).run(params)
         UpdateAndCollectPoFilesStep.new(target_locales, pot_path, locales_path).run(params)
         CreateYamlPoFilesStep.new(source_locale, target_locales, yaml_file_paths).run(params)

data/lib/translation_io/client/init_operation/cleanup_yaml_files_step.rb

@@ -13,7 +13,7 @@ module TranslationIO
           @yaml_file_paths.each do |locale_file_path|
             if locale_file_removable?(locale_file_path)
               if File.exist?(locale_file_path)
-                content_hash     = YAML::load(File.read(locale_file_path))
+                content_hash = YAML::load(File.read(locale_file_path))
 
                 if content_hash
                   new_content_hash = content_hash.keep_if { |k| k.to_s == @source_locale.to_s }

data/lib/translation_io/client/init_operation/create_yaml_po_files_step.rb

@@ -25,11 +25,11 @@ module TranslationIO
           all_flat_translations = FlatHash.to_flat_hash(all_translations)
 
           all_flat_string_translations = all_flat_translations.select do |key, value|
-            TranslationIO::YamlEntry.string?(key, value) && !TranslationIO::YamlEntry.localization?(key, value)
+            YamlEntry.string?(key, value) && !YamlEntry.localization?(key, value)
           end
 
           source_flat_string_tanslations = all_flat_string_translations.select do |key|
-            TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key)
+            YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key)
           end
 
           @target_locales.each do |target_locale|

data/lib/translation_io/client/sync_operation.rb

@@ -1,5 +1,6 @@
 require 'translation_io/client/sync_operation/update_and_collect_pot_file_step'
 require 'translation_io/client/sync_operation/create_yaml_pot_file_step'
+require 'translation_io/client/sync_operation/apply_yaml_source_edits_step'
 
 module TranslationIO
   class Client
@@ -9,10 +10,6 @@ module TranslationIO
 
         haml_source_files = config.haml_source_files
         slim_source_files = config.slim_source_files
-
-        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
-
         source_files      = config.source_files
         pot_path          = config.pot_path
         source_locale     = config.source_locale
@@ -21,6 +18,11 @@ module TranslationIO
         yaml_locales_path = config.yaml_locales_path
         yaml_file_paths   = config.yaml_file_paths
 
+        ApplyYamlSourceEditsStep.new(yaml_file_paths, source_locale).run(params)
+
+        BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
+        BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+
         UpdateAndCollectPotFileStep.new(pot_path, source_files).run(params)
         CreateYamlPotFileStep.new(source_locale, yaml_file_paths).run(params)
 

data/lib/translation_io/client/sync_operation/apply_yaml_source_edits_step.rb

@@ -0,0 +1,96 @@
+module TranslationIO
+  class Client
+    class SyncOperation < BaseOperation
+      class ApplyYamlSourceEditsStep
+        def initialize(yaml_file_paths, source_locale)
+          @yaml_file_paths = yaml_file_paths
+          @source_locale   = source_locale
+        end
+
+        def run(params)
+          TranslationIO.info "Downloading YAML source editions."
+
+          timestamp = YAML::load(File.read(TranslationIO.config.metadata_path))['timestamp'] rescue 0
+
+          params.merge!({ :timestamp => timestamp })
+          parsed_response = perform_source_edits_request(params)
+
+          unless parsed_response.nil?
+            TranslationIO.info "Applying YAML source editions."
+
+            parsed_response['source_edits'].each do |source_edit|
+              inserted = false
+
+              sort_by_project_locales_first(@yaml_file_paths).each do |file_path|
+                yaml_hash      = YAML::load(File.read(file_path))
+                flat_yaml_hash = FlatHash.to_flat_hash(yaml_hash)
+
+                flat_yaml_hash.each do |key, value|
+                  if key == "#{@source_locale}.#{source_edit['key']}" && value == source_edit['old_text']
+                    TranslationIO.info "#{source_edit['key']} | #{source_edit['old_text']} -> #{source_edit['new_text']}", 2, 2
+
+                    if locale_file_path_in_project?(file_path)
+                      flat_yaml_hash[key] = source_edit['new_text']
+
+                      File.open(file_path, 'w') do |f|
+                        f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
+                      end
+                    else
+                      yaml_path = File.join(TranslationIO.config.yaml_locales_path, "#{@source_locale}.yml")
+
+                      if File.exists?(yaml_path) # en.yml
+                        yaml_hash      = YAML::load(File.read(yaml_path))
+                        flat_yaml_hash = FlatHash.to_flat_hash(yaml_hash)
+                      else
+                        FileUtils::mkdir_p File.dirname(yaml_path)
+                        flat_yaml_hash = {}
+                      end
+
+                      flat_yaml_hash["#{@source_locale}.#{source_edit['key']}"] = source_edit['new_text']
+
+                      File.open(yaml_path, 'w') do |f|
+                        f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
+                      end
+                    end
+
+                    inserted = true
+                    break
+                  end
+                end
+
+                break if inserted
+              end
+            end
+          end
+
+          File.open(TranslationIO.config.metadata_path, 'w') do |f|
+            f.write({ 'timestamp' => Time.now.getutc.to_i }.to_yaml)
+          end
+        end
+
+        private
+
+        def perform_source_edits_request(params)
+          uri             = URI("#{TranslationIO.client.endpoint}/projects/#{TranslationIO.client.api_key}/source_edits")
+          parsed_response = BaseOperation.perform_request(uri, params)
+        end
+
+        # Sort YAML file paths by project locales first, gem locales after
+        # (to replace "overridden" source first)
+        def sort_by_project_locales_first(yaml_file_paths)
+          yaml_file_paths.sort do |x, y|
+            a = locale_file_path_in_project?(x)
+            b = locale_file_path_in_project?(y)
+            (!a && b) ? 1 : ((a && !b) ? -1 : 0)
+          end
+        end
+
+        def locale_file_path_in_project?(locale_file_path)
+          TranslationIO.normalize_path(locale_file_path).start_with?(
+            TranslationIO.normalize_path(TranslationIO.config.yaml_locales_path)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb

@@ -24,7 +24,7 @@ module TranslationIO
           all_flat_translations = FlatHash.to_flat_hash(all_translations)
 
           source_flat_string_tanslations = all_flat_translations.select do |key, value|
-            TranslationIO::YamlEntry.string?(key, value) && TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key) && !TranslationIO::YamlEntry.localization?(key, value)
+            YamlEntry.string?(key, value) && YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key) && !YamlEntry.localization?(key, value)
           end
 
           pot_representation = GetText::PO.new

data/lib/translation_io/config.rb

@@ -1,6 +1,6 @@
 module TranslationIO
   class Config
-    attr_accessor :api_key, :locales_path
+    attr_accessor :api_key, :locales_path, :yaml_locales_path
     attr_accessor :source_locale, :target_locales
     attr_accessor :endpoint
     attr_accessor :verbose
@@ -8,6 +8,7 @@ module TranslationIO
     attr_accessor :ignored_key_prefixes
     attr_accessor :localization_key_prefixes
     attr_accessor :charset
+    attr_accessor :metadata_path
 
     attr_accessor :pot_msgid_bugs_address
     attr_accessor :pot_package_name
@@ -17,6 +18,7 @@ module TranslationIO
 
     def initialize
       self.locales_path              = File.join('config', 'locales', 'gettext')
+      self.yaml_locales_path         = File.join('config', 'locales')
       self.source_locale             = :en
       self.target_locales            = []
       self.endpoint                  = 'https://translation.io/api'
@@ -25,6 +27,7 @@ module TranslationIO
       self.ignored_key_prefixes      = []
       self.localization_key_prefixes = []
       self.charset                   = 'UTF-8'
+      self.metadata_path             = File.join('config', 'locales', '.translation_io')
 
       self.pot_msgid_bugs_address = 'contact@translation.io'
       self.pot_package_name       = File.basename(Dir.pwd)
@@ -53,10 +56,6 @@ module TranslationIO
       paths
     end
 
-    def yaml_locales_path
-      'config/locales'
-    end
-
     def haml_source_files
       Dir['**/*.{haml}'].select do |p|
         !p.start_with?('vendor/') && !p.start_with?('tmp/')

data/lib/translation_io/yaml_entry.rb

@@ -35,7 +35,7 @@ module TranslationIO
       end
 
       def localization?(key, value)
-        key.present? && (localization_prefix?(key) || (!TranslationIO::YamlEntry.string?(key, value) && !value.nil?))
+        key.present? && (localization_prefix?(key) || (!string?(key, value) && !value.nil?))
       end
 
       def localization_prefix?(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -103,6 +103,7 @@ files:
 - lib/translation_io/client/init_operation/update_and_collect_po_files_step.rb
 - lib/translation_io/client/init_operation/update_pot_file_step.rb
 - lib/translation_io/client/sync_operation.rb
+- lib/translation_io/client/sync_operation/apply_yaml_source_edits_step.rb
 - lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb
 - lib/translation_io/client/sync_operation/update_and_collect_pot_file_step.rb
 - lib/translation_io/config.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails translation made _("simple") with YAML and GetText.