translation 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e631d4dfa6720834486b6db11f51c5e2f03bc8
-  data.tar.gz: 6dee4a9aa3a7dbfc9c075d3235323225eb0b1030
+  metadata.gz: fca22384fded316e68e7e9066f3c253846815ef1
+  data.tar.gz: eb4a3c2aea1cf607d8371fe0e0a3c41678be7803
 SHA512:
-  metadata.gz: 1b9dd3d10d0e9a8f9de9752ac4b2526edf45cfcd19c3f03b1a196ad2b89957b261bfbc30e6a39b9e3dc9b304634eb6140988b53a43db8fe5adc0512b23112bd8
-  data.tar.gz: ca54b082e005bd1b439d18e9dfba66069f1578377546f31f1a5444dd06284e7fd1d797a8e93634ecf1dfd62e7128782f2dfbd4123e5df17b7bb98f5ef3e45392
+  metadata.gz: 3787c5f789f6b09f368d987b4359ba1c1cf1e6eee7b15dc2497d5f3ef4488d8bbcff8e5a9d172184b88d2c9f021fbcc506519699bb582826f85fef16e58f5fef
+  data.tar.gz: fb65686fe5d214d89914b9f77fdf22712a8cdcfa8577b4ef9c4d79c32e3dfcebb582b442941cba979cb7306ad61ad893957811a295d2020f4dd288318e7c12d6

data/README.md

@@ -1,8 +1,8 @@
-# gem for [Rails TranslationIO](http://rails.translation.io)
+# Ruby/Rails gem for [Translation.io](http://translation.io).
 
 ## Description
 
