web_translate_it 2.0.0.rc2 → 2.0.0.rc3

data/bin/wti

@@ -6,32 +6,29 @@ require 'trollop'
 require 'web_translate_it'
 
 show_commands = <<-EOS
-A CLI for syncing files with WebTranslateIt.com
-
 Usage: wti <command> [options]+ <filename>
 
 The most commonly used wti commands are:
-
-pull        Pull target language file(s)
-push        Push master language file(s)
-match       Display matching of local files with File Manager
-add         Create and push a new master language file
-rm          Delete a master language file from a project
-addlocale   Add a new locale to the project
-rmlocale    Delete a locale from a project
-status      Fetch and display project statistics
-init        Configure your project to sync
+   pull        Pull target language file(s)
+   push        Push master language file(s)
+   match       Display matching of local files with File Manager
+   add         Create and push a new master language file
+   rm          Delete a master language file from a project
+   addlocale   Add a new locale to the project
+   rmlocale    Delete a locale from a project
+   status      Fetch and display project statistics
+   init        Configure your project to sync
 
 See `wti <command> --help` for more information on a specific command.
 
 [options] are:
 EOS
 
-SUB_COMMANDS = %w(pull push match add addlocale server status st init)
+SUB_COMMANDS = %w(pull push match add addlocale status st init)
 global_options = Trollop::options do
   stop_on SUB_COMMANDS
   banner show_commands
-  version "Web Translate It v#{WebTranslateIt::Util.version}"
+  version "wti version #{WebTranslateIt::Util.version}"
 end
 
 command = ARGV.shift # get the subcommand
@@ -84,17 +81,6 @@ EOS
       banner "Delete a locale from the project"
       opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
     end
-  when "server"
-    Trollop::options do
-      banner <<-EOS
-Deprecated, used to start a synchronisation server.
-`gem install web_translate_it_server` and run `wti-server` instead.
-[options] are:
-EOS
-      opt :port, "Run server on a specific port", :default => 4000, :short => "-p"
-      opt :host, "Run server on a specific host", :default => "0.0.0.0", :short => "-h"
-      opt :config, "Path to a translation.yml file", :short => "-c", :default => ".wti"
-    end
   when "status"
     Trollop::options do
       banner "Fetch and display project statistics"

data/history.md

@@ -1,4 +1,10 @@
-## Edge
+## Version 2.0.0.rc3 / 2012-04-19
+
+* Remove deprecated `wti server`.
+* Reword command help and output.
+* Rework String, Translation, Term and TermTranslation refactoring. Now using a connection persisted as a class instance. See connection.rb. This makes for a nicer syntax.
+
+## Version 2.0.0.rc2 / 2012-04-16
 
 * Backport of compatibility fix for ruby 1.8.7 from 1.x serie.
 * Fix issue with new version system, which broke the gem. #86

data/lib/web_translate_it.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'web_translate_it/connection'
 require 'web_translate_it/util'
 require 'web_translate_it/util/array_util'
 require 'web_translate_it/util/string_util'
@@ -21,7 +22,7 @@ module WebTranslateIt
     locale = I18n.locale.to_s
     return if config.ignore_locales.include?(locale)
     config.logger.debug { "➔  Fetching #{locale.upcase} language file(s) from Web Translate It…" } if config.logger
-    WebTranslateIt::Util.http_connection do |http|
+    WebTranslateIt::Connection.new(config.api_key) do |http|
       config.files.find_all{ |file| file.locale == locale }.each do |file|
         response = file.fetch(http)
         config.logger.debug { "➔  Web Translate It response: #{response}" } if config.logger

data/lib/web_translate_it/command_line.rb

@@ -13,12 +13,10 @@ module WebTranslateIt
       end
       self.send(command)
     end
-        
+    
     def pull
       STDOUT.sync = true
       `#{configuration.before_pull}` if configuration.before_pull
-      puts StringUtil.titleize("Pulling files")
-
       # Selecting files to pull
       files = []
       fetch_locales_to_pull.each do |locale|
