translatomatic 0.1.3 → 0.2.0

data/lib/translatomatic/type_cast.rb

@@ -0,0 +1,63 @@
+module Translatomatic
+  # Type casting functions used by Translatomatic::Config
+  module TypeCast
+    private
+
+    def cast(value, type, options = {})
+      value = value[0] if value.is_a?(Array) && !array_type?(type)
+
+      case type
+      when :boolean
+        bool_value(value)
+      when :string
+        return value.nil? ? value : value.to_s
+      when :path
+        cast_path(value, options)
+      when :path_array
+        array_value(value).collect { |i| cast_path(i, options) }
+      when :array
+        array_value(value)
+      else
+        # no casting
+        value
+      end
+    end
+
+    def cast_path(value, options = {})
+      return nil if value.nil?
+      base_path = options[:base_path]
+      value = homeify(value.to_s)
+      value = File.absolute_path(value, base_path) if base_path
+      value
+    end
+
+    def homeify(path)
+      parts = File.split(path)
+      if parts[0] && parts[0] == '~'
+        # replace ~ with home directory
+        parts[0] = Dir.home
+        path = File.join(parts)
+      end
+      path
+    end
+
+    def array_type?(type)
+      %i[path_array array].include?(type)
+    end
+
+    def array_value(value)
+      if value.nil?
+        []
+      else
+        value = [value] unless value.is_a?(Array)
+        value.collect { |i| i.split(/[, ]/) }.flatten.compact
+      end
+    end
+
+    def bool_value(value)
+      return true if %w[true t yes on].include?(value)
+      return false if %w[false f no off].include?(value)
+      value ? true : false
+    end
+  end
+end

data/lib/translatomatic/util.rb

@@ -1,45 +1,49 @@
-# Utility functions, used internally
-module Translatomatic::Util
-
-  private
+module Translatomatic
+  # Utility functions, used internally
+  module Util
+    # @!visibility private
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
 
-  # @!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 CommonMethods
+      private
+
+      def t(key, options = {})
+        Translatomatic::I18n.t(key, options)
+      end
+    end
 
-  # @!visibility private
-  module ClassMethods
-    private
     include CommonMethods
-  end
 
-  def self.included(klass)
-    klass.extend(ClassMethods)
-  end
+    # @!visibility private
+    module ClassMethods
+      include CommonMethods
+    end
 
-  def log
-    Translatomatic.config.logger
-  end
+    def log
+      Translatomatic.logger
+    end
 
-  def locale(tag)
-    Translatomatic::Locale.parse(tag)
-  end
+    def build_locale(tag)
+      Translatomatic::Locale.parse(tag)
+    end
 
-  def string(value, locale)
-    Translatomatic::String.new(value, locale)
-  end
+    def build_text(string, locale, options = {})
+      return nil if string.nil?
+      Translatomatic::Text.new(string, locale, options)
+    end
 
-  def hashify(list)
-    hash = {}
-    list.each { |i| hash[i.to_s] = i }
-    hash
+    def hashify(list, key_mapping = proc { |i| i.to_s })
+      hash = {}
+      list.each do |i|
+        key = key_mapping.call(i)
+        hash[key] = i
+      end
+      hash
+    end
   end
 end

data/lib/translatomatic/version.rb

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

data/translatomatic.gemspec

@@ -1,46 +1,57 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "translatomatic/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "translatomatic"
-  spec.version       = Translatomatic::VERSION
-  spec.authors       = ["Andrew Williams"]
-  spec.email         = ["contact@smugglys.com"]
-
-  spec.summary       = %q{File translation and conversion utility}
-  spec.homepage      = Translatomatic::URL
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "bin"
-  spec.executables   = %w{translatomatic}
-  spec.require_paths = ["lib"]
-
-  spec.metadata["yard.run"] = "yri" # use "yard" to build full HTML docs.
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-mocks", "~> 3.0"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "factory_bot"  # RIP girl
-
-  spec.add_dependency "thor", "~> 0.20"
-  spec.add_dependency "easy_translate"
-  spec.add_dependency "bing_translator", "~> 5.1.0"
-  spec.add_dependency "activerecord", "~> 5.0"
-  spec.add_dependency "i18n"
-  spec.add_dependency "i18n_data"
-  spec.add_dependency "rails-i18n", '~> 5.0.0' # For 5.0.x and 5.1.x
-  spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-progressbar"
-  spec.add_dependency "kramdown"           # markdown -> html
-  spec.add_dependency "reverse_markdown"   # html -> markdown
-  spec.add_dependency "PoParser"
-  spec.add_dependency "titlekit"
-end
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'translatomatic/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'translatomatic'
+  spec.version       = Translatomatic::VERSION
+  spec.authors       = ['Andrew Williams']
+  spec.email         = ['contact@smugglys.com']
+
+  spec.summary       = 'File translation and conversion utility'
+  spec.homepage      = Translatomatic::URL
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'bin'
+  spec.executables   = %w[translatomatic]
+  spec.require_paths = ['lib']
+
+  spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
+
+  spec.required_ruby_version = '>= 2.2'
+
+  # development
+  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rspec-mocks', '~> 3'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webmock'
+
+  # translation
+  spec.add_dependency 'google_web_translate', '~> 0.2.3'
+
+  # resource file parsing
+  spec.add_dependency 'kramdown'           # markdown -> html
+  spec.add_dependency 'nokogiri'
+  spec.add_dependency 'PoParser'
+  spec.add_dependency 'reverse_markdown'   # html -> markdown
+  spec.add_dependency 'treetop'
+  spec.add_dependency 'rchardet'
+  spec.add_dependency 'titlekit'
+
+  # misc
+  spec.add_dependency 'activerecord', '~> 5'
+  spec.add_dependency 'i18n'
+  spec.add_dependency 'i18n_data'          # iso country/language codes
+  spec.add_dependency 'rails-i18n', '~> 5' # date/time/currency formats
+  spec.add_dependency 'ruby-progressbar'
+  spec.add_dependency 'thor', '= 0.20.0'   # using monkey patch
+  spec.add_dependency 'builder'
+  spec.add_dependency 'http-cookie', '~> 1'
+  spec.add_dependency 'rainbow', '~> 3'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translatomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -95,13 +95,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: google_web_translate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: easy_translate
+  name: PoParser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,35 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bing_translator
+  name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n_data
+  name: titlekit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,21 +207,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: i18n_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,21 +249,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: reverse_markdown
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,21 +277,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: PoParser
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
-  name: titlekit
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -290,6 +304,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: 
 email:
 - contact@smugglys.com
