translation 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0e41e1529ebddeded105bf60eec7bfdc756be2e
-  data.tar.gz: c4ea9728e442d17c5616acce199d6a006ebd017c
+  metadata.gz: d359ae6010036c8991106bd2c997ce9e134e274c
+  data.tar.gz: 9791346e543d7dbfa94b0274f13a106062530d1f
 SHA512:
-  metadata.gz: bc84c365831883325b8b20ea4e92c8e4d06ed2a035fcb30e36515e4ca29d2342cb7e0287ec02222b932c86fda1d0137e52b08a479284cc314312c011771a0445
-  data.tar.gz: 5cd68eb75c7c73023cd5592f99cb3ec87e1787134a10d0e14087ba43a9442e3784bb92f0c5f9aae18d0c0a1543f58ae04689fd1992170e1c877e3bda1430bedc
+  metadata.gz: 656c738ea8e941704f986971cc9a739d40973626f10d72015c75adb020201b564e7475f14b16f4fc8f54b180452c7f875c98d9976a9f22ca0baae31d5328c756
+  data.tar.gz: 6877fd10b443c673f885d53bb844ef0a40632bedc87924ec2c75be219455f0fe2aed9dcfdeedf4a38a7ac38670e0daff65e6a03d565501b785daef50b9a3315a

data/README.md