@@ -28,14 +26,14 @@ module WebTranslateIt
         puts "No files to pull."
       else
         # Now actually pulling files
+        puts "# Pulling files"
         time = Time.now
         threads = []
         n_threads = (files.count.to_f/3).ceil >= 20 ? 20 : (files.count.to_f/3).ceil
-        puts "Using up to #{n_threads} threads"
         ArrayUtil.chunk(files, n_threads).each do |file_array|
           unless file_array.empty?
             threads << Thread.new(file_array) do |file_array|
-              WebTranslateIt::Util.http_connection do |http|
+              WebTranslateIt::Connection.new(configuration.api_key) do |http|
                 file_array.each do |file|
                   file.fetch(http, command_options.force)
                 end
@@ -45,7 +43,7 @@ module WebTranslateIt
         end
         threads.each { |thread| thread.join }
         time = Time.now - time
-        puts "Pulled #{files.count} files at #{(files.count/time).round} files/sec."
+        puts "Pulled #{files.count} files at #{(files.count/time).round} files/sec, using #{n_threads} threads."
         `#{configuration.after_pull}` if configuration.after_pull
       end
     end
@@ -53,8 +51,8 @@ module WebTranslateIt
     def push
       STDOUT.sync = true
       `#{configuration.before_push}` if configuration.before_push
-      puts StringUtil.titleize("Pushing files")
-      WebTranslateIt::Util.http_connection do |http|
+      puts "# Pushing files"
+      WebTranslateIt::Connection.new(configuration.api_key) do |http|
         fetch_locales_to_push(configuration).each do |locale|
           configuration.files.find_all{ |file| file.locale == locale }.sort{|a,b| a.file_path <=> b.file_path} .each do |file|
             file.upload(http, command_options[:merge], command_options.ignore_missing, command_options.label, command_options.low_priority, command_options[:minor], command_options.force)
@@ -67,11 +65,11 @@ module WebTranslateIt
     def add
       STDOUT.sync = true
       if parameters == []
-        puts StringUtil.failure("No master file given.")
-        puts "Usage: wti add master_file_1 master_file_2 ..."
+        puts StringUtil.failure("Error: You must provide the path to the master file to add.")
+        puts "Usage: wti add path/to/master_file_1 path/to/master_file_2 ..."
         exit
       end
-      WebTranslateIt::Util.http_connection do |http|
+      WebTranslateIt::Connection.new(configuration.api_key) do |http|
 	      added = configuration.files.find_all{ |file| file.locale == configuration.source_locale}.collect {|file| File.expand_path(file.file_path) }.to_set
         parameters.reject{ |param| added.include?(File.expand_path(param))}.each do |param|
           file = TranslationFile.new(nil, param, nil, configuration.api_key)
@@ -84,13 +82,13 @@ module WebTranslateIt
     def rm
       STDOUT.sync = true
       if parameters == []
-        puts StringUtil.failure("No master file given.")
-        puts "Usage: wti rm master_file_1 master_file_2 ..."
+        puts StringUtil.failure("Error: You must provide the path to the master file to remove.")
+        puts "Usage: wti path/to/rm master_file_1 path/to/master_file_2 ..."
         exit
       end
-      WebTranslateIt::Util.http_connection do |http|
+      WebTranslateIt::Connection.new(configuration.api_key) do |http|
         parameters.each do |param|
-          if Util.ask_yes_no("Are you certain you want to delete the master file #{param} and its attached target files and translations?", false)
+          if Util.ask_yes_no("Are you sure you want to delete the master file #{param}?\nThis will also delete its target files and translations.", false)
             configuration.files.find_all{ |file| file.file_path == param }.each do |master_file|
               master_file.delete(http)
               # delete files
@@ -108,31 +106,35 @@ module WebTranslateIt
     def addlocale
       STDOUT.sync = true
       if parameters == []
-        puts StringUtil.failure("No locale code given.")
-        puts "Usage: wti addlocale locale_code_1 locale_code_2 ..."
+        puts StringUtil.failure("Locale code missing.")
+        puts "Usage: wti addlocale fr es ..."
         exit
       end
       parameters.each do |param|
