translation 0.8.1 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fbd1c4748d503e002b873b162bfd48a1aa12a28
-  data.tar.gz: ef72d0d68caafc7178c3b62f542d951182a66e72
+  metadata.gz: 96b136aa820f7455c6c3af78bf5098fd73393a8e
+  data.tar.gz: 1eb107b37045580973bed903b04a8744fed5911b
 SHA512:
-  metadata.gz: 0c5d25c298206303bf8fdd694ff7e224d249fde50527b012b28461600eeb4bd8366b3c429c3119dc2ea6769e1d40181f7339e1c9aa6f30ce6ccf3cb0f940a247
-  data.tar.gz: 4356d86b960d5f5a62a7e28eae8a52837bc5088113daf16cff7f454e88f0168feada78b0d6fa7fea634623ff1fe6b23210955b6d14932f4fe6933ec30a3ea446
+  metadata.gz: 39064ef60e74ac879135ca2742f6193aa9531bc30f84393481934b301eace673089c9358242daf9fe211e886363683eeafad88267957c899aa7230b8a80450c4
+  data.tar.gz: 47dd370a7fce5fa558f005d7fa9bda3b7e9f60d7b716ee9ac7a4f959cfad4deba5ab1dcd29b7abfd0bb59f97ef75b44de3bfe14dd669946f9b4b528fe567262a

data/lib/translation.rb

@@ -23,6 +23,7 @@ require 'translation_io/yaml_conversion'
 
 require 'translation_io/controller'
 require 'translation_io/extractor'
+require 'translation_io/yaml_entry'
 
 module TranslationIO
   module Proxy
@@ -33,6 +34,9 @@ module TranslationIO
     attr_reader :config, :client
 
     def configure(&block)
+      ENV['LANG']     = 'en_US.UTF-8' if ENV['LANG'].blank?
+      ENV['LC_CTYPE'] = 'UTF-8'       if ENV['LC_CTYPE'].blank?
+
       if Rails.env.development?
         GetText::TextDomainManager.cached = false
       end

data/lib/translation_io/client/base_operation.rb

@@ -10,19 +10,21 @@ module TranslationIO
     class BaseOperation
       attr_accessor :client, :params
 
-      def initialize(client, perform_real_requests = true)
+      def initialize(client)
         @client = client
-        @params = {
-          'gem_version'        => TranslationIO.version,
-          'source_language'    => TranslationIO.config.source_locale.to_s,
-          'target_languages[]' => TranslationIO.config.target_locales.map(&:to_s)
-        }
+        @params = {}
       end
 
       private
 
-      def perform_request(uri, params)
+      def self.perform_request(uri, params)
         begin
+          params.merge!({
+            'gem_version'        => TranslationIO.version,
+            'source_language'    => TranslationIO.config.source_locale.to_s,
+            'target_languages[]' => TranslationIO.config.target_locales.map(&:to_s)
+          })
+
           http = Net::HTTP.new(uri.host, uri.port)
           http.read_timeout = 500
 

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

@@ -21,11 +21,11 @@ module TranslationIO
           end
 
           all_flat_special_translations = all_flat_translations.select do |key, value|
-            !value.is_a?(String) && !value.nil?
+            YamlEntry.localization?(key, value)
           end
 
           source_flat_special_translations = all_flat_special_translations.select do |key|
-            key.start_with?("#{@source_locale}.")
+            YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key)
           end
 
           @target_locales.each do |target_locale|
@@ -45,6 +45,29 @@ module TranslationIO
               file.write(yaml_data)
             end
           end
+
+          if not TranslationIO.config.test
+            # Get YAML localization entries
+            params = {}
+            @target_locales.each do |target_locale|
+              yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
+              params["yaml_data_#{target_locale}"] = File.read(yaml_path)
+            end
+
+            TranslationIO.info "Collecting YAML localization entries"
+            uri             = URI("http://#{TranslationIO.client.endpoint}/projects/#{TranslationIO.client.api_key}/fill_yaml_localizations")
+            parsed_response = BaseOperation.perform_request(uri, params)
+
+            unless parsed_response.nil?
+              @target_locales.each do |target_locale|
+                yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
+
+                File.open(yaml_path, 'wb') do |file|
+                  file.write(parsed_response["yaml_data_#{target_locale}"])
+                end
+              end
+            end
+          end
         end
 
       end

data/lib/translation_io/client/init_operation.rb