-Add this gem to your [Rails](http://rubyonrails.org) app to translate it with [Rails TranslationIO](http://rails.translation.io).
+Add this gem to your [Rails](http://rubyonrails.org) app to translate it with [Translation.io](http://translation.io).
 
 ## Installation
 
@@ -21,7 +21,7 @@ And finish by inititalizing your translation project with :
 
 ## Synchronization
 
-To get new translations from Rails TranslationIO and to send new translatable strings, simply run :
+To get new translations from Translation.io and to send new translatable strings, simply run :
 
     bundle exec rake translation:sync
 
@@ -33,7 +33,7 @@ If you need to remove unused keys taking the current branch as reference :
 
 Note that this operation will also perform a sync at the same time.
 
-Warning : all keys that are not present in the current branch will be **permanently deleted both on Rails TranslationIO and in your app**.
+Warning : all keys that are not present in the current branch will be **permanently deleted both on Translation.io and in your app**.
 
 ## Tests
 
@@ -47,4 +47,4 @@ To run the specs :
 The [translation gem](https://rubygems.org/gems/translation) in released under MIT license by [Aurélien Malisart](http://aurelien.malisart.be) and [Michaël Hoste](http://80limit.com) (see MIT-LICENSE
 file).
 
-(c) http://rails.translation.io
+(c) http://translation.io

data/lib/translation.rb

@@ -8,12 +8,11 @@ require 'gettext/text_domain_manager'
 
 module TranslationIO
   GETTEXT_METHODS = [
-    :_, :n_, :p_, :s_, :np_, :ns_, :N_, :Nn,
-    :gettext, :sgettext, :ngettext, :nsgettext, :pgettext, :npgettext
+    :nsgettext, :pgettext, :npgettext, :sgettext, :ngettext, :gettext,
+    :np_, :ns_, :Nn_, :n_, :p_, :s_, :N_, :_
   ]
 
-  TEXT_DOMAIN          = 'app'
-  SOURCE_FILES_PATTERN = '**/*.{rb,erb,html.erb,xml.erb}'
+  TEXT_DOMAIN = 'app'
 end
 
 require 'translation_io/config'
@@ -23,6 +22,7 @@ require 'translation_io/flat_hash'
 require 'translation_io/yaml_conversion'
 
 require 'translation_io/controller'
+require 'translation_io/extractor'
 
 module TranslationIO
   module Proxy
@@ -54,10 +54,6 @@ module TranslationIO
       return true
     end
 
-    def pot_path
-      File.join(TranslationIO.config.locales_path, "#{TEXT_DOMAIN}.pot")
-    end
-
     def info(message, level = 0, verbose_level = 0)
       verbose = @config.try(:verbose) || 0
       if verbose >= verbose_level

data/lib/translation_io/client/base_operation.rb

@@ -10,8 +10,6 @@ module TranslationIO
     class BaseOperation
       attr_accessor :client, :params
 
-      GETTEXT_ENTRY_RE = Regexp.new('(?:' + TranslationIO::GETTEXT_METHODS.join('|') + ')\(\[?(?:".+?"(?:\s*,\s*)?)+\]?(?:[^)]*)?\)')
-
       def initialize(client, perform_real_requests = true)
         @client = client
         @params = {
@@ -45,6 +43,10 @@ module TranslationIO
           $stderr.puts "[Error] Server not responding."
         end
       end
+
+      def cleanup
+        FileUtils.rm_rf(File.join('tmp', 'translation'))
+      end
     end
   end
 end

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

@@ -7,11 +7,13 @@ module TranslationIO
         end
 
         def run
-          if @haml_source_files.any? && defined?(Haml)
+          if @haml_source_files.any?
             TranslationIO.info "Extracting Gettext entries from HAML files."
 
-            File.open(File.join('tmp', 'translation-haml-gettext.rb'), 'w') do |file|
-              extracted_gettext_entries.each do |entry|
+            FileUtils.mkdir_p(File.join('tmp', 'translation'))
+
+            extracted_gettext_entries.each_with_index do |entry, index|
+              File.open(File.join('tmp', 'translation', "haml-gettext-#{index.to_s.rjust(8,'0')}.rb"), 'w') do |file|
                 file.puts "#{entry}"
               end
             end
@@ -27,16 +29,7 @@ module TranslationIO
             TranslationIO.info haml_file_path, 2, 2
 
             haml_data = File.read(haml_file_path)
-
-            begin
-              ruby_data = Haml::Engine.new(haml_data).precompiled
-
-              ruby_data.scan(GETTEXT_ENTRY_RE).each do |entry|
-                entries << entry
-              end
-            rescue Haml::SyntaxError
-              TranslationIO.info "File cannot be parsed (SyntaxError): #{haml_file_path}", 1, 0
-            end
+            entries  += TranslationIO::Extractor.extract(haml_data)
           end
 
           TranslationIO.info "#{entries.size} entries found", 2, 2

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

@@ -7,11 +7,13 @@ module TranslationIO
         end
 
         def run
-          if @slim_source_files.any? && defined?(Slim)
+          if @slim_source_files.any?
             TranslationIO.info "Extracting Gettext entries from SLIM files."
 
-            File.open(File.join('tmp', 'translation-slim-gettext.rb'), 'w') do |file|
-              extracted_gettext_entries.each do |entry|
+            FileUtils.mkdir_p(File.join('tmp', 'translation'))
+
+            extracted_gettext_entries.each_with_index do |entry, index|
+              File.open(File.join('tmp', 'translation', "slim-gettext-#{index.to_s.rjust(8,'0')}.rb"), 'w') do |file|
                 file.puts "#{entry}"
               end
             end
@@ -26,15 +28,8 @@ module TranslationIO
           @slim_source_files.each do |slim_file_path|
             TranslationIO.info slim_file_path, 2, 2
 
-            begin
-              ruby_data = Slim::Template.new(slim_file_path, {}).precompiled_template
-
-              ruby_data.scan(GETTEXT_ENTRY_RE).each do |entry|
-                entries << entry
-              end
-            rescue Slim::Parser::SyntaxError
-              TranslationIO.info "File cannot be parsed (SyntaxError): #{slim_file_path}", 1, 0
-            end
+            slim_data = File.read(slim_file_path)
+            entries  += TranslationIO::Extractor.extract(slim_data)
           end
 
           TranslationIO.info "#{entries.size} entries found", 2, 2

data/lib/translation_io/client/init_operation.rb

@@ -7,19 +7,21 @@ module TranslationIO
   class Client
     class InitOperation < BaseOperation
       def run
-        haml_source_files = Dir['**/*.{haml}'].select { |p| !p.start_with?('vendor/') }
-        slim_source_files = Dir['**/*.{slim}'].select { |p| !p.start_with?('vendor/') }
+        config = TranslationIO.config
+
+        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      = Dir[SOURCE_FILES_PATTERN].select { |p| !p.start_with?('vendor/') }
-        pot_path          = TranslationIO.pot_path
-        source_locale     = TranslationIO.config.source_locale
-        target_locales    = TranslationIO.config.target_locales
-        locales_path      = TranslationIO.config.locales_path
-        yaml_locales_path = 'config/locales'
-        yaml_file_paths   = I18n.load_path
+        source_files      = config.source_files
+        pot_path          = config.pot_path
+        source_locale     = config.source_locale
+        target_locales    = config.target_locales
+        locales_path      = config.locales_path
+        yaml_locales_path = config.yaml_locales_path
+        yaml_file_paths   = config.yaml_file_paths
 
         UpdatePotFileStep.new(pot_path, source_files).run
         UpdateAndCollectPoFilesStep.new(target_locales, pot_path, locales_path).run(params)
@@ -36,6 +38,8 @@ module TranslationIO
           CleanupYamlFilesStep.new(source_locale, target_locales, yaml_file_paths, yaml_locales_path).run
           BaseOperation::CreateNewMoFilesStep.new(locales_path).run
         end
+
+        cleanup
       end
     end
   end

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

@@ -23,17 +23,19 @@ module TranslationIO
             end
 
             if in_project && !protected_file
-              content_hash     = YAML::load(File.read(locale_file_path))
-              new_content_hash = content_hash.keep_if { |k| k.to_s == @source_locale.to_s }
+              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 }
 
-              if new_content_hash.keys.any?
-                TranslationIO.info "Rewriting #{locale_file_path}", 2, 2
-                File.open(locale_file_path, 'wb') do |file|
-                  file.write(new_content_hash.to_yaml)
+                if new_content_hash.keys.any?
+                  TranslationIO.info "Rewriting #{locale_file_path}", 2, 2
+                  File.open(locale_file_path, 'wb') do |file|
+                    file.write(new_content_hash.to_yaml)
+                  end
+                else
+                  TranslationIO.info "Removing #{locale_file_path}", 2, 2
+                  FileUtils.rm(locale_file_path)
                 end
-              else
-                TranslationIO.info "Removing #{locale_file_path}", 2, 2
-                FileUtils.rm(locale_file_path)
               end
             end
           end

data/lib/translation_io/client/sync_operation.rb

@@ -5,19 +5,21 @@ module TranslationIO
   class Client
     class SyncOperation < BaseOperation
       def run(purge = false)
-        haml_source_files = Dir['**/*.{haml}'].select { |p| !p.start_with?('vendor/') }
-        slim_source_files = Dir['**/*.{slim}'].select { |p| !p.start_with?('vendor/') }
+        config = TranslationIO.config
+
+        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      = Dir[SOURCE_FILES_PATTERN].select { |p| !p.start_with?('vendor/') }
-        pot_path          = TranslationIO.pot_path
-        source_locale     = TranslationIO.config.source_locale
-        target_locales    = TranslationIO.config.target_locales
-        locales_path      = TranslationIO.config.locales_path
-        yaml_locales_path = 'config/locales'
-        yaml_file_paths   = I18n.load_path
+        source_files      = config.source_files
+        pot_path          = config.pot_path
+        source_locale     = config.source_locale
+        target_locales    = config.target_locales
+        locales_path      = config.locales_path
+        yaml_locales_path = config.yaml_locales_path
+        yaml_file_paths   = config.yaml_file_paths
 
         UpdateAndCollectPotFileStep.new(pot_path, source_files).run(params)
         CreateYamlPotFileStep.new(source_locale, yaml_file_paths).run(params)
@@ -35,6 +37,8 @@ module TranslationIO
           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
         end
+
+        cleanup
       end
     end
   end

data/lib/translation_io/config.rb

@@ -13,6 +13,42 @@ module TranslationIO
       self.verbose        = 1
     end
 
+    def pot_path
+      File.join(locales_path, "#{TEXT_DOMAIN}.pot")
+    end
+
+    def yaml_file_paths
+      I18n.load_path.select do |p|
+        File.exist?(p)
+      end
+    end
+
+    def source_files
+      paths = Dir['**/*.{rb,erb,html.erb,xml.erb}'].select do |p|
+        !p.start_with?('vendor/') && !p.start_with?('tmp/')
+      end
+
+      paths += Dir['tmp/translation/*.rb']
+
+      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/')
+      end
+    end
+
+    def slim_source_files
+      Dir['**/*.{slim}'].select do |p|
+        !p.start_with?('vendor/') && !p.start_with?('tmp/')
+      end
+    end
+
     def to_s
       "#{api_key} - #{source_locale} => #{target_locales.join(' + ')}"
     end

data/lib/translation_io/extractor.rb

@@ -0,0 +1,22 @@
+module TranslationIO
+  module Extractor
+    # visual:                          https://www.debuggex.com/r/fYSQ-jwQfTjhhE6T
+    # .*? is non-greedy (lazy) match : http://stackoverflow.com/a/1919995/1243212
+    REGEXP_INSIDE_1  = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){1}\]?)\s*?'
+    REGEXP_INSIDE_2  = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){2}\]?),?\s*?.*?\s*'
+    REGEXP_INSIDE_2B = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){2}\]?)\s*?'
+    REGEXP_INSIDE_3  = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){3}\]?),?\s*?.*?\s*'
+
+    REGEXP_1  = '(?:sgettext|gettext|N_|s_|_)\s*(?:\('      + REGEXP_INSIDE_1  + '\)|' + REGEXP_INSIDE_1  + ')'
+    REGEXP_2  = '(?:nsgettext|ngettext|ns_|Nn_|n_)\s*(?:\(' + REGEXP_INSIDE_2  + '\)|' + REGEXP_INSIDE_2  + ')'
+    REGEXP_2B = '(?:pgettext|p_)\s*(?:\('                   + REGEXP_INSIDE_2B + '\)|' + REGEXP_INSIDE_2B + ')'
+    REGEXP_3  = '(?:npgettext|np_)\s*(?:\('                 + REGEXP_INSIDE_3  + '\)|' + REGEXP_INSIDE_3  + ')'
+
+    GETTEXT_REGEXP = Regexp.new('(?:' + REGEXP_3 + '|' + REGEXP_2B + '|' + REGEXP_2 + '|' + REGEXP_1 + ')')
+
+    def self.extract(code_to_parse)
+      code_to_parse.scan(GETTEXT_REGEXP)
+    end
+  end
+end
+