-        print StringUtil.success("Adding locale #{param}... ")
-        puts WebTranslateIt::Project.create_locale(configuration.api_key, param)
+        print StringUtil.success("Adding locale #{param.upcase}... ")
+        WebTranslateIt::Connection.new(configuration.api_key) do
+          puts WebTranslateIt::Project.create_locale(param)
+        end
+        puts "Done."
       end
-      puts "Done!"
     end
     
     def rmlocale
       STDOUT.sync = true
       if parameters == []
-        puts StringUtil.failure("No locale code given.")
-        puts "Usage: wti rmlocale locale_code_1 locale_code_2 ..."
+        puts StringUtil.failure("Error: You must provide the locale code to remove.")
+        puts "Usage: wti rmlocale fr es ..."
         exit
       end
       parameters.each do |param|
-        if Util.ask_yes_no("Are you certain you want to delete the locale #{param} and its attached target files and translations?", false)
-          print StringUtil.success("Deleting locale #{param}... ")
-          puts WebTranslateIt::Project.delete_locale(configuration.api_key, param)
+        if Util.ask_yes_no("Are you certain you want to delete the locale #{param.upcase}?\nThis will also delete its files and translations.", false)
+          print StringUtil.success("Deleting locale #{param.upcase}... ")
+          WebTranslateIt::Connection.new(configuration.api_key) do |http|
+            puts WebTranslateIt::Project.delete_locale(param)
+          end
+          puts "Done."
         end
       end
-      puts "Done!"
     end
         
     def init
@@ -147,12 +149,11 @@ module WebTranslateIt
       end
       File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
       puts ""
-      puts "Done! You can now use `wti` to push and pull your language files."
+      puts "Your project was successfully setup. You can now use `wti` to push and pull your language files."
       puts "Check `wti --help` for help."
     end
     
     def match
-      puts StringUtil.titleize("Matching local files with File Manager")
       configuration.files.find_all{ |mf| mf.locale == configuration.source_locale }.each do |master_file|
         if !File.exists?(master_file.file_path)
           puts StringUtil.failure(master_file.file_path) + " (#{master_file.locale})"
@@ -179,21 +180,10 @@ module WebTranslateIt
         stale = true if values['stale']
       end
       if stale
-        self.status if Util.ask_yes_no("Some of these stats are out of date. Would you like to refresh?", true)
+        self.status if Util.ask_yes_no("Some of these stats are outdated. Would you like to refresh?", true)
       end
     end
-    
-    def server
-      puts "This feature is deprecated and was extracted to a separate gem,"
-      puts "    `web_translate_it_server`."
-      puts "To use it, run `gem install web_translate_it_server`"
-      puts "and run the server with `wti-server`."
-    end
-    
-    def method_missing(m, *args, &block)
-      puts "wti: '#{m}' is not a wti command. See 'wti --help'."
-    end
-        
+                
     def fetch_locales_to_pull
       if command_options.locale
         locales = command_options.locale.split

data/lib/web_translate_it/configuration.rb

@@ -10,7 +10,8 @@ module WebTranslateIt
   class Configuration
     require 'yaml'
     require 'fileutils'
-    attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales, :logger, :before_pull, :after_pull, :before_push, :after_push
+    attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales
+    attr_accessor :logger, :before_pull, :after_pull, :before_push, :after_push
     
     # Load configuration file from the path.
     def initialize(root_path = Rails.root, path_to_config_file = ".wti")

