web_translate_it 1.9.1 → 1.9.2

data/bin/wti

@@ -6,7 +6,7 @@ require 'web_translate_it'
 show_commands = <<-EOS
 A CLI for syncing files with WebTranslateIt.com
 
-Usage: wti <command> [options]+
+Usage: wti <command> [options]+ <filename>
 
 The most commonly used wti commands are:
 
@@ -92,7 +92,6 @@ EOS
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
   when "status"
-  when "st"
     Trollop::options do
       banner "Fetch and display project statistics"
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"

data/history.md

@@ -1,3 +1,20 @@
+## Version 1.9.2 / 2011-12-21
+
+* Gem now includes library to connect to [String](http://docs.webtranslateit.com/api/string/) and [Translation](http://docs.webtranslateit.com/api/translation/) APIs, see #74 and #78. (@bray).
+* Add `<filename>` placeholder.
+* Bug fix: don’t crash when running `wti init` on an empty project.
+* Bug fix: File API was returning `102 Continue` error status when fetching a file begin currently imported. It was making subsequent requests fail. The File API now returns `503 Service Unavailable`. Client was updated to handle this status.
+* Fix `wti status` command.
+* Improvement: truncate `wti pull` performance statistics (`Pulled 10 files in 0.7 seconds at 13.4 files/sec`).
+* Fix: Configuration file lookup improvements. Configuration files can now be located in another directory, and `wti` commands don’t have to be executed in the root directory. It is now possible to execute:
+	
+	```
+	wti pull 
+	wti pull -c /Users/edouard/code/test/.wti
+	wti pull -c ../.wti
+	wti pull -c ~/code/.wti
+	```
+
 ## Version 1.9.1 / 2011-12-08
 
 * Add `wti rm` and `wti rmlocale` to CLI help.

data/lib/web_translate_it/command_line.rb

@@ -41,7 +41,7 @@ module WebTranslateIt
       end
       threads.each { |thread| thread.join }
       time = Time.now - time
-      puts "Pulled #{files.count} files in #{time} seconds at #{files.count/time} files/sec."
+      puts "Pulled #{files.count} files in #{time.round(1)} seconds at #{(files.count/time).round(1)} files/sec."
       `#{configuration.after_pull}` if configuration.after_pull
     end
     
@@ -177,8 +177,6 @@ module WebTranslateIt
       end
     end
     
-    alias :st :status
-    
     def server
       puts "This feature is deprecated and was extracted to a separate gem,"
       puts "    `web_translate_it_server`."

data/lib/web_translate_it/configuration.rb

@@ -16,7 +16,7 @@ module WebTranslateIt
     def initialize(root_path = Rails.root, path_to_config_file = ".wti")
       self.path           = root_path
       self.logger         = logger
-      configuration       = YAML.load_file(File.join(self.path, path_to_config_file))
+      configuration       = YAML.load_file(File.expand_path(path_to_config_file, self.path))
       self.api_key        = configuration['api_key']
       self.before_pull    = configuration['before_pull']
       self.after_pull     = configuration['after_pull']

data/lib/web_translate_it/project.rb

@@ -13,7 +13,7 @@ module WebTranslateIt
             return response.body
           else
             puts "An error occured while fetching the project information:"
-            puts response.body.failure
+            puts StringUtil.failure(response.body)
             exit
           end
         end

data/lib/web_translate_it/string.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+module WebTranslateIt
+  class String
+    require 'net/https'
+    
+    attr_accessor :id, :api_key
+    
+    def initialize(id, api_key)
+      self.id         = id
+      self.api_key    = api_key
+    end
+    
+    def self.list(http_connection, api_key, params = {}, options = {})
+      options.reverse_merge!(:format => 'yaml')
+
+      url = "/api/projects/#{api_key}/strings.#{options[:format]}"
+      url += '?' + HashUtil.to_param(params) unless params.blank?
+
+      request = Net::HTTP::Get.new(url)
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+    
+    def show(http_connection, options = {})
+      options.reverse_merge!(:format => 'yaml')
+
+      request = Net::HTTP::Get.new("/api/projects/#{self.api_key}/strings/#{self.id}.#{options[:format]}")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+
+    def update(http_connection, params = {}, options = {})
+      options.reverse_merge!(:format => 'yaml')
+
+      request = Net::HTTP::Put.new("/api/projects/#{self.api_key}/strings/#{self.id}.#{options[:format]}")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+      request.add_field("Content-Type", "application/json")
+          
+      request.body = params.to_json
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+    
+    def self.create(http_connection, api_key, params = {})
+      request = Net::HTTP::Post.new("/api/projects/#{api_key}/strings")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+      request.add_field("Content-Type", "application/json")
+        
+      request.body = params.to_json
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+
+    def delete(http_connection)
+      request = Net::HTTP::Delete.new("/api/projects/#{self.api_key}/strings/#{self.id}")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+
+  end
+end

data/lib/web_translate_it/translation.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module WebTranslateIt
+  class Translation
+    require 'net/https'
+    
+    attr_accessor :id, :locale, :api_key
+    
+    def initialize(id, locale, api_key)
+      self.id         = id
+      self.locale     = locale
+      self.api_key    = api_key
+    end
+    
+    def show(http_connection, options = {})
+      options.reverse_merge!(:format => 'yaml')
+      
+      request = Net::HTTP::Get.new("/api/projects/#{self.api_key}/strings/#{self.id}/locales/#{self.locale}/translations.#{options[:format]}")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+    
+    def create(http_connection, params = {})
+      request = Net::HTTP::Post.new("/api/projects/#{self.api_key}/strings/#{self.id}/locales/#{self.locale}/translations")
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+      request.add_field("Content-Type", "application/json")
+        
+      request.body = params.to_json
+
+      begin
+        Util.handle_response(http_connection.request(request), true)
+      rescue Timeout::Error
+        puts "The request timed out. The service may be overloaded. We will retry in 5 seconds."
+        sleep(5)
+        retry
+      end
+    end
+
+  end
+end

data/lib/web_translate_it/util/hash_util.rb

@@ -0,0 +1,7 @@
+class HashUtil
+  def self.to_param(hash, namespace = nil) # taken from Rails
+    hash.collect do |key, value|
+      value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+    end.sort * '&'
+  end
+end

data/lib/web_translate_it/util.rb

@@ -56,16 +56,16 @@ module WebTranslateIt
     
     def self.handle_response(response, return_response = false)
       if response.code.to_i >= 400 and response.code.to_i < 500
-        StringUtil.failure("Error: Can't find project for this API key.")
-      elsif response.code.to_i >= 500
+        StringUtil.failure("Error: Can't find project with this API key.")
+      elsif response.code.to_i == 500
         StringUtil.failure("Error: Server temporarily unavailable. Please try again shortly.")
       else
         return response.body if return_response
-        return StringUtil.failure("Server currently processing file. Please retry later.") if response.code.to_i == 102
         return StringUtil.success("OK") if response.code.to_i == 200
         return StringUtil.success("Created") if response.code.to_i == 201
         return StringUtil.success("Accepted") if response.code.to_i == 202
         return StringUtil.success("Not Modified") if response.code.to_i == 304
+        return StringUtil.failure("Unavail") if response.code.to_i == 503
       end
     end
     

data/lib/web_translate_it.rb

@@ -3,8 +3,11 @@
 require 'web_translate_it/util'
 require 'web_translate_it/util/array_util'
 require 'web_translate_it/util/string_util'
+require 'web_translate_it/util/hash_util'
 require 'web_translate_it/configuration'
 require 'web_translate_it/translation_file'
+require 'web_translate_it/string'
+require 'web_translate_it/translation'
 require 'web_translate_it/auto_fetch'
 require 'web_translate_it/command_line'
 require 'web_translate_it/project'

data/version.yml

@@ -1,5 +1,4 @@
---- 
 :major: 1
 :minor: 9
-:patch: 1
+:patch: 2
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2011-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70346835324020 !ruby/object:Gem::Requirement
+  requirement: &70191931766220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70346835324020
+  version_requirements: *70191931766220
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70346835323520 !ruby/object:Gem::Requirement
+  requirement: &70191931765720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70346835323520
+  version_requirements: *70191931765720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346835323060 !ruby/object:Gem::Requirement
+  requirement: &70191931765260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70346835323060
+  version_requirements: *70191931765260
 description: 
 email: edouard@atelierconvivialite.com
 executables:
@@ -63,8 +63,11 @@ files:
 - lib/web_translate_it/command_line.rb
 - lib/web_translate_it/configuration.rb
 - lib/web_translate_it/project.rb
+- lib/web_translate_it/string.rb
+- lib/web_translate_it/translation.rb
 - lib/web_translate_it/translation_file.rb
 - lib/web_translate_it/util/array_util.rb
+- lib/web_translate_it/util/hash_util.rb
 - lib/web_translate_it/util/string_util.rb
 - lib/web_translate_it/util.rb
 - lib/web_translate_it.rb