@@ -29,7 +29,7 @@ module TranslationIO
 
         TranslationIO.info "Sending data to server"
         uri             = URI("http://#{client.endpoint}/projects/#{client.api_key}/init")
-        parsed_response = perform_request(uri, params)
+        parsed_response = BaseOperation.perform_request(uri, params)
 
         unless parsed_response.nil?
           BaseOperation::SaveNewPoFilesStep.new(target_locales, locales_path, parsed_response).run

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

@@ -11,18 +11,7 @@ module TranslationIO
 
         def run
           @yaml_file_paths.each do |locale_file_path|
-            in_project = locale_file_path_in_project?(locale_file_path)
-
-            protected_file = @target_locales.any? do |target_locale|
-              paths = [
-                File.join(@yaml_locales_path, "translation.#{target_locale}.yml").to_s,
-                File.join(@yaml_locales_path, "localization.#{target_locale}.yml").to_s
-              ]
-
-              paths.include?(locale_file_path)
-            end
-
-            if in_project && !protected_file
+            if locale_file_removable?(locale_file_path)
               if File.exist?(locale_file_path)
                 content_hash     = YAML::load(File.read(locale_file_path))
                 new_content_hash = content_hash.keep_if { |k| k.to_s == @source_locale.to_s }
@@ -43,6 +32,21 @@ module TranslationIO
 
         private
 
+        def locale_file_removable?(locale_file_path)
+          in_project = locale_file_path_in_project?(locale_file_path)
+
+          protected_file = @target_locales.any? do |target_locale|
+            paths = [
+              TranslationIO.normalize_path(File.join(@yaml_locales_path, "translation.#{target_locale}.yml" ).to_s),
+              TranslationIO.normalize_path(File.join(@yaml_locales_path, "localization.#{target_locale}.yml").to_s)
+            ]
+
+            paths.include?(TranslationIO.normalize_path(locale_file_path))
+          end
+
+          in_project && !protected_file
+        end
+
         def locale_file_path_in_project?(locale_file_path)
           TranslationIO.normalize_path(locale_file_path).start_with?(
             TranslationIO.normalize_path(@yaml_locales_path)

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

@@ -18,11 +18,11 @@ module TranslationIO
           end
 
           all_flat_string_translations = all_flat_translations.select do |key, value|
-            key.present? && value.is_a?(String) && !value.nil?
+            YamlEntry.string?(key, value) && !YamlEntry.localization?(key, value)
           end
 
           source_flat_string_tanslations = all_flat_string_translations.select do |key|
-            key.start_with?("#{@source_locale}.") && !key.start_with?("#{@source_locale}.faker.")
+            YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key)
           end
 
           @target_locales.each do |target_locale|
@@ -33,7 +33,7 @@ module TranslationIO
               msgid      = value
               msgstr     = all_flat_string_translations[target_key]
 
-              unless msgid.blank?
+              unless msgid.to_s.empty?
                 po_entry            = GetText::POEntry.new(:msgctxt)
                 po_entry.msgid      = msgid
                 po_entry.msgstr     = msgstr

data/lib/translation_io/client/sync_operation.rb

@@ -29,7 +29,7 @@ module TranslationIO
         end
 
         uri             = URI("http://#{client.endpoint}/projects/#{client.api_key}/sync")
-        parsed_response = perform_request(uri, params)
+        parsed_response = BaseOperation.perform_request(uri, params)
 
         unless parsed_response.nil?
           BaseOperation::SaveNewPoFilesStep.new(target_locales, locales_path, parsed_response).run

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

@@ -19,7 +19,7 @@ module TranslationIO
           end
 
           source_flat_string_tanslations = all_flat_translations.select do |key, value|
-            value.is_a?(String) && key.start_with?("#{@source_locale}.") && !key.start_with?("#{@source_locale}.faker.")
+            YamlEntry.string?(key, value) && YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key) && !YamlEntry.localization?(key, value)
           end
 
           pot_representation = GetText::PO.new
@@ -27,7 +27,7 @@ module TranslationIO
           source_flat_string_tanslations.each_pair do |key, value|
             msgid = value
 
-            unless msgid.blank?
+            unless msgid.to_s.empty?
               pot_entry            = GetText::POEntry.new(:msgctxt)
               pot_entry.msgid      = msgid
               pot_entry.msgstr     = ''

data/lib/translation_io/config.rb

@@ -4,6 +4,7 @@ module TranslationIO
     attr_accessor :source_locale, :target_locales
     attr_accessor :endpoint
     attr_accessor :verbose
