web_translate_it 1.7.0 → 1.7.0.2

data/README.md

@@ -105,6 +105,13 @@ By default, it starts an application on localhost on the port 4000. You will fin
 
 Should you need to use another host or port, you can use the -h and -p options. For example: `wti server -p 1234`.
 
+You may want to run some commands before or after synching translations. To do so, add in the `translation.yml` file the following:
+
+    before_pull: "echo 'some unix command'"
+    after_pull:  "touch public/restart.txt"
+    
+`before_pull` and `after_pull` will respectively be executed before and after pulling your language files.
+
 ## Rake tasks
 
 This gem includes some rake tasks and a rack middleware you could use to integrate Web Translate It with Ruby on Rails. The rake tasks are significantly slower than the executable, since it has to load the whole rails stack.

data/history.md

@@ -1,4 +1,13 @@
-## Edge
+## Version 1.7.0.2 / 2010-05-31
+
+* Fix bug with file permissions.
+
+## Version 1.7.0.1 / 2010-05-31
+
+* Handle server timeouts more gracefully, and retry request. Set timeout down to 20 secs.
+* New: display warning if file is not writable.
+
+## Version 1.7.0 /2010-05-12
 
 * New: `wti server` launch a sinatra app allowing to sync files from a web interface.
   Pinched from Tom Lea’s awesome rack-webtranslate-it, but made less specific.

data/lib/web_translate_it/project.rb

@@ -2,16 +2,29 @@ module WebTranslateIt
   class Project
     
     def self.fetch_info(api_key)
-      WebTranslateIt::Util.http_connection do |http|
-        request  = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
-        Util.handle_response(http.request(request), true)
+      puts "Gathering project's information…"
+      begin
+        WebTranslateIt::Util.http_connection do |http|
+          request  = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
+          Util.handle_response(http.request(request), true)
+        end
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        self.fetch_info(api_key)
       end
     end
     
     def self.fetch_stats(api_key)
-      WebTranslateIt::Util.http_connection do |http|
-        request  = Net::HTTP::Get.new("/api/projects/#{api_key}/stats.yaml")
-        Util.handle_response(http.request(request), true)
+      begin
+        WebTranslateIt::Util.http_connection do |http|
+          request  = Net::HTTP::Get.new("/api/projects/#{api_key}/stats.yaml")
+          Util.handle_response(http.request(request), true)
+        end
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        self.fetch_stats(api_key)
       end
     end
   end

data/lib/web_translate_it/translation_file.rb

@@ -9,6 +9,7 @@ module WebTranslateIt
     require 'net/https'
     require 'net/http/post/multipart'
     require 'time'
+    require 'ftools'
     
     attr_accessor :id, :file_path, :locale, :api_key
     
@@ -32,13 +33,23 @@ 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)
-      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)
-        File.open(self.file_path, 'w'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
-        Util.handle_response(response)
+      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: #{$!}"
+          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
     end
     
@@ -56,9 +67,15 @@ module WebTranslateIt
     def upload(merge=false, ignore_missing=false)
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
-          WebTranslateIt::Util.http_connection do |http|
-            request  = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing})
-            Util.handle_response(http.request(request))
+          begin
+            WebTranslateIt::Util.http_connection do |http|
+              request  = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing})
+              Util.handle_response(http.request(request))
+            end
+          rescue Timeout::Error
+            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+            sleep(5)
+            upload(merge, ignore_missing)
           end
         end
       else
@@ -80,9 +97,15 @@ module WebTranslateIt
     def create
       if File.exists?(self.file_path)
         File.open(self.file_path) do |file|
-          WebTranslateIt::Util.http_connection do |http|
-            request  = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path) })
-            Util.handle_response(http.request(request))
+          begin
+            WebTranslateIt::Util.http_connection do |http|
+              request  = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path) })
+              Util.handle_response(http.request(request))
+            end
+          rescue Timeout::Error
+            puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+            sleep(5)
+            create
           end
         end
       else

data/lib/web_translate_it/util.rb

@@ -3,10 +3,10 @@ module WebTranslateIt
   class Util
     
     # Return a string representing the gem version
-    # For example "1.4.4"
+    # For example "1.4.4.1"
     def self.version
       hash = YAML.load_file File.join(File.dirname(__FILE__), '..', '..' '/version.yml')
-      [hash[:major], hash[:minor], hash[:patch]].join('.')
+      [hash[:major], hash[:minor], hash[:tiny], hash[:patch]].join('.')
     end
     
     # Yields a HTTP connection over SSL to Web Translate It.
@@ -22,7 +22,7 @@ module WebTranslateIt
       http = Net::HTTP.new('webtranslateit.com', 443)
       http.use_ssl      = true
       http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
-      http.read_timeout = 40
+      http.read_timeout = 20
       yield http
     end
     

data/version.yml

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

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
+  hash: 99
   prerelease: false
   segments: 
   - 1
   - 7
   - 0
-  version: 1.7.0
+  - 2
+  version: 1.7.0.2
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -14,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +02:00
+date: 2010-05-31 00:00:00 +02:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -34,9 +38,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -47,9 +53,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -92,6 +100,14 @@ files:
 - man/wti.1
 - man/wti.1.html
 - man/wti.1.ron
+- spec/examples/config/translation.yml
+- spec/examples/en.yml
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/web_translate_it/configuration_spec.rb
+- spec/web_translate_it/translation_file_spec.rb
+- spec/web_translate_it/util_spec.rb
+- spec/web_translate_it_spec.rb
 has_rdoc: true
 homepage: https://webtranslateit.com
 licenses: []
@@ -103,23 +119,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sync your translations between your app and Web Translate It