translatomatic 0.1.2 → 0.1.3

data/lib/translatomatic/translation_result.rb

@@ -1,52 +1,52 @@
-require 'set'
-
+require 'set'
+
 module Translatomatic
-  # Stores results of a translation
-  class TranslationResult
+  # Stores results of a translation
+  class TranslationResult
 
     # @return [Translatomatic::ResourceFile::Base] The resource file
     attr_reader :file
-
-    # @return [Hash<String,String>] Translation results
+
+    # @return [Hash<String,String>] Translation results
     attr_reader :properties
-
-    # @return [Locale] The locale of the original strings
-    attr_reader :from_locale
-
-    # @return [Locale] The target locale
-    attr_reader :to_locale
-
-    # @return [Set<String>] Untranslated strings
-    attr_reader :untranslated
-
-    # Create a translation result
-    # @param file [Translatomatic::ResourceFile::Base] A resource file
-    # @param to_locale [Locale] The target locale
+
+    # @return [Locale] The locale of the original strings
+    attr_reader :from_locale
+
+    # @return [Locale] The target locale
+    attr_reader :to_locale
+
+    # @return [Set<String>] Untranslated strings
+    attr_reader :untranslated
+
+    # Create a translation result
+    # @param file [Translatomatic::ResourceFile::Base] A resource file
+    # @param to_locale [Locale] The target locale
     def initialize(file, to_locale)
-      @file = file
-      @value_to_keys = {}
-      @untranslated = Set.new
-      @from_locale = file.locale
-      @to_locale = to_locale
-
-      # duplicate strings
-      @properties = file.properties.transform_values { |i| i.dup }
-
-      @properties.each do |key, value|
-        # split property value into sentences
-        string = string(value, from_locale)
-        string.sentences.each do |sentence|
-          @untranslated << sentence
-          keylist = (@value_to_keys[sentence.to_s] ||= [])
-          keylist << key
-        end
-      end
-    end
-
+      @file = file
+      @value_to_keys = {}
+      @untranslated = Set.new
+      @from_locale = file.locale
+      @to_locale = to_locale
+
+      # duplicate strings
+      @properties = file.properties.transform_values { |i| i.dup }
+
+      @properties.each do |key, value|
+        # split property value into sentences
+        string = string(value, from_locale)
+        string.sentences.each do |sentence|
+          @untranslated << sentence
+          keylist = (@value_to_keys[sentence.to_s] ||= [])
+          keylist << key
+        end
+      end
+    end
+
     # Update result with a list of translated strings.
     # @param translations [Array<Translatomatic::Translation>] Translations
-    # @return [void]
-    def update_strings(translations)
+    # @return [void]
+    def update_strings(translations)
       # sort translation list by largest offset first so that we replace
       # from the end of the string to the front, so substring offsets
       # are correct in the target string.
@@ -57,30 +57,30 @@ module Translatomatic
       #end
       translations.sort_by! { |t| -t.original.offset }
 
-      translations.each do |translation|
+      translations.each do |translation|
         update(translation.original, translation.result)
-      end
+      end
     end
-
-    private
-
-    include Translatomatic::Util
-
-    def update(original, translated)
-      keys = @value_to_keys[original.to_s]
-      raise "no key mapping for text '#{original}'" unless keys
-      keys.each do |key|
+
+    private
+
+    include Translatomatic::Util
+
+    def update(original, translated)
+      keys = @value_to_keys[original.to_s]
+      raise "no key mapping for text '#{original}'" unless keys
+      keys.each do |key|
         #value = @properties[key]
         if original.kind_of?(Translatomatic::String) && original.substring?
-          #log.debug("#{value[original.offset, original.length]} -> #{translated}")
-          @properties[key][original.offset, original.length] = translated
-        else
+          #log.debug("#{value[original.offset, original.length]} -> #{translated}")
+          @properties[key][original.offset, original.length] = translated
+        else
           #log.debug("#{key} -> #{translated}")
