idiom 0.4.4 → 0.5.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm ree-1.8.7-2011.03@idiom

data/Gemfile

@@ -1,3 +1,5 @@
+source 'http://rubygems.org'
+
 gem "rspec"
 gem "activesupport", :require => "active_support"
 gem "sishen-rtranslate"

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    json (1.6.5)
+    multi_json (1.0.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    sishen-rtranslate (1.5)
+      activesupport (>= 2.2.0)
+      json (>= 1.1.3)
+    yrb (0.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  rspec
+  sishen-rtranslate
+  yrb

data/Rakefile

@@ -24,35 +24,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['-c']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov_opts = ['--exclude', '.gem,Library,spec', '--sort', 'coverage']
-  spec.rcov = true
-end
 
 task :bundle do
   require 'vendor/gems/environment'
   Bundler.require_env
 end
 
-task :spec => [:bundle, :check_dependencies]
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "idiom #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/idiom.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{idiom}
-  s.version = "0.4.4"
+  s.name = "idiom"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2011-10-03}
-  s.default_executable = %q{idiom}
-  s.description = %q{Takes a set of keys in Yaml format and translates them through Google Translate.}
-  s.email = %q{progressions@gmail.com}
+  s.date = "2012-02-20"
+  s.description = "Takes a set of keys in Yaml format and translates them through Google Translate."
+  s.email = "progressions@gmail.com"
   s.executables = ["idiom"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -20,7 +19,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
+    "Gemfile.lock",
     "History.txt",
     "LICENSE",
     "README.rdoc",
@@ -39,18 +40,12 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/stubs.rb"
   ]
-  s.homepage = %q{http://github.com/progressions/idiom}
+  s.homepage = "http://github.com/progressions/idiom"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Translate all your application's international keys in Google Translate}
-  s.test_files = [
-    "spec/idiom_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/stubs.rb"
-  ]
+  s.rubygems_version = "1.8.12"
+  s.summary = "Translate all your application's international keys in Google Translate"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/idiom.rb

@@ -13,4 +13,4 @@ require 'yaml'
 require 'idiom/microsoft_translator'
 require 'idiom/base'
 require 'idiom/yrb'
-require 'idiom/yaml'
+require 'idiom/yaml'

data/lib/idiom/base.rb

@@ -59,6 +59,27 @@ module Idiom #:nodoc:
   
   module Processing #:nodoc:
     def pre_process(value, lang)
+      # extract %{substitution_var} => @substitution_vars = ['substitution_var']
+      #
+      # This prevents the translator from seeing the substitution_var, in case it
+      # tries to e.g. downcase it or whatever.
+      @substitution_vars = []
+      while value =~ /%\{([^\}]*)\}/
+        value.sub! /%\{([^\}]*)\}/, "|#{@substitution_vars.count}|"
+        @substitution_vars << $1
+      end
+
+      # extract '''pass through''' / ===pass through===  => @pass_through_vars = ['pass through']
+      #
+      # This allows string to be passed through without being translated
+      # differs from @substitution_vars in that the underscore markup
+      # will be stripped from the final result
+      @pass_through_vars = []
+      while value =~ /(?:(?:===)|(?:'''))(.*?)(?:(?:===)|(?:'''))/
+        value.sub! /(?:(?:===)|(?:'''))(.*?)(?:(?:===)|(?:'''))/, "__#{@pass_through_vars.count}__"
+        @pass_through_vars  << $1
+      end
+
       vars = []
       index = 0
       while value =~ /(\{\d+\})/
@@ -73,10 +94,10 @@ module Idiom #:nodoc:
       
       value.gsub!("{{", "{{_")
       value.gsub!("}}", "_}}")
-      
+
       value
     end