data/lib/web_translate_it/connection.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+module WebTranslateIt
+  class Connection
+    require 'net/http'
+    require 'net/https'
+    require 'uri'
+    require 'ostruct'
+    
+    @@api_key = nil
+    @@http_connection = nil
+    
+    #
+    # Initialize and yield a HTTPS Keep-Alive connection to WebTranslateIt.com
+    #
+    # Usage:
+    #
+    # WebTranslateIt::Connection.new(api_key) do
+    #   # do something with Connection.api_key and Connection.http_connection
+    # end
+    #
+    # Or:
+    #
+    # WebTranslateIt::Connection.new(api_key) do |http_connection|
+    #   http_connection.request(request)
+    # end
+    #
+    def initialize(api_key)
+      @@api_key = api_key
+      proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
+      http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
+      http.use_ssl      = true
+      http.open_timeout = http.read_timeout = 30
+      begin
+        http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
+        if File.exists?('/etc/ssl/certs') # Ubuntu
+          http.ca_path = '/etc/ssl/certs'
+        else
+          http.ca_file = File.expand_path('cacert.pem', __FILE__)
+        end
+        @@http_connection = http.start
+        yield @@http_connection if block_given?
+      rescue OpenSSL::SSL::SSLError
+        puts "Unable to verify SSL certificate."
+        http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
+        http.use_ssl      = true
+        http.open_timeout = http.read_timeout = 30
+        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+        @@http_connection = http.start
+        yield @@http_connection if block_given?
+      end
+    end
+    
+    def self.http_connection
+      @@http_connection
+    end
+    
+    def self.api_key
+      @@api_key
+    end
+  end
+end
+

data/lib/web_translate_it/project.rb

@@ -4,7 +4,7 @@ module WebTranslateIt
     
     def self.fetch_info(api_key)
       begin
-        WebTranslateIt::Util.http_connection do |http|
+        WebTranslateIt::Connection.new(api_key) do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
           request.add_field("X-Client-Name", "web_translate_it")
           request.add_field("X-Client-Version", WebTranslateIt::Util.version)
@@ -26,11 +26,11 @@ module WebTranslateIt
     
     def self.fetch_stats(api_key)
       begin
-        WebTranslateIt::Util.http_connection do |http|
+        WebTranslateIt::Connection.new(api_key) do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}/stats.yaml")
           request.add_field("X-Client-Name", "web_translate_it")
           request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-          Util.handle_response(http.request(request), true)
+          return 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."
@@ -39,15 +39,13 @@ module WebTranslateIt
       end
     end
     
-    def self.create_locale(api_key, locale_code)
+    def self.create_locale(locale_code)
       begin
-        WebTranslateIt::Util.http_connection do |http|
-          request = Net::HTTP::Post.new("/api/projects/#{api_key}/locales")
-          request.add_field("X-Client-Name", "web_translate_it")
-          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-          request.set_form_data({ 'id' => locale_code }, ';')
-          Util.handle_response(http.request(request), true)
-        end
+        request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/locales")
+        request.add_field("X-Client-Name", "web_translate_it")
+        request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+        request.set_form_data({ 'id' => locale_code }, ';')
+        Util.handle_response(Connection.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)
@@ -55,14 +53,12 @@ module WebTranslateIt
       end
     end
     
-    def self.delete_locale(api_key, locale_code)
+    def self.delete_locale(locale_code)
       begin
-        WebTranslateIt::Util.http_connection do |http|
-          request = Net::HTTP::Delete.new("/api/projects/#{api_key}/locales/#{locale_code}")
-          request.add_field("X-Client-Name", "web_translate_it")
-          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-          Util.handle_response(http.request(request), true)
-        end
+        request = Net::HTTP::Delete.new("/api/projects/#{Connection.api_key}/locales/#{locale_code}")
+        request.add_field("X-Client-Name", "web_translate_it")
+        request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+        Util.handle_response(Connection.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)

data/lib/web_translate_it/string.rb

@@ -1,29 +1,26 @@
 # encoding: utf-8
 module WebTranslateIt
   class String
-    require 'net/https'
     require 'json'
     
-    attr_accessor :api_key, :id, :key, :plural, :type, :dev_comment, :word_count, :status, :category, :label, :file,
+    attr_accessor :id, :key, :plural, :type, :dev_comment, :word_count, :status, :category, :label, :file,
                   :created_at, :updated_at, :translations, :new_record
     
     # Initialize a new WebTranslateIt::String