-          @properties[key] = translated
-        end
-      end
-
-      @untranslated.delete(original) unless translated.nil?
-    end
-  end
-end
+          @properties[key] = translated
+        end
+      end
+
+      @untranslated.delete(original) unless translated.nil?
+    end
+  end
+end

data/lib/translatomatic/{converter_stats.rb → translation_stats.rb}

@@ -1,31 +1,31 @@
-# Translation statistics
-class Translatomatic::ConverterStats
+# Translation statistics
+class Translatomatic::TranslationStats
   include Translatomatic::Util
-
+
   # @return [Array<Translatomatic::Translation>] A list of all translations
-  attr_reader :translations
-
-  # @return [Number] The number of translations that came from the database.
-  attr_reader :from_db
-
-  # @return [Number] The number of translations that came from the translator.
-  attr_reader :from_translator
+  attr_reader :translations
+
+  # @return [Number] The number of translations that came from the database.
+  attr_reader :from_db
+
+  # @return [Number] The number of translations that came from the translator.
+  attr_reader :from_translator
 
   # @return [Number] The number of untranslated strings
   attr_reader :untranslated
 
-  private
+  private
 
   def initialize(translations)
     @translations = translations.values
-    @from_db = @translations.count { |i| i.from_database && i.result }
+    @from_db = @translations.count { |i| i.from_database && i.result }
     @from_translator = @translations.count { |i| !i.from_database && i.result }
     @untranslated = @translations.count { |i| i.result == nil }
   end
-
+
   def to_s
-    t("converter.total_translations", total: @translations.length,
+    t("file_translator.total_translations", total: @translations.length,
       from_db: @from_db, from_translator: @from_translator,
-      untranslated: @untranslated)
-  end
-end
+      untranslated: @untranslated)
+  end
+end

data/lib/translatomatic/translator/base.rb

@@ -56,9 +56,9 @@ module Translatomatic
         translated = []
         untranslated = strings.dup
         request = Translatomatic::HTTPRequest.new(url)
+        fail_count = 0  # number of consecutive translation failures
 
         while !untranslated.empty?  # request start block
-          fail_count = 0  # number of consecutive translation failures
 
           request.start do |http|
             while !untranslated.empty?

data/lib/translatomatic/translator/google.rb

@@ -1,3 +1,5 @@
+require 'easy_translate'
+
 module Translatomatic
   module Translator
 

data/lib/translatomatic/translator.rb

@@ -76,19 +76,21 @@ module Translatomatic::Translator
   # @return [String] A description of all translators and options
   def self.list
     out = t("translator.translators") + "\n"
+    configured_options = {}
     modules.each do |mod|
       out += "\n" + mod.name.demodulize + ":\n"
       opts = mod.options
       opts.each do |opt|
+        configured_options[opt.name] = config.get(opt.name)
         optname = opt.name.to_s.gsub("_", "-")
         out += "  --%-18s  %18s  %10s  %15s\n" % [optname, opt.description,
           opt.required ? t("translator.required_option") : "",
-          opt.use_env ? "ENV[#{opt.name.upcase}]" : ""]
+          opt.env_name ? "ENV[#{opt.env_name}]" : ""]
       end
     end
     out += "\n"
     out += t("translator.configured") + "\n"
-    configured = available
+    configured = available(configured_options)
     configured.each do |translator|
       out += "  " + translator.name + "\n"
     end
@@ -96,4 +98,10 @@ module Translatomatic::Translator
     out + "\n"
   end
 
+  private
+
+  def self.config
+    Translatomatic.config
+  end
+
 end

data/lib/translatomatic/util.rb