+    attr_accessor :test
 
     def initialize
       self.locales_path   = File.join('config', 'locales', 'gettext')
@@ -11,6 +12,7 @@ module TranslationIO
       self.target_locales = []
       self.endpoint       = 'api.translation.io/api'
       self.verbose        = 1
+      self.test           = false
     end
 
     def pot_path
@@ -19,7 +21,7 @@ module TranslationIO
 
     def yaml_file_paths
       I18n.load_path.select do |p|
-        File.exist?(p)
+        File.exist?(p) && (File.extname(p) == '.yml' || File.extname(p) == '.yaml')
       end
     end
 

data/lib/translation_io/controller.rb

@@ -7,7 +7,7 @@ module TranslationIO
                          request.env['HTTP_ACCEPT_LANGUAGE'] ||
                          I18n.default_locale
 
-      if requested_locale.to_sym.in?(I18n.available_locales)
+      if I18n.available_locales.include?(requested_locale.to_sym)
         session[:locale] = requested_locale
         I18n.locale      = requested_locale
       else

data/lib/translation_io/flat_hash.rb

@@ -2,6 +2,7 @@ module TranslationIO
   module FlatHash
     class << self
       def to_flat_hash(hash)
+        hash = brackets_to_joker(hash)
         get_flat_hash_for_level(hash)
       end
 
@@ -12,7 +13,7 @@ module TranslationIO
           build_hash_with_flat(hash, key, value)
         end
 
-        hash
+        joker_to_brackets(hash)
       end
 
       private
@@ -106,6 +107,30 @@ module TranslationIO
         flat_hash
       end
 
+      def brackets_to_joker(h)
+        gsub_keys!(h, '[', ']', '<@~<', '>@~>')
+      end
+
+      def joker_to_brackets(h)
+        gsub_keys!(h, '<@~<', '>@~>', '[', ']')
+      end
+
+      def gsub_keys!(h, from_1, from_2, to_1, to_2)
+        if h.is_a?(Hash)
+          h.keys.each do |key|
+            if key.to_s.include?(from_1) || key.to_s.include?(from_2)
+              new_key = key.to_s.gsub(from_1, to_1).gsub(from_2, to_2)
+            else
+              new_key = key
+            end
+            h[new_key] = h.delete(key)
+            gsub_keys!(h[new_key], from_1, from_2, to_1, to_2)
+          end
+        elsif h.respond_to?(:each)
+          h.each { |e| gsub_keys!(e, from_1, from_2, to_1, to_2) }
+        end
+        h
+      end
     end
   end
 end

data/lib/translation_io/yaml_entry.rb

@@ -0,0 +1,51 @@
+module YamlEntry
+
+  IGNORED_KEY_PREFIXES = [
+    'faker.'
+  ]
+
+  LOCALIZATION_KEY_PREFIXES = [
+    'date.formats',
+    'date.order',
+    'time.formats',
+    'support.array',
+    'number.format',
+    'number.currency',
+    'number.percentage',
+    'number.precision',
+    'number.human.format',
+    'number.human.storage_units.format',
+    'number.human.decimal_units.format',
+    'number.human.decimal_units.units.unit'
+  ]
+
+  class << self
+    def string?(key, value)
+      key.present? && value.is_a?(String)
+    end
+
+    def from_locale?(key, locale)
+      key.present? && key.start_with?("#{locale}.")
+    end
+
+    def ignored?(key)
+      key.present? && IGNORED_KEY_PREFIXES.any? { |p| key_without_locale(key).start_with?(p) }
+    end
+
+    def localization?(key, value)
+      key.present? && (localization_prefix?(key) || (!YamlEntry.string?(key, value) && !value.nil?))
+    end
+
+    def localization_prefix?(key)
+      LOCALIZATION_KEY_PREFIXES.any? do |prefix|
+        key_without_locale(key).start_with?(prefix)
+      end
+    end
+
+    private
+
+    def key_without_locale(key)
+      key.split('.', 2).last
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: '0.9'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -98,6 +98,7 @@ files:
 - lib/translation_io/railtie.rb
 - lib/translation_io/tasks.rb
 - lib/translation_io/yaml_conversion.rb
+- lib/translation_io/yaml_entry.rb
 homepage: http://rails.translation.io
 licenses:
 - MIT
@@ -123,3 +124,4 @@ signing_key:
 specification_version: 4
 summary: Rails translation made _("simple") with YAML and GetText.
 test_files: []
+has_rdoc: false