data/lib/translation_io/yaml_conversion.rb

@@ -2,29 +2,6 @@ module TranslationIO
   module YAMLConversion
     class << self
 
-      def get_pot_data_from_yaml(source_locale = nil, yaml_file_paths = nil)
-        source_locale   = TranslationIO.config.source_locale if source_locale.blank?
-        yaml_file_paths = I18n.load_path                   if yaml_file_paths.nil?
-
-        source_translations = YAMLConversion.get_flat_translations_for_locale(source_locale, yaml_file_paths)
-        pot_representation  = GetText::PO.new
-
-        source_translations.each_pair do |key, value|
-          msgid = value
-
-          unless msgid.blank?
-            pot_entry            = GetText::POEntry.new(:msgctxt)
-            pot_entry.msgid      = msgid
-            pot_entry.msgctxt    = key.split('.', 2).last
-            #pot_entry.references = [ value[:locale_file_path] ]
-
-            pot_representation[ pot_entry.msgctxt, pot_entry.msgid ] = pot_entry
-          end
-        end
-
-        pot_representation.to_s
-      end
-
       def get_yaml_data_from_po_data(po_data, target_locale)
         parser            = GetText::POParser.new
         po_representation = GetText::PO.new
@@ -43,24 +20,6 @@ module TranslationIO
 
       # Shortcut methods
 