-    # The only mandatory parameter is `api_key`
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::String.new('secret_api_token', { "key" => "product_name_123" })
+    #   WebTranslateIt::String.new({ "key" => "product_name_123" })
     #
     # to instantiate a new String without any text.
     #
     #   translation_en = WebTranslateIt::Translation.new({ "locale" => "en", "text" => "Hello" })
     #   translation_fr = WebTranslateIt::Translation.new({ "locale" => "fr", "text" => "Bonjour" })
-    #   WebTranslateIt::String.new('secret_api_token', { "key" => "product_name_123", "translations" => [translation_en, translation_fr]})
+    #   WebTranslateIt::String.new({ "key" => "product_name_123", "translations" => [translation_en, translation_fr]})
     #
     # to instantiate a new String with a source and target translation.
     
-    def initialize(api_key, params = {})
-      self.api_key      = api_key
+    def initialize(params = {})
       self.id           = params["id"] || nil
       self.key          = params["key"] || nil
       self.plural       = params["plural"] || nil
@@ -41,12 +38,11 @@ module WebTranslateIt
     end
     
     # Find a String based on filters
-    # Needs a HTTPS Connection
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::Util.http_connection do |connection|
-    #     strings = WebTranslateIt::String.find_all(connection, 'secret_api_token', { "key" => "product_name_123" })
+    #   WebTranslateIt::Connection.new('secret_api_token') do
+    #     strings = WebTranslateIt::String.find_all({ "key" => "product_name_123" })
     #   end
     #
     #   puts strings.inspect #=> An array of WebTranslateIt::String objects
@@ -55,8 +51,8 @@ module WebTranslateIt
     #
     # TODO: Implement pagination
     
-    def self.find_all(http_connection, api_key, params = {})
-      url = "/api/projects/#{api_key}/strings.yaml"
+    def self.find_all(params = {})
+      url = "/api/projects/#{Connection.api_key}/strings.yaml"
       url += '?' + HashUtil.to_params("filters" => params) unless params.empty?
 
       request = Net::HTTP::Get.new(url)
@@ -64,10 +60,10 @@ module WebTranslateIt
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
 
       begin
-        response = Util.handle_response(http_connection.request(request), true)
+        response = Util.handle_response(Connection.http_connection.request(request), true)
         strings = []
         YAML.load(response).each do |string_response|
-          string = WebTranslateIt::String.new(api_key, string_response)
+          string = WebTranslateIt::String.new(string_response)
           string.new_record = false
           strings.push(string)
         end
@@ -80,12 +76,11 @@ module WebTranslateIt
     end
     
     # Find a String based on its ID
-    # Needs a HTTPS Connection
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::Util.http_connection do |connection|
-    #     string = WebTranslateIt::String.find(connection, 'secret_api_token', 1234)
+    #   WebTranslateIt::Connection.new('secret_api_token') do
+    #     string = WebTranslateIt::String.find(1234)
     #   end
     #
     #   puts string.inspect #=> A WebTranslateIt::String object
@@ -93,15 +88,15 @@ module WebTranslateIt
     # to find and instantiate the String which ID is `1234`.
     #
     
-    def self.find(http_connection, api_key, id)
-      request = Net::HTTP::Get.new("/api/projects/#{api_key}/strings/#{id}.yaml")
+    def self.find(id)
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}.yaml")
       request.add_field("X-Client-Name", "web_translate_it")
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
 
       begin
-        response = http_connection.request(request)
+        response = Connection.http_connection.request(request)
         return nil if response.code.to_i == 404
-        string = WebTranslateIt::String.new(api_key, YAML.load(response.body))
+        string = WebTranslateIt::String.new(YAML.load(response.body))
         string.new_record = false
         return string
       rescue Timeout::Error
@@ -112,43 +107,37 @@ module WebTranslateIt
     end
     
     # Update or create a String to WebTranslateIt.com
-    # Needs a HTTPS Connection
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::Util.http_connection do |connection|
-    #     string = WebTranslateIt::String.find(connection, 'secret_api_token', 1234)
+    #   WebTranslateIt::Connection.new('secret_api_token') do
+    #     string = WebTranslateIt::String.find(1234)
     #     string.status = "status_obsolete"