@@ -1,45 +1,45 @@
-# Utility functions, used internally
-module Translatomatic::Util
-
-  private
-
-  # @!visibility private
-  module CommonMethods
-    private
-    def t(key, options = {})
-      tkey = "translatomatic.#{key}"
-      raise "missing translation: #{tkey}" unless I18n.exists?(tkey)
-      I18n.t(tkey, options)
-    end
-  end
-
-  include CommonMethods
-
-  # @!visibility private
-  module ClassMethods
-    private
-    include CommonMethods
-  end
-
-  def self.included(klass)
-    klass.extend(ClassMethods)
-  end
-
-  def log
-    Translatomatic::Config.instance.logger
-  end
-
-  def locale(tag)
-    Translatomatic::Locale.parse(tag)
-  end
-
-  def string(value, locale)
-    Translatomatic::String.new(value, locale)
-  end
-
-  def hashify(list)
-    hash = {}
-    list.each { |i| hash[i.to_s] = i }
-    hash
-  end
-end
+# Utility functions, used internally
+module Translatomatic::Util
+
+  private
+
+  # @!visibility private
+  module CommonMethods
+    private
+    def t(key, options = {})
+      tkey = "translatomatic.#{key}"
+      raise "missing translation: #{tkey}" unless I18n.exists?(tkey)
+      I18n.t(tkey, options)
+    end
+  end
+
+  include CommonMethods
+
+  # @!visibility private
+  module ClassMethods
+    private
+    include CommonMethods
+  end
+
+  def self.included(klass)
+    klass.extend(ClassMethods)
+  end
+
+  def log
+    Translatomatic.config.logger
+  end
+
+  def locale(tag)
+    Translatomatic::Locale.parse(tag)
+  end
+
+  def string(value, locale)
+    Translatomatic::String.new(value, locale)
+  end
+
+  def hashify(list)
+    hash = {}
+    list.each { |i| hash[i.to_s] = i }
+    hash
+  end
+end

data/lib/translatomatic/version.rb

@@ -1,7 +1,7 @@
-module Translatomatic
-  # @return [String] Gem version
-  VERSION = "0.1.2"
-
-  # @return [String] Homepage
-  URL = "https://github.com/smugglys/translatomatic"
-end
+module Translatomatic
+  # @return [String] Gem version
+  VERSION = "0.1.3"
+
+  # @return [String] Homepage
+  URL = "https://github.com/smugglys/translatomatic"
+end

data/lib/translatomatic.rb

@@ -1,49 +1,52 @@
-require 'i18n'
-require 'rails-i18n'
-
-# Module containing all of the translation goodness
-module Translatomatic
-  # @return [Translatomatic::Config] configuration
-  def self.config
-    @config ||= Translatomatic::Config.new
-  end
-
-  private
-
-  def self.init_i18n(lib_path)
-    locale_path = File.join(File.dirname(lib_path), "..", "config", "locales")
-    I18n.load_path += Dir[File.join(locale_path, "**", "*.yml")]
-  end
-end
-
-begin
-  Translatomatic.init_i18n(__FILE__)
-end
-
-require 'pathname'
-require 'active_support/core_ext/hash'
-require 'easy_translate'
-require 'i18n_data'
-require 'ruby-progressbar'
-
-require 'translatomatic/option'
-require 'translatomatic/locale'
-require 'translatomatic/string'
-require 'translatomatic/translation'
-require 'translatomatic/util'
-require 'translatomatic/version'
-require 'translatomatic/logger'
-require 'translatomatic/config'
-require 'translatomatic/database'
-require 'translatomatic/escaped_unicode'
-require 'translatomatic/model'
-require 'translatomatic/resource_file'
-require 'translatomatic/http_request'
-require 'translatomatic/translator'
-require 'translatomatic/translation_result'
-require 'translatomatic/converter_stats'
-require 'translatomatic/converter'
-require 'translatomatic/extractor'
-require 'translatomatic/progress_updater'
-require 'translatomatic/tmx'
-require 'translatomatic/cli'
+require 'i18n'
+require 'rails-i18n'
+require 'i18n_data'
+
+require 'pathname'
+require 'active_support/core_ext/hash'
+require 'active_support/dependencies/autoload'
+
+# Module containing all of the translation goodness
+module Translatomatic
+
+  # @return [Translatomatic::Config] configuration
+  def self.config
+    @config ||= Translatomatic::Config.new
+  end
+
+  private
+
+  def self.init_i18n(lib_path)
+    locale_path = File.join(File.dirname(lib_path), "..", "config", "locales")
+    I18n.load_path += Dir[File.join(locale_path, "**", "*.yml")]
+  end
+end
+
+begin
+  Translatomatic.init_i18n(__FILE__)
+end
+
+require 'translatomatic/version'
+require 'translatomatic/option'
+require 'translatomatic/define_options'
+require 'translatomatic/locale'
+require 'translatomatic/string'
+require 'translatomatic/translation'
+require 'translatomatic/util'
+require 'translatomatic/version'
+require 'translatomatic/logger'
+require 'translatomatic/config'
+require 'translatomatic/database'
+require 'translatomatic/escaped_unicode'
+require 'translatomatic/model'
+require 'translatomatic/resource_file'
+require 'translatomatic/http_request'
+require 'translatomatic/converter'
+require 'translatomatic/translator'
+require 'translatomatic/translation_result'
+require 'translatomatic/translation_stats'
+require 'translatomatic/file_translator'
+require 'translatomatic/extractor'
+require 'translatomatic/progress_updater'
+require 'translatomatic/tmx'
+require 'translatomatic/cli'