@@ -1,6 +1,4 @@
-# Ruby/Rails gem for [Translation.io](http://translation.io).
-
-![Build Status](https://www.codeship.io/projects/f7cd4ac0-b73c-0131-51ea-522dcd2196ed/status)
+# Gem for [Translation.io](http://translation.io). ![Build Status](https://www.codeship.io/projects/f7cd4ac0-b73c-0131-51ea-522dcd2196ed/status) [![Code Climate](https://codeclimate.com/github/aurels/translation-gem/badges/gpa.svg)](https://codeclimate.com/github/aurels/translation-gem) [![Test Coverage](https://codeclimate.com/github/aurels/translation-gem/badges/coverage.svg)](https://codeclimate.com/github/aurels/translation-gem/coverage)
 
 ## Description
 

data/lib/translation.rb

@@ -1,11 +1,5 @@
 require 'net/http'
 
-require 'gettext'
-require 'gettext/po'
-require 'gettext/po_parser'
-require 'gettext/tools'
-require 'gettext/text_domain_manager'
-
 module TranslationIO
   GETTEXT_METHODS = [
     :nsgettext, :pgettext, :npgettext, :sgettext, :ngettext, :gettext,
@@ -27,7 +21,6 @@ require 'translation_io/yaml_entry'
 
 module TranslationIO
   module Proxy
-    include GetText
   end
 
   class << self
@@ -37,21 +30,32 @@ module TranslationIO
       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
-
       @config ||= Config.new
 
       yield @config
 
-      Proxy.bindtextdomain(TEXT_DOMAIN, {
-        :path           => @config.locales_path,
-        :output_charset => @config.charset
-      })
+      unless @config.disable_gettext
+        require 'gettext'
+        require 'gettext/po'
+        require 'gettext/po_parser'
+        require 'gettext/tools'
+        require 'gettext/text_domain_manager'
+        require 'gettext/tools/xgettext'
+
+        if Rails.env.development?
+          GetText::TextDomainManager.cached = false
+        end
 
-      Proxy.textdomain(TEXT_DOMAIN)
-      Object.delegate *GETTEXT_METHODS, :to => Proxy
+        Proxy.include GetText
+
+        Proxy.bindtextdomain(TEXT_DOMAIN, {
+          :path           => @config.locales_path,
+          :output_charset => @config.charset
+        })
+
+        Proxy.textdomain(TEXT_DOMAIN)
+        Object.delegate *GETTEXT_METHODS, :to => Proxy
+      end
 
       @client = Client.new(@config.api_key, @config.endpoint)
 

data/lib/translation_io/client/base_operation/{dump_haml_gettext_keys_step.rb → dump_markup_gettext_keys_step.rb}

@@ -1,19 +1,20 @@
 module TranslationIO
   class Client
     class BaseOperation
-      class DumpHamlGettextKeysStep
-        def initialize(haml_source_files)
-          @haml_source_files = haml_source_files
+      class DumpMarkupGettextKeysStep
+        def initialize(markup_source_files, markup_type)
+          @markup_source_files = markup_source_files
+          @markup_type         = markup_type
         end
 
         def run
-          if @haml_source_files.any?
-            TranslationIO.info "Extracting Gettext entries from HAML files."
+          if @markup_source_files.any?
+            TranslationIO.info "Extracting Gettext entries from #{@markup_type.to_s.upcase} files."
 
             FileUtils.mkdir_p(File.join('tmp', 'translation'))
 
             extracted_gettext_entries.each_with_index do |entry, index|
-              file_path = File.join('tmp', 'translation', "haml-gettext-#{index.to_s.rjust(8,'0')}.rb")
+              file_path = File.join('tmp', 'translation', "#{@markup_type}-gettext-#{index.to_s.rjust(8,'0')}.rb")
 
               File.open(file_path, 'w') do |file|
                 file.puts "def fake"
@@ -29,11 +30,11 @@ module TranslationIO
         def extracted_gettext_entries
           entries = []
 
-          @haml_source_files.each do |haml_file_path|
-            TranslationIO.info haml_file_path, 2, 2
+          @markup_source_files.each do |markup_file_path|
+            TranslationIO.info markup_file_path, 2, 2
 
-            haml_data = File.read(haml_file_path)
-            entries  += TranslationIO::Extractor.extract(haml_data)
+            markup_data = File.read(markup_file_path)
+            entries    += TranslationIO::Extractor.extract(markup_data)
           end
 
           TranslationIO.info "#{entries.size} entries found", 2, 2

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

@@ -13,7 +13,7 @@ module TranslationIO
 
           @target_locales.each do |target_locale|
             if @parsed_response.has_key?("po_data_#{target_locale}")
-              po_path = File.join(@locales_path, target_locale.to_s.gsub('-', '_'), "#{TEXT_DOMAIN}.po")
+              po_path = File.join(@locales_path, Locale::Tag.parse(target_locale).to_s, "#{TEXT_DOMAIN}.po")
               FileUtils.mkdir_p(File.dirname(po_path))
               TranslationIO.info po_path, 2, 2
 

data/lib/translation_io/client/base_operation.rb

@@ -3,8 +3,7 @@ require 'translation_io/client/base_operation/save_new_po_files_step'
 require 'translation_io/client/base_operation/create_new_mo_files_step'
 require 'translation_io/client/base_operation/save_new_yaml_files_step'
 require 'translation_io/client/base_operation/save_special_yaml_files_step'
-require 'translation_io/client/base_operation/dump_haml_gettext_keys_step'
-require 'translation_io/client/base_operation/dump_slim_gettext_keys_step'
+require 'translation_io/client/base_operation/dump_markup_gettext_keys_step'
 
 module TranslationIO
   class Client

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

@@ -12,7 +12,7 @@ module TranslationIO
           TranslationIO.info "Updating PO files."
 
           @target_locales.each do |target_locale|
-            po_path = "#{@locales_path}/#{target_locale.gsub('-', '_')}/#{TEXT_DOMAIN}.po"
+            po_path = "#{@locales_path}/#{Locale::Tag.parse(target_locale).to_s}/#{TEXT_DOMAIN}.po"
             TranslationIO.info po_path, 2, 2
 
             if File.exist?(po_path)

data/lib/translation_io/client/init_operation.rb

@@ -19,8 +19,8 @@ module TranslationIO
         yaml_file_paths   = config.yaml_file_paths
 
         unless config.disable_gettext
-          BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-          BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+          BaseOperation::DumpMarkupGettextKeysStep.new(haml_source_files, :haml).run
+          BaseOperation::DumpMarkupGettextKeysStep.new(slim_source_files, :slim).run
         end
 
         UpdatePotFileStep.new(pot_path, source_files).run(params)
@@ -29,9 +29,30 @@ module TranslationIO
         create_yaml_pot_files_step = CreateYamlPoFilesStep.new(source_locale, target_locales, yaml_file_paths)
         create_yaml_pot_files_step.run(params)
 
-        all_used_yaml_locales    = create_yaml_pot_files_step.all_used_yaml_locales.to_a.map(&:to_s).sort
+        all_used_yaml_locales = create_yaml_pot_files_step.all_used_yaml_locales.to_a.map(&:to_s).sort
+
+        warn_source_locale_unfound(source_locale, all_used_yaml_locales)
+        warn_target_locale_unfound(target_locales, all_used_yaml_locales)
+
+        TranslationIO.info "Sending data to server"
+        uri             = URI("#{client.endpoint}/projects/#{client.api_key}/init")
+        parsed_response = BaseOperation.perform_request(uri, params)
+
+        unless parsed_response.nil?
+          BaseOperation::SaveNewPoFilesStep.new(target_locales, locales_path, parsed_response).run
+          BaseOperation::SaveNewYamlFilesStep.new(target_locales, yaml_locales_path, parsed_response).run
+          BaseOperation::SaveSpecialYamlFilesStep.new(source_locale, target_locales, yaml_locales_path, yaml_file_paths).run
+          CleanupYamlFilesStep.new(source_locale, target_locales, yaml_file_paths, yaml_locales_path).run
+          BaseOperation::CreateNewMoFilesStep.new(locales_path).run
+
+          info_yaml_directory_structure
+        end
+
+        cleanup
+      end
+
+      def warn_source_locale_unfound(source_locale, all_used_yaml_locales)
         is_source_locale_unfound = !source_locale.in?(all_used_yaml_locales)
-        unfound_target_locales   = target_locales - all_used_yaml_locales
 
         if is_source_locale_unfound
           puts
@@ -48,12 +69,16 @@ module TranslationIO
             exit(0)
           end
         end
+      end
 
-        if unfound_target_locales.any?
+      def warn_target_locale_unfound(target_locales, all_used_yaml_locales)
+        target_locales_unfound = target_locales - all_used_yaml_locales
+
+        if target_locales_unfound.any?
           puts
           puts "----------"
           puts "Your `config.target_locales` are [#{target_locales.sort.join(', ')}]."
-          puts "But we haven't found any YAML key for [#{unfound_target_locales.join(', ')}], is this normal?"
+          puts "But we haven't found any YAML key for [#{target_locales_unfound.join(', ')}], is this normal?"
           puts "If not, check that you haven't misspelled the locale (ex. 'en-GB' instead of 'en')."
           puts "----------"
           puts "Do you want to continue? (y/N)"
@@ -65,26 +90,14 @@ module TranslationIO
             exit(0)
           end
         end
+      end
 
-        TranslationIO.info "Sending data to server"
-        uri             = URI("#{client.endpoint}/projects/#{client.api_key}/init")
-        parsed_response = BaseOperation.perform_request(uri, params)
-
-        unless parsed_response.nil?
-          BaseOperation::SaveNewPoFilesStep.new(target_locales, locales_path, parsed_response).run
-          BaseOperation::SaveNewYamlFilesStep.new(target_locales, yaml_locales_path, parsed_response).run
-          BaseOperation::SaveSpecialYamlFilesStep.new(source_locale, target_locales, yaml_locales_path, yaml_file_paths).run
-          CleanupYamlFilesStep.new(source_locale, target_locales, yaml_file_paths, yaml_locales_path).run
-          BaseOperation::CreateNewMoFilesStep.new(locales_path).run
-
-          puts
-          puts "----------"
-          puts "If you're wondering why your YAML directory structure has changed so much,"
-          puts "please check this article: https://translation.io/blog/dealing-with-yaml-files-and-their-directory-structure"
-          puts "----------"
-        end
-
-        cleanup
+      def info_yaml_directory_structure
+        puts
+        puts "----------"
+        puts "If you're wondering why your YAML directory structure has changed so much,"
+        puts "please check this article: https://translation.io/blog/dealing-with-yaml-files-and-their-directory-structure"
+        puts "----------"
       end
     end
   end

data/lib/translation_io/client/sync_operation.rb

@@ -20,8 +20,8 @@ module TranslationIO
         ApplyYamlSourceEditsStep.new(yaml_file_paths, source_locale).run(params)
 
         unless config.disable_gettext
-          BaseOperation::DumpHamlGettextKeysStep.new(haml_source_files).run
-          BaseOperation::DumpSlimGettextKeysStep.new(slim_source_files).run
+          BaseOperation::DumpMarkupGettextKeysStep.new(haml_source_files, :haml).run
+          BaseOperation::DumpMarkupGettextKeysStep.new(slim_source_files, :slim).run
         end
 
         UpdatePotFileStep.new(pot_path, source_files).run(params)

data/lib/translation_io/railtie.rb

@@ -1,11 +1,6 @@
 require 'i18n'
 require 'i18n/config'
 
-require 'gettext'
-require 'gettext/po'
-require 'gettext/po_parser'
-require 'gettext/tools/xgettext'
-
 module TranslationIO
   class Railtie < Rails::Railtie
     rake_tasks do
@@ -28,34 +23,41 @@ module I18n
     def locale=(locale)
       I18n.enforce_available_locales!(locale) if I18n.respond_to?(:enforce_available_locales!)
       @locale = locale.to_sym rescue nil
-      GetText.set_current_locale(locale.to_s.gsub('-', '_').to_sym)
+
+      if defined?(GetText)
+        GetText.set_current_locale(locale.to_s.gsub('-', '_').to_sym)
+      else
+        puts "do not set gettext locale because not loaded"
+      end
     end
   end
 end
 
-module GetText
-  class POParser < Racc::Parser
-    def initialize
-      @ignore_fuzzy   = true
-      @report_warning = false
+if defined?(GetText)
+  module GetText
+    class POParser < Racc::Parser
+      def initialize
+        @ignore_fuzzy   = true
+        @report_warning = false
+      end
     end
-  end
 
-  module Tools
-    class XGetText
-      def parse(paths)
-        po = PO.new
-        paths = [paths] if paths.kind_of?(String)
-        paths.each do |path|
-          begin
-            parse_path(path, po)
-          rescue SystemExit => e
-            # puts(_("Error parsing %{path}") % {:path => path})
-            puts
-            puts
+    module Tools
+      class XGetText
+        def parse(paths)
+          po = PO.new
+          paths = [paths] if paths.kind_of?(String)
+          paths.each do |path|
+            begin
+              parse_path(path, po)
+            rescue SystemExit => e
+              # puts(_("Error parsing %{path}") % {:path => path})
+              puts
+              puts
+            end
           end
+          po
         end
-        po
       end
     end
   end

data/lib/translation_io/tasks.rb

@@ -1,3 +1,6 @@
+require 'gettext'
+require 'gettext/po'
+require 'gettext/po_parser'
 require 'gettext/tools'
 
 namespace :translation do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails translation made _("simple") with YAML and GetText. Localize your
   app using either t(".keys") or _("free text") and type "rake translation:sync" to
   synchronize with your translators.
@@ -80,8 +94,7 @@ files:
 - lib/translation_io/client.rb
 - lib/translation_io/client/base_operation.rb
 - lib/translation_io/client/base_operation/create_new_mo_files_step.rb
-- lib/translation_io/client/base_operation/dump_haml_gettext_keys_step.rb
-- lib/translation_io/client/base_operation/dump_slim_gettext_keys_step.rb
+- lib/translation_io/client/base_operation/dump_markup_gettext_keys_step.rb
 - lib/translation_io/client/base_operation/save_new_po_files_step.rb
 - lib/translation_io/client/base_operation/save_new_yaml_files_step.rb
 - lib/translation_io/client/base_operation/save_special_yaml_files_step.rb

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

@@ -1,46 +0,0 @@
-module TranslationIO
-  class Client
-    class BaseOperation
-      class DumpSlimGettextKeysStep
-        def initialize(slim_source_files)
-          @slim_source_files = slim_source_files
-        end
-
-        def run
-          if @slim_source_files.any?
-            TranslationIO.info "Extracting Gettext entries from SLIM files."
-
-            FileUtils.mkdir_p(File.join('tmp', 'translation'))
-
-            extracted_gettext_entries.each_with_index do |entry, index|
-              file_path = File.join('tmp', 'translation', "slim-gettext-#{index.to_s.rjust(8,'0')}.rb")
-
-              File.open(file_path, 'w') do |file|
-                file.puts "def fake"
-                file.puts "  #{entry}"
-                file.puts "end"
-              end
-            end
-          end
-        end
-
-        protected
-
-        def extracted_gettext_entries
-          entries = []
-
-          @slim_source_files.each do |slim_file_path|
-            TranslationIO.info slim_file_path, 2, 2
-
-            slim_data = File.read(slim_file_path)
-            entries  += TranslationIO::Extractor.extract(slim_data)
-          end
-
-          TranslationIO.info "#{entries.size} entries found", 2, 2
-
-          entries
-        end
-      end
-    end
-  end
-end