@@ -301,6 +343,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".translatomatic/config.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -309,6 +352,7 @@ files:
 - Guardfile
 - LICENSE.txt
 - README.de.md
+- README.en.md
 - README.es.md
 - README.fr.md
 - README.it.md
@@ -321,10 +365,12 @@ files:
 - README.sv.md
 - README.zh.md
 - Rakefile
+- TODO.txt
 - bin/console
 - bin/setup
 - bin/translatomatic
 - bin/travis
+- config/i18n-tasks.yml
 - config/locales/translatomatic/de.yml
 - config/locales/translatomatic/en.yml
 - config/locales/translatomatic/es.yml
@@ -346,8 +392,15 @@ files:
 - lib/translatomatic/cli/config.rb
 - lib/translatomatic/cli/database.rb
 - lib/translatomatic/cli/main.rb
+- lib/translatomatic/cli/thor.rb
 - lib/translatomatic/cli/translate.rb
 - lib/translatomatic/config.rb
+- lib/translatomatic/config/display.rb
+- lib/translatomatic/config/files.rb
+- lib/translatomatic/config/location_settings.rb
+- lib/translatomatic/config/options.rb
+- lib/translatomatic/config/selector.rb
+- lib/translatomatic/config/settings.rb
 - lib/translatomatic/converter.rb
 - lib/translatomatic/database.rb
 - lib/translatomatic/define_options.rb
@@ -356,42 +409,66 @@ files:
 - lib/translatomatic/extractor/base.rb
 - lib/translatomatic/extractor/ruby.rb
 - lib/translatomatic/file_translator.rb
-- lib/translatomatic/http_request.rb
+- lib/translatomatic/flattenation.rb
+- lib/translatomatic/http.rb
+- lib/translatomatic/http/client.rb
+- lib/translatomatic/http/exception.rb
+- lib/translatomatic/http/file_param.rb
+- lib/translatomatic/http/param.rb
+- lib/translatomatic/http/request.rb
+- lib/translatomatic/i18n.rb
 - lib/translatomatic/locale.rb
 - lib/translatomatic/logger.rb
+- lib/translatomatic/metadata.rb
 - lib/translatomatic/model.rb
 - lib/translatomatic/model/locale.rb
 - lib/translatomatic/model/text.rb
 - lib/translatomatic/option.rb
+- lib/translatomatic/path_utils.rb
 - lib/translatomatic/progress_updater.rb
+- lib/translatomatic/provider.rb
+- lib/translatomatic/provider/base.rb
+- lib/translatomatic/provider/frengly.rb
+- lib/translatomatic/provider/google.rb
+- lib/translatomatic/provider/google_web.rb
+- lib/translatomatic/provider/microsoft.rb
+- lib/translatomatic/provider/my_memory.rb
+- lib/translatomatic/provider/yandex.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/key_value_support.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/properties.treetop
 - 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/xcode_strings.treetop
 - lib/translatomatic/resource_file/xml.rb
 - lib/translatomatic/resource_file/yaml.rb
-- lib/translatomatic/string.rb
+- lib/translatomatic/retry_executor.rb
+- lib/translatomatic/slurp.rb
+- lib/translatomatic/string_batcher.rb
+- lib/translatomatic/string_escaping.rb
+- lib/translatomatic/text.rb
+- lib/translatomatic/text_collection.rb
 - lib/translatomatic/tmx.rb
 - lib/translatomatic/tmx/document.rb
 - lib/translatomatic/tmx/translation_unit.rb
 - lib/translatomatic/translation.rb
-- lib/translatomatic/translation_result.rb
-- lib/translatomatic/translation_stats.rb
+- lib/translatomatic/translation/collection.rb
+- lib/translatomatic/translation/fetcher.rb
+- lib/translatomatic/translation/munging.rb
+- lib/translatomatic/translation/result.rb
+- lib/translatomatic/translation/sharer.rb
+- lib/translatomatic/translation/stats.rb
 - lib/translatomatic/translator.rb
-- lib/translatomatic/translator/base.rb
-- lib/translatomatic/translator/frengly.rb
-- lib/translatomatic/translator/google.rb
-- lib/translatomatic/translator/microsoft.rb
-- lib/translatomatic/translator/my_memory.rb
-- lib/translatomatic/translator/yandex.rb
+- lib/translatomatic/type_cast.rb
 - lib/translatomatic/util.rb
 - lib/translatomatic/version.rb
 - translatomatic.gemspec
@@ -408,7 +485,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -416,7 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: File translation and conversion utility