-    
+
     def post_process(value, lang)
       value.gsub!('"。', '。"')
       value.gsub!(/^[''"「«]+/, "")
@@ -91,15 +112,25 @@ module Idiom #:nodoc:
       value.gsub!("{{_", "{{")
       value.gsub!("_}}", "}}")
       value.gsub!(/\\$/, "")
-      
+
       value.strip!
       value.capitalize!
       value = "\"#{value}\"" if value.present?
-      
+
+      # Replace substitution vars
+      while value =~ /\|([^\|]+)\|/ 
+        value.sub! /\|([^\|]+)\|/, "%{#{@substitution_vars[$1.to_i]}}" 
+      end
+
+      # Replace pass-through content
+      while value =~ /__(.*?)__/
+        value.sub! /__(.*?)__/, @pass_through_vars[$1.to_i]
+      end
+
       value
     end    
   end
-  
+
   module ClassMethods #:nodoc:
     def translate(options={})
       options.stringify_keys!
@@ -165,12 +196,22 @@ module Idiom #:nodoc:
     #
     attr_accessor :languages
         
+    # Cached array of subsitution variables
+    #
+    attr_accessor :substitution_vars
+
+    # Cached array of pass-through content
+    #
+    attr_accessor :pass_through_vars
+    
     def initialize(options={})
       options.stringify_keys!
       
       @source = File.expand_path(options["source"])
       @overwrite = options["overwrite"]
       @languages = options["languages"]
+      @substitution_vars = []
+      @pass_through_vars = []
       
       @base_source = @source.gsub(/_en-US/, "")
       
@@ -195,9 +236,11 @@ module Idiom #:nodoc:
     
     def generate
       before_translation
+      # RM NOTE: Async concurrent by language?
       non_us_locales.each do |lang|
         code = LOCALES[lang]
         destination = ensure_destination_path_exists(lang)
+        # RM NOTE: this breaks on multi-line strings
         new_content = each_line do |line|
           copy_and_translate_line(line, lang)
         end
@@ -306,14 +349,14 @@ module Idiom #:nodoc:
     end
     
     def translate(value, lang)
+      return '' if value == ''
       $stdout.puts("Translating #{value} into #{lang}...")
       code = LOCALES[lang]
       value = pre_process(value, lang)
-      
+
       translation = do_translate(value, code)
-      
+
       value = post_process(translation, lang)
-      $stdout.puts("value: #{value}")
       value
     end
     

data/lib/idiom/yaml.rb

@@ -1,5 +1,5 @@
 require 'idiom/base'
-
+    
 module Idiom #:nodoc:
   # Usage: 
   #   Translator::Yaml.new().copy
@@ -11,20 +11,20 @@ module Idiom #:nodoc:
     
     def after_translation
       system "cat #{destination_path} >> #{source} && rm #{destination_path}"
-    end
+      end
     
     def extension
       "yml"
     end
-    
+
     def parse(path)
       YAML.load_file(path) || {}
-    end
-    
+      end
+
     def format(key, value)
       "#{key}: #{value}"
     end
-    
+
     def key_and_value_from_line(line)
       if line =~ /^([^\:]+):(.*)/
         return $1, $2.strip
@@ -33,4 +33,4 @@ module Idiom #:nodoc:
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: idiom
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 -05:00
-default_executable: idiom
+date: 2012-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id001
   name: rspec
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,11 +42,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id002
   name: activesupport
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,11 +56,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id003
   name: sishen-rtranslate
   prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,11 +70,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id004
   name: yrb
   prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -86,11 +86,11 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
+  version_requirements: *id005
   name: rspec
   prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,11 +102,11 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  type: :runtime
+  version_requirements: *id006
   name: activesupport
   prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,11 +118,11 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :runtime
+  version_requirements: *id007
   name: sishen-rtranslate
   prerelease: false
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -132,11 +132,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id008
   name: timer
   prerelease: false
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -146,11 +146,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id009
   name: natural_time
   prerelease: false
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -160,11 +160,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id010
   name: g
   prerelease: false
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,10 +174,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id011
   name: yrb
   prerelease: false
-  version_requirements: *id011
 description: Takes a set of keys in Yaml format and translates them through Google Translate.
 email: progressions@gmail.com
 executables: 
@@ -189,7 +188,9 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc
@@ -207,7 +208,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/stubs.rb
-has_rdoc: true
 homepage: http://github.com/progressions/idiom
 licenses: []
 
@@ -237,11 +237,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Translate all your application's international keys in Google Translate
-test_files: 
-- spec/idiom_spec.rb
-- spec/spec_helper.rb
-- spec/stubs.rb
+test_files: []
+