-      def get_flat_translations_for_locale(locale, yaml_file_paths = nil)
-        yaml_file_paths = I18n.load_path if yaml_file_paths.blank?
-
-        all_flat_translations = {}
-
-        yaml_file_paths.each do |yaml_file_path|
-          content      = File.read(yaml_file_path)
-          translations = YAML::load(content)
-
-          if translations.has_key?(locale.to_s)
-            flat_translations = FlatHash.to_flat_hash(translations)
-            all_flat_translations.merge!(flat_translations)
-          end
-        end
-
-        return all_flat_translations
-      end
-
       def get_flat_translations_for_yaml_file(file_path)
         yaml_data = File.read(file_path)
         return get_flat_translations_for_yaml_data(yaml_data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -67,35 +67,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  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'
-- !ruby/object:Gem::Dependency
-  name: slim
-  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: translation.io connector
+description: Rails translation made _("simple"). Use "gem 'translation'" to translate
+  with _("plain text") or with t("lots.of.keys"). Type "rake translation:sync" to
+  synchronize with your translators on Translation.io
 email: contact@translation.io
 executables: []
 extensions: []
@@ -121,6 +95,7 @@ files:
 - lib/translation_io/client/sync_operation/update_and_collect_pot_file_step.rb
 - lib/translation_io/config.rb
 - lib/translation_io/controller.rb
+- lib/translation_io/extractor.rb
 - lib/translation_io/flat_hash.rb
 - lib/translation_io/railtie.rb
 - lib/translation_io/tasks.rb
@@ -148,6 +123,5 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: translation.io connector
+summary: Rails translation made _("simple") with YAML and GetText.
 test_files: []
-has_rdoc: false