web_translate_it 1.7.0.7 → 1.7.1.pre1

data/README.md

@@ -4,12 +4,12 @@
 [RDocs](http://yardoc.org/docs/AtelierConvivialite-webtranslateit) | 
 [Example app](http://github.com/AtelierConvivialite/rails_example_app) | 
 [Report a bug](http://github.com/AtelierConvivialite/webtranslateit/issues) | 
-[Support](http://help.webtranslateit.com)
+[Support](http://help.webtranslateit.com) | 
 [Documentation](http://docs.webtranslateit.com/web_translate_it_client/)
 
 `web_translate_it` is a rubygem providing tools to sync your language files with [Web Translate It](https://webtranslateit.com), a web-based computer-aided translation tool.
 
-![Web Translate It](http://s3.amazonaws.com:80/edouard.baconfile.com/web_translate_it%2Fwti.png)
+![Web Translate It](http://s3.amazonaws.com:80/edouard.baconfile.com/web_translate_it%2Fwti2.png)
 
 This gem provides 4 tools:
 
@@ -178,6 +178,7 @@ The gem currently has been tested against the following versions of Rails:
 
 * 2.3.4
 * 2.3.5
+* 2.3.10
 
 Please open a discussion on [our support site](http://help.webtranslateit.com) if you're using a version of Rails that is not listed above and the gem is not working properly.
 

data/examples/en.yml

@@ -0,0 +1,6 @@
+fr:
+  another_one: dskjdks
+  another_string: "this is another string"
+  hello: "Hello world!!"
+  new_string: hehe
+  test: " & & "

data/history.md

@@ -1,3 +1,11 @@
+## Edge
+
+* New: TranslationFile#fetch now use file timestamps served by the Project API.
+  This makes `wti pull` much faster, especially for projects having a lot of files
+* Fix: `wti server` now notice new languages.
+  Each page request to `wti server` now reloads the project information from Web Translate It.
+  
+
 ## Version 1.7.0.7 / 2010-11-15
 
 * Fix connection problems through a proxy (1.7.0.7.pre)

data/lib/web_translate_it/command_line.rb

@@ -101,7 +101,7 @@ module WebTranslateIt
         
     def fetch_locales_to_pull
       if options.locale
-        locales = [options.locale]
+        locales = [Util.sanitize_locale(options.locale)]
       else
         locales = configuration.target_locales
         configuration.ignore_locales.each{ |locale_to_delete| locales.delete(locale_to_delete) }
@@ -112,7 +112,7 @@ module WebTranslateIt
         
     def fetch_locales_to_push(configuration)
       if options.locale
-        locales = [options.locale]
+        locales = [Util.sanitize_locale(options.locale)]
       else
         locales = [configuration.source_locale]
       end

data/lib/web_translate_it/configuration.rb

@@ -47,7 +47,7 @@ module WebTranslateIt
         if project_file['name'].nil? or project_file['name'].strip == ''
           puts "File #{project_file['id']} not set up"
         else
-          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key)
+          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key, project_file['updated_at'])
         end
       end
     end

data/lib/web_translate_it/server.rb

@@ -26,14 +26,17 @@ module WebTranslateIt
     end
     
     get '/' do
+      @config = WebTranslateIt::Configuration.new('.')
       erb :index, :locals => { :config => config, :locale => "" }
     end
     
     get '/:locale' do
+      @config = WebTranslateIt::Configuration.new('.')
       erb :index, :locals => { :config => config, :locale => params[:locale] }
     end
     
     post '/pull/' do
+      @config = WebTranslateIt::Configuration.new('.')
       `#{config.before_pull}` if config.before_pull
       `wti pull`
       `#{config.after_pull}` if config.after_pull
@@ -41,17 +44,13 @@ module WebTranslateIt
     end
     
     post '/pull/:locale' do
+      @config = WebTranslateIt::Configuration.new('.')
       `#{config.before_pull}` if config.before_pull
       `wti pull -l #{params[:locale]}`
       `#{config.after_pull}` if config.after_pull
       redirect "/#{params[:locale]}"
     end
-        
-    def initialize(*args)
-      super
-      @config = WebTranslateIt::Configuration.new('.')
-    end
-
+    
     def self.start(host, port)
       WebTranslateIt::Server.run! :host => host, :port => port
     end

data/lib/web_translate_it/translation_file.rb

@@ -12,13 +12,14 @@ module WebTranslateIt
     require 'time'
     require 'fileutils'
     
-    attr_accessor :id, :file_path, :locale, :api_key
+    attr_accessor :id, :file_path, :locale, :api_key, :updated_at
     
-    def initialize(id, file_path, locale, api_key)
-      self.id        = id
-      self.file_path = file_path
-      self.locale    = locale
-      self.api_key   = api_key
+    def initialize(id, file_path, locale, api_key, updated_at)
+      self.id         = id
+      self.file_path  = file_path
+      self.locale     = locale
+      self.api_key    = api_key
+      self.updated_at = updated_at
     end
     
     # Fetch a language file.
@@ -34,23 +35,25 @@ module WebTranslateIt
     #   file.fetch(true) # force to re-download the file, will return the content of the file with a 200 OK
     #
     def fetch(force = false)
-      begin
-        WebTranslateIt::Util.http_connection do |http|
-          request = Net::HTTP::Get.new(api_url)
-          request.add_field('If-Modified-Since', last_modification) if File.exist?(self.file_path) and !force
-          response = http.request(request)
-          FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
-          begin
-            File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
-            Util.handle_response(response)
-          rescue
-            "\n/!\\ An error occured: #{$!}"
+      if !File.exist?(self.file_path) or force or self.updated_at >= last_modification.utc
+        begin
+          WebTranslateIt::Util.http_connection do |http|
+            request = Net::HTTP::Get.new(api_url)
+            request.add_field('If-Modified-Since', last_modification.rfc2822) if File.exist?(self.file_path) and !force
+            response = http.request(request)
+            FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
+            begin
+              File.open(self.file_path, 'wb'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
+              Util.handle_response(response)
+            rescue
+              "\n/!\\ An error occured: #{$!}"
+            end
           end
+        rescue Timeout::Error
+          puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+          sleep(5)
+          fetch(force)
         end
-      rescue Timeout::Error
-        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
-        sleep(5)
-        fetch(force)
       end
     end
     
@@ -126,7 +129,7 @@ module WebTranslateIt
       
       # Convenience method which returns the date of last modification of a language file.
       def last_modification
-        File.mtime(File.new(self.file_path, 'r')).rfc2822
+        File.mtime(File.new(self.file_path, 'r'))
       end
       
       # Convenience method which returns the URL of the API endpoint for a locale.

data/lib/web_translate_it/util.rb

@@ -128,5 +128,13 @@ module WebTranslateIt
       return list[result], result
     end
     
+    ##
+    # Cleans up a locale name
+    # For instance: passing `fr_FR` will return `fr-FR`
+
+    def self.sanitize_locale(locale)
+      locale.gsub('_', '-')
+    end
+    
   end
 end

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 7
-:tiny: 0
-:patch: 7
+:tiny: 1
+:patch: pre1

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
-  hash: 105
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 7
-  - 0
-  - 7
-  version: 1.7.0.7
+  - 1
+  - pre1
+  version: 1.7.1.pre1
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 1
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -73,7 +69,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -95,6 +90,7 @@ files:
 - MIT-LICENSE
 - README.md
 - version.yml
+- examples/en.yml
 - examples/locale.rb
 - examples/translation.yml
 - lib/web_translate_it/auto_fetch.rb
@@ -138,19 +134,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: