web_translate_it 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab701d78f58fb19e9558b5629385213f9c00c714
-  data.tar.gz: 0c72991d950ecad7e590541de0492fc010b73f8a
+  metadata.gz: 8840c157cbda25ab687330a0a169e38305963efd
+  data.tar.gz: 7c525d74126a800ba7c39772dc81607f7012e938
 SHA512:
-  metadata.gz: 9bb26f6986c7ad7823b6cecf2056a129913ffc6b882c4df8122ade59f5335c5d85df1f4e4059bd58d1ecc1abf185eef90e72aec8e1c2e8c82be2d384a05b9b03
-  data.tar.gz: 0466cefbe3af9abc642772539d88f13cf6626c2fc329fde8cb83ca5ee75fe8b8b72dcae2370914c37807e2e34bc07a83da76a46e6eda367c199b824ec458c713
+  metadata.gz: 384ebc9cc632375ec5fcec6922790e4dc7a72eef4ab03fa3fcf1385ab3365304a0c2cd2612770080c4a3cc70fdeaba01d1ae9887b02d88aa8437d6554f434b1a
+  data.tar.gz: 21b018dbc2ab1546bb9b432e904e3ef93cbdb9445f57eebccda07f4f55d739fcab5e842d02656954cf9fe5ff5da2a1f2a00ed365d59210c0b0755e5849a57372

data/history.md

@@ -1,3 +1,8 @@
+## Version 2.1.6 / 2013-08-02
+
+* Commands now display more information, such as the current project’s name.
+* Improvements to auto-fetch: reload I18n after fetch, and do not run auto-fetch for static requests.
+
 ## Version 2.1.5 / 2013-07-01
 
 * Tweak `wti pull` to use up to 10 threads.

data/lib/web_translate_it.rb

@@ -16,14 +16,14 @@ require 'web_translate_it/command_line'
 require 'web_translate_it/project'
 
 module WebTranslateIt
-  
+
   def self.fetch_translations
     config = Configuration.new
     locale = I18n.locale.to_s
     return if config.ignore_locales.include?(locale)
     config.logger.debug { "   Fetching #{locale} language file(s) from WebTranslateIt" } if config.logger
     WebTranslateIt::Connection.new(config.api_key) do |http|
-      config.files.find_all{ |file| file.locale == locale }.each do |file|
+      config.files.find_all{ |file| file.locale.in?(locale, I18n.lang) }.each do |file|
         response = file.fetch(http)
       end
     end

data/lib/web_translate_it/auto_fetch.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module WebTranslateIt
-  
+
   # Class to automatically fetch the last translations from Web Translate It
   # for every page requested.
   # This can be used as a rack middleware.
@@ -13,11 +13,11 @@ module WebTranslateIt
     def initialize(app)
       @app = app
     end
-  
+
     def call(env)
-      WebTranslateIt::fetch_translations
-      status, headers, response = @app.call(env)
-      [status, headers, response.body]
+      WebTranslateIt::fetch_translations unless env['REQUEST_PATH'] =~ /\.(js|css|jpeg|jpg|gif|png|woff)$/
+      I18n.reload!
+      @app.call(env)
     end
   end
 end

data/lib/web_translate_it/command_line.rb

@@ -25,7 +25,7 @@ module WebTranslateIt
         else
           message = "Gathering information"
         end
-        throb { print "  #{message}"; self.configuration = WebTranslateIt::Configuration.new(project_path, configuration_file_path) }
+        throb { print "  #{message}"; self.configuration = WebTranslateIt::Configuration.new(project_path, configuration_file_path); print " #{message} on #{self.configuration.project_name}"; }
       end
       self.send(command)
     end
@@ -182,7 +182,8 @@ module WebTranslateIt
       end
       File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
       puts ""
-      puts " Your project was successfully initialized."
+      puts " The project #{project_info['name']} was successfully initialized."
+      puts ""
       if project_info["source_locale"]["code"].nil? || project_info["target_locales"].size <= 1 || project_info["project_files"].none?
         puts ""
         puts " There are a few more things to set up:"

data/lib/web_translate_it/configuration.rb

@@ -11,7 +11,7 @@ module WebTranslateIt
     require 'yaml'
     require 'fileutils'
     attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales
-    attr_accessor :logger, :before_pull, :after_pull, :before_push, :after_push
+    attr_accessor :logger, :before_pull, :after_pull, :before_push, :after_push, :project_name
     
     # Load configuration file from the path.
     def initialize(root_path = Rails.root, path_to_config_file = ".wti")
@@ -28,6 +28,7 @@ module WebTranslateIt
         set_locales_to_ignore(configuration)
         set_files(project_info['project'])
         set_locales(project_info['project'])
+        self.project_name = project_info['project']['name']
       else
         puts StringUtil.failure("\nCan't find a configuration file in #{File.expand_path(path_to_config_file, self.path)}")
         exit(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Edouard Briere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post