-    #     string.save(http_connection)
+    #     string.save
     #   end
     #
     
-    def save(http_connection)
-      if self.new_record
-        self.create(http_connection)
-      else
-        self.update(http_connection)
-      end
+    def save
+      self.new_record ? self.create : self.update
     end
     
     # Delete a String on WebTranslateIt.com
-    # Needs a HTTPS Connection
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::Util.http_connection do |connection|
-    #     string = WebTranslateIt::String.find(connection, 'secret_api_token', 1234)
-    #     string.delete(http_connection)
+    #   WebTranslateIt::Connection.new('secret_api_token') do
+    #     string = WebTranslateIt::String.find(1234)
+    #     string.delete
     #   end
     #
     
-    def delete(http_connection)
-      request = Net::HTTP::Delete.new("/api/projects/#{self.api_key}/strings/#{self.id}")
+    def delete
+      request = Net::HTTP::Delete.new("/api/projects/#{Connection.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)
+        Util.handle_response(Connection.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)
@@ -157,27 +146,26 @@ module WebTranslateIt
     end
     
     # Gets a Translation for a String
-    # Needs a HTTPS Connection
     #
     # Implementation Example:
     #
-    #   WebTranslateIt::Util.http_connection do |connection|
-    #     string = WebTranslateIt::String.find(connection, 'secret_api_token', 1234)
-    #     puts string.translation_for(connection, "fr") #=> A Translation object
+    #   WebTranslateIt::Connection.new('secret_api_token') do
+    #     string = WebTranslateIt::String.find(1234)
+    #     puts string.translation_for("fr") #=> A Translation object
     #   end
     #
     
-    def translation_for(http_connection, locale)
+    def translation_for(locale)
       return self.translations unless self.translations == []
-      request = Net::HTTP::Get.new("/api/projects/#{self.api_key}/strings/#{self.id}/locales/#{locale}/translations.yaml")
+      request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{self.id}/locales/#{locale}/translations.yaml")
       request.add_field("X-Client-Name", "web_translate_it")
       request.add_field("X-Client-Version", WebTranslateIt::Util.version)
 
       begin
-        response = Util.handle_response(http_connection.request(request), true)
+        response = Util.handle_response(Connection.http_connection.request(request), true)
         hash = YAML.load(response)
         return nil if hash.empty?
-        translation = WebTranslateIt::Translation.new(api_key, hash)
+        translation = WebTranslateIt::Translation.new(hash)
         return translation
         
       rescue Timeout::Error
@@ -190,11 +178,10 @@ module WebTranslateIt
     protected
     
     # Save the changes made to a String to WebTranslateIt.com
-    # Needs a HTTPS Connection
     #
     
-    def update(http_connection)
-      request = Net::HTTP::Put.new("/api/projects/#{self.api_key}/strings/#{self.id}.yaml")
+    def update
+      request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/strings/#{self.id}.yaml")
       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")
@@ -202,11 +189,11 @@ module WebTranslateIt
       
       self.translations.each do |translation|
         translation.string_id = self.id
-        translation.save(http_connection)
+        translation.save
       end
       
       begin
-        Util.handle_response(http_connection.request(request), true)
+        Util.handle_response(Connection.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)
@@ -215,18 +202,17 @@ module WebTranslateIt
     end
     
     # Create a new String to WebTranslateIt.com
-    # Needs a HTTPS Connection
     #
     
-    def create(http_connection)
-      request = Net::HTTP::Post.new("/api/projects/#{self.api_key}/strings")
+    def create
+      request = Net::HTTP::Post.new("/api/projects/#{Connection.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 = self.to_json(true)
 
       begin
-        response = YAML.load(Util.handle_response(http_connection.request(request), true))
+        response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true))
         self.id = response["id"]
         self.new_record = false
         return true
@@ -247,9 +233,7 @@ module WebTranslateIt
         "status" => status,
         "label" => label,
         "category" => category,
-        "file" => {
-          "id" => file
-        }
+        "file" => file
       }
       if self.translations.any? && with_translations
         hash.update({ "translations" => [] })