data/translatomatic.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Andrew Williams"]
   spec.email         = ["contact@smugglys.com"]
 
-  spec.summary       = %q{Strings translation utility}
+  spec.summary       = %q{File translation and conversion utility}
   spec.homepage      = Translatomatic::URL
   spec.license       = "MIT"
 
@@ -41,5 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "kramdown"           # markdown -> html
   spec.add_dependency "reverse_markdown"   # html -> markdown
-  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "PoParser"
+  spec.add_dependency "titlekit"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translatomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -263,7 +263,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: PoParser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: titlekit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -287,6 +301,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".translatomatic/config.yml"
 - ".travis.yml"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
@@ -334,12 +349,13 @@ files:
 - lib/translatomatic/cli/translate.rb
 - lib/translatomatic/config.rb
 - lib/translatomatic/converter.rb
-- lib/translatomatic/converter_stats.rb
 - lib/translatomatic/database.rb
+- lib/translatomatic/define_options.rb
 - lib/translatomatic/escaped_unicode.rb
 - lib/translatomatic/extractor.rb
 - lib/translatomatic/extractor/base.rb
 - lib/translatomatic/extractor/ruby.rb
+- lib/translatomatic/file_translator.rb
 - lib/translatomatic/http_request.rb
 - lib/translatomatic/locale.rb
 - lib/translatomatic/logger.rb
@@ -350,11 +366,14 @@ files:
 - lib/translatomatic/progress_updater.rb
 - lib/translatomatic/resource_file.rb
 - lib/translatomatic/resource_file/base.rb
+- lib/translatomatic/resource_file/csv.rb
 - lib/translatomatic/resource_file/html.rb
 - lib/translatomatic/resource_file/markdown.rb
 - lib/translatomatic/resource_file/plist.rb
+- lib/translatomatic/resource_file/po.rb
 - lib/translatomatic/resource_file/properties.rb
 - lib/translatomatic/resource_file/resw.rb
+- lib/translatomatic/resource_file/subtitle.rb
 - lib/translatomatic/resource_file/text.rb
 - lib/translatomatic/resource_file/xcode_strings.rb
 - lib/translatomatic/resource_file/xml.rb
@@ -365,6 +384,7 @@ files:
 - lib/translatomatic/tmx/translation_unit.rb
 - lib/translatomatic/translation.rb
 - lib/translatomatic/translation_result.rb
+- lib/translatomatic/translation_stats.rb
 - lib/translatomatic/translator.rb
 - lib/translatomatic/translator/base.rb
 - lib/translatomatic/translator/frengly.rb
@@ -399,5 +419,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Strings translation utility
+summary: File translation and conversion utility
 test_files: []