web_translate_it 1.5.2 → 1.6.0

data/README.md

@@ -3,10 +3,10 @@
 [Homepage](https://webtranslateit.com) | 
 [RDocs](http://yardoc.org/docs/AtelierConvivialite-webtranslateit) | 
 [Metrics](http://getcaliper.com/caliper/project?repo=git%3A%2F%2Fgithub.com%2FAtelierConvivialite%2Fwebtranslateit.git) | 
-[Tests](http://runcoderun.com/AtelierConvivialite/webtranslateit/builds/74a78c2b382cb1856fa0964ed4ad372b50872844/1/ruby_186) | 
+[Bugs](http://github.com/AtelierConvivialite/webtranslateit/issues) | 
 [Example app](http://github.com/AtelierConvivialite/rails_example_app)
 
-This is a gem providing tools to integrate your software to translate with [Web Translate It](https://webtranslateit.com), a web-based translation hub.
+This is a gem providing tools to sync your software’s 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)
 
@@ -20,8 +20,8 @@ This gem provides your app with:
 
     gem install web_translate_it
     
-That’s it! At this point you have the Web Translate It executable.
-If your project if already set up on Web Translate It, run `wti autoconf` to generate the configuration file.
+At this point you should have the `wti` executable working.
+If your project if already set up on Web Translate It, open a terminal and type `wti autoconf` to generate the configuration file.
 
 Run `wti --help` to see the usage:
 
@@ -55,7 +55,7 @@ This gem includes some rake tasks and a rack middleware to integrate Web Transla
 
     `rake gems:install`
 
-* Copy/paste your api key from Web Translate It and run:
+* Copy/paste your API key from Web Translate It and run:
 
     `script/generate webtranslateit --api-key your_key_here`
     
@@ -94,12 +94,12 @@ Please open a discussion on [our support site](http://help.webtranslateit.com) i
 
 # Acknowledgement
 
-* The executable is very much inspired from the awesome [Gemcutter](http://gemcutter.org/) commands,
-* The Rails generator has been pinched from [Hoptoad Notifier](http://github.com/thoughtbot/hoptoad_notifier/).
+* The executable’s commands are very much inspired from [Gemcutter](http://gemcutter.org/),
+* The Rails generator was pinched from [Hoptoad Notifier](http://github.com/thoughtbot/hoptoad_notifier/).
 
 # What is Web Translate It anyway?
 
-Web Translate It is a web-based translation hub to collaboratively translate software.
+Web Translate It is a web-based translation tool to collaboratively translate software.
 
 To learn more about it, please visit our [tour page](https://webtranslateit.com/tour).
 

data/examples/locale.rb

@@ -5,8 +5,8 @@ class Locale
 
   def call(env)
     req = Rack::Request.new(env)
-    I18n.locale = req.params['locale']
+    I18n.locale = req.params['locale'] || :en
     status, headers, response = @app.call(env)
-    [status, headers, response.body]
+    [status, headers, response]
   end
 end

data/examples/translation.yml

@@ -1,18 +1,6 @@
 # The Project API Token from Web Translate It
 api_key: SECRET
 
-# The locales not to sync with Web Translate It.
-# Pass an array of string, or an array of symbols, a string or a symbol.
+# Optional: locales not to sync with Web Translate It.
 # eg. [:en, :fr] or just 'en'
-ignore_locales: :en
-
-# A list of files to translate
-# You can name your language files as you want, as long as the locale name match the
-# locale name you set in Web Translate It, and that the different language files names are
-# differenciated by their locale name.
-# For example, if you set to translate a project in en_US in WTI, you should use the locale en_US in your app
-#
-# wti_id is the file id from Web Translate It.
-files:
-  wti_id: config/locales/file1_[locale].yml
-  wti_id: config/locales/file2_[locale].yml
+# ignore_locales: :en

data/generators/webtranslateit/templates/translation.yml

@@ -1,17 +1,6 @@
 # The Project API Token from Web Translate It
 api_key: '<%= api_key %>'
 
-# The locales not to sync with Web Translate It.
-# Pass an array of string, or an array of symbols, a string or a symbol.
+# Optional: locales not to sync with Web Translate It.
 # eg. [:en, :fr] or just 'en'
-ignore_locales: '<%= project["source_locale"]["code"] %>'
-
-# A list of files to translate
-# You can name your language files as you want, as long as the locale name match the
-# locale name you set in Web Translate It, and that the different language files names are
-# differenciated by their locale name.
-# For example, if you set to translate a project in en_US in WTI, you should use the locale en_US in your app
-#
-# wti_id is the file id from Web Translate It.
-files:
-<% project["project_files"].each do |project_file| -%><% if project_file["master"] -%>  <%= project_file["id"] %>: config/locales/<%= project_file["name"].gsub(project["source_locale"]["code"], "[locale]") %><% end %><% end -%>
+# ignore_locales: '<%= project["source_locale"]["code"] %>'

data/history.md

@@ -1,3 +1,13 @@
+## Version 1.6.0 /2010-03-22
+
+* Bug fix: Encoding problem with Ruby 1.9 (Romain Sempé)
+* Bug fix: Make rake task create locale directory if it doesn’t exist yet. (Romain Sempé)
+* Bug fix: Make the list of ignore locales work for wti pull (it won’t pull the locales you ignore)
+
+* **Breaking update**: The project configuration changed and doesn’t include a list of master language files any longer.
+  This makes configuration much simpler. However you must configure the exact file path of your files in
+  the File Manager. This allows much more flexibility for the choice of your language file names. Ref #22.
+
 ## Version 1.5.2 /2010-03-13
 
 * Only added a man page.

data/lib/web_translate_it.rb

@@ -6,14 +6,15 @@ require File.join(File.dirname(__FILE__), 'web_translate_it', 'command_line')
 require File.join(File.dirname(__FILE__), '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} translations to Web Translate It" } if config.logger
-    config.files.each do |file|
-      response = file.fetch(locale)
-      config.logger { "Web Translate It response: #{response}" } if config.logger
+    config.logger.debug { "➔  Fetching #{locale.upcase} language file(s) from Web Translate It…" } if config.logger
+    config.files.find_all{ |file| file.locale == locale }.each do |file|
+      response = file.fetch
+      config.logger.debug { "➔  Web Translate It response: #{response}" } if config.logger
     end
   end
 end

data/lib/web_translate_it/command_line.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module WebTranslateIt
   class CommandLine
     require 'fileutils'
@@ -44,22 +45,20 @@ OPTION
         
     def self.pull
       configuration = fetch_configuration
-      locales = fetch_locales_to_pull(configuration)
-      configuration.files.each do |file|
-        locales.each do |locale|
-          puts "Pulling #{file.file_path_for_locale(locale)}…"
-          file.fetch(locale, ARGV.index('--force'))
+      fetch_locales_to_pull(configuration).each do |locale|
+        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
+          puts "Pulling #{file.file_path}…"
+          puts file.fetch(ARGV.index('--force'))
         end
       end
     end
     
     def self.push
       configuration = fetch_configuration
-      locales = fetch_locales_to_push(configuration)
-      configuration.files.each do |file|
-        locales.each do |locale|
-          puts "Pushing #{file.file_path_for_locale(locale)}…"
-          file.upload(locale)
+      fetch_locales_to_push(configuration).each do |locale|
+        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
+          puts "Pushing #{file.file_path}…"
+          puts file.upload
         end
       end
     end
@@ -76,11 +75,19 @@ OPTION
       path = STDIN.gets.strip
       path = "config/translation.yml" if path == ""
       FileUtils.mkpath(path.split('/')[0..path.split('/').size-1])
-      puts "Where are you language files located? (Default: `config/locales/`)"
-      path_to_locale_files = STDIN.gets.strip
-      path_to_locale_files = "config/locales/" if path_to_locale_files == ""
-      FileUtils.mkpath(path.split('/')[0..path.split('/').size-1])
-      File.open(path, 'w'){ |file| file << generate_configuration(api_key, path_to_locale_files) }
+      project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+      project_info = project['project']
+      File.open(path, 'w'){ |file| file << generate_configuration(api_key, project_info) }
+      project_info['project_files'].each do |file|
+        if !File.exists?(file['name'])
+          puts "Could not find file `#{file['name']}`."
+          puts "Please check the correct full path is specified in the File Manager"
+          puts "https://webtranslateit.com/projects/#{project_info['id']}/files"
+        else
+          puts "Found #{file['name']}."
+        end
+      end
+      puts ""
       puts "Done! You can now use `wti` to push and pull your language files."
       puts "Check `wti --help` for more information."
     end
@@ -119,6 +126,7 @@ OPTION
     def self.fetch_locales_to_pull(configuration)
       if (index = ARGV.index('-l') || ARGV.index('--locale')).nil?
         locales = configuration.target_locales
+        configuration.ignore_locales.each{ |locale_to_delete| locales.delete(locale_to_delete) }
       else
         locales = [ARGV[index+1]]
       end
@@ -136,30 +144,14 @@ OPTION
       return locales.uniq
     end
     
-    def self.generate_configuration(api_key, path_to_locale_files)
-      project_info = YAML.load WebTranslateIt::Project.fetch_info(api_key)
-      project = project_info['project']
+    def self.generate_configuration(api_key, project_info)
       file = <<-FILE
 api_key: #{api_key}
 
-# The locales not to sync with Web Translate It.
-# Pass an array of string, or an array of symbols, a string or a symbol.
+# Optional: locales not to sync with Web Translate It.
 # eg. [:en, :fr] or just 'en'
-ignore_locales: '#{project["source_locale"]["code"]}'
-
-# A list of files to translate
-# You can name your language files as you want, as long as the locale name match the
-# locale name you set in Web Translate It, and that the different language files names are
-# differenciated by their locale name.
-# For example, if you set to translate a project in en_US in WTI, you should use the locale en_US in your app
-#
-files:
+# ignore_locales: '#{project_info["source_locale"]["code"]}'
 FILE
-      project["project_files"].each do |project_file|
-        if project_file["master"]
-          file << "  #{project_file["id"]}: #{path_to_locale_files}" + project_file["name"].gsub(project["source_locale"]["code"], "[locale]") + "\n"
-        end
-      end
       return file
     end
   end

data/lib/web_translate_it/configuration.rb

@@ -12,31 +12,44 @@ module WebTranslateIt
     attr_accessor :path, :api_key, :source_locale, :target_locales, :files, :ignore_locales, :logger
     
     # Load configuration file from the path.
-    def initialize(root_path=RAILS_ROOT, path_to_config="config/translation.yml")
+    def initialize(root_path = Rails.root, path_to_config_file = "config/translation.yml")
       self.path           = root_path
-      configuration       = YAML.load_file(File.join(root_path, path_to_config))
       self.logger         = logger
+      configuration       = YAML.load_file(File.join(self.path, path_to_config_file))
       self.api_key        = configuration['api_key']
-      self.files          = []
-      self.ignore_locales = configuration['ignore_locales'].to_a.map{ |locale| locale.to_s }
-      configuration['files'].each do |file_id, file_path|
-        self.files.push(TranslationFile.new(file_id, root_path + '/' + file_path, api_key))
-      end
-      set_locales
+      project_info        = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+      set_locales_to_ignore(configuration)
+      set_files(project_info['project'])
+      set_locales(project_info['project'])
     end
     
-    # Makes an API request to fetch the list of the different locales for a project.
+    # Set the project locales from the Project API.
     # Implementation example:
     #
     #   configuration = WebTranslateIt::Configuration.new
     #   locales = configuration.locales # returns an array of locales: ['en', 'fr', 'es', ...]
-    def set_locales
-      project_info = YAML.load WebTranslateIt::Project.fetch_info(api_key)
-      project = project_info['project']
+    def set_locales(project)
       self.source_locale  = project['source_locale']['code']
       self.target_locales = project['target_locales'].map{|locale| locale['code']}
     end
     
+    # Set the project files from the Project API.
+    # Implementation example:
+    #
+    #   configuration = WebTranslateIt::Configuration.new
+    #   files = configuration.files # returns an array of TranslationFile
+    def set_files(project)
+      self.files = []
+      project['project_files'].each do |project_file|
+        self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key)
+      end
+    end
+    
+    # Set locales to ignore from the configuration file, if set.
+    def set_locales_to_ignore(configuration)
+      self.ignore_locales = Array(configuration['ignore_locales']).map{ |locale| locale.to_s }
+    end
+    
     # Convenience method which returns the endpoint for fetching a list of locales for a project.
     def api_url
       "/api/projects/#{api_key}.yaml"

data/lib/web_translate_it/project.rb

@@ -4,34 +4,14 @@ module WebTranslateIt
     def self.fetch_info(api_key)
       WebTranslateIt::Util.http_connection do |http|
         request  = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
-        response = http.request(request)
-        if response.code.to_i >= 400 and response.code.to_i < 500
-          puts "We had a problem connecting to Web Translate It with this API key."
-          puts "Make sure it is correct."
-          exit
-        elsif response.code.to_i >= 500
-          puts "Web Translate It is temporarily unavailable. Please try again shortly."
-          exit
-        else
-          return response.body
-        end
+        Util.handle_response(http.request(request), true)
       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")
-        response = http.request(request)
-        if response.code.to_i >= 400 and response.code.to_i < 500
-          puts "We had a problem connecting to Web Translate It with this API key."
-          puts "Make sure it is correct."
-          exit
-        elsif response.code.to_i >= 500
-          puts "Web Translate It is temporarily unavailable. Please try again shortly."
-          exit
-        else
-          return response.body
-        end
+        Util.handle_response(http.request(request), true)
       end
     end
   end

data/lib/web_translate_it/tasks.rb

@@ -1,31 +1,28 @@
+# encoding: utf-8
 require File.join(File.dirname(__FILE__), '..', 'web_translate_it')
 
 namespace :trans do  
   desc "Fetch translation files from Web Translate It"
   task :fetch, :locale do |task, args|
-    welcome_message
+    WebTranslateIt::Util.welcome_message
     puts "Fetching file for locale #{args.locale}…"
     configuration = WebTranslateIt::Configuration.new
-    configuration.files.each do |file|
-      response_code = file.fetch(args.locale)
-      handle_response(file.file_path_for_locale(args.locale), response_code)
+    configuration.files.find_all{ |file| file.locale == args.locale }.each do |file|
+      puts file.file_path + ": " + file.fetch
     end
   end
   
   namespace :fetch do
     desc "Fetch all the translation files from Web Translate It"
     task :all do
-      welcome_message
+      WebTranslateIt::Util.welcome_message
       configuration = WebTranslateIt::Configuration.new
       locales = configuration.target_locales
-      configuration.ignore_locales.each do |ignore|
-        locales.delete(ignore)
-      end
+      configuration.ignore_locales.each{ |locale_to_ignore| locales.delete(locale_to_ignore) }
       puts "Fetching all files for all locales…"
       locales.each do |locale|
-        configuration.files.each do |file|
-          response_code = file.fetch(locale) 
-          handle_response(file.file_path_for_locale(locale), response_code)
+        configuration.files.find_all{ |file| file.locale == locale }.each do |file|
+          puts file.file_path + " " + file.fetch
         end
       end
     end
@@ -33,24 +30,11 @@ namespace :trans do
   
   desc "Upload the translation files for a locale to Web Translate It"
   task :upload, :locale do |task, args|
-    welcome_message
+    WebTranslateIt::Util.welcome_message
     puts "Uploading file for locale #{args.locale}…"
     configuration = WebTranslateIt::Configuration.new
-    configuration.files.each do |file|
-      response_code = file.upload(args.locale)
-      handle_response(file.file_path_for_locale(args.locale), response_code)
-    end
-  end
-    
-  def handle_response(file_path, response_code)
-    if response_code < 400
-      puts "#{file_path}: #{response_code}, OK"
-    else
-      puts "#{file_path}: #{response_code}, Problem!"
+    configuration.files.find_all{ |file| file.locale == args.locale }.each do |file|
+      puts file.file_path + " " + file.upload
     end
   end
-  
-  def welcome_message
-    puts "Web Translate It v#{WebTranslateIt::Util.version}"
-  end
 end

data/lib/web_translate_it/translation_file.rb

@@ -11,11 +11,12 @@ module WebTranslateIt
     require 'net/http/post/multipart'
     require 'time'
     
-    attr_accessor :id, :file_path, :api_key
+    attr_accessor :id, :file_path, :locale, :api_key
     
-    def initialize(id, file_path, api_key)
+    def initialize(id, file_path, locale, api_key)
       self.id        = id
       self.file_path = file_path
+      self.locale    = locale
       self.api_key   = api_key
     end
     
@@ -26,19 +27,19 @@ module WebTranslateIt
     # Example of implementation:
     #
     #   configuration = WebTranslateIt::Configuration.new
-    #   locale = configuration.locales.first
     #   file = configuration.files.first
-    #   file.fetch(locale) # the first time, will return the content of the language file with a status 200 OK
-    #   file.fetch(locale) # returns nothing, with a status 304 Not Modified
-    #   file.fetch(locale, true) # force to re-download the file, will return the content of the file with a 200 OK
+    #   file.fetch # the first time, will return the content of the language file with a status 200 OK
+    #   file.fetch # returns nothing, with a status 304 Not Modified
+    #   file.fetch(true) # force to re-download the file, will return the content of the file with a 200 OK
     #
-    def fetch(locale, force = false)
+    def fetch(force = false)
       WebTranslateIt::Util.http_connection do |http|
-        request = Net::HTTP::Get.new(api_url(locale))
-        request.add_field('If-Modified-Since', last_modification(file_path_for_locale(locale))) if File.exist?(file_path_for_locale(locale)) and !force
+        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)
-        File.open(file_path_for_locale(locale), 'w'){ |file| file << response.body } if response.code.to_i == 200 and response.body != ''
-        response.code.to_i
+        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)
       end
     end
     
@@ -50,37 +51,31 @@ module WebTranslateIt
     #   configuration = WebTranslateIt::Configuration.new
     #   locale = configuration.locales.first
     #   file = configuration.files.first
-    #   file.upload(locale) # should respond the HTTP code 202 Accepted
+    #   file.upload # should respond the HTTP code 202 Accepted
     #
     # The meaning of the HTTP 202 code is: the request has been accepted for processing, but the processing has not
     # been completed. The request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place.
     # This is due to the fact that language file imports are handled by background processing.
-    def upload(locale)
-      File.open(file_path_for_locale(locale)) do |file|
+    def upload
+      File.open(self.file_path) do |file|
         WebTranslateIt::Util.http_connection do |http|
-          request  = Net::HTTP::Put::Multipart.new(api_url(locale), "file" => UploadIO.new(file, "text/plain", file.path))
-          response = http.request(request)
-          response.code.to_i
+          request  = Net::HTTP::Put::Multipart.new(api_url, "file" => UploadIO.new(file, "text/plain", file.path))
+          Util.handle_response(http.request(request))
         end
       end
     end
-    
-    # Convenience method which returns the file path of a TranslationFile for a given locale.
-    def file_path_for_locale(locale)
-      self.file_path.gsub("[locale]", locale)
-    end
-        
+            
     protected
       
       # Convenience method which returns the date of last modification of a language file.
-      def last_modification(file_path)
-        File.mtime(File.new(file_path, 'r')).rfc2822
+      def last_modification
+        File.mtime(File.new(self.file_path, 'r')).rfc2822
       end
       
       # Convenience method which returns the URL of the API endpoint for a locale.
-      def api_url(locale)
-        "/api/projects/#{api_key}/files/#{self.id}/locales/#{locale}"
+      def api_url
+        "/api/projects/#{self.api_key}/files/#{self.id}/locales/#{self.locale}"
       end
   end
 end

data/lib/web_translate_it/util.rb

@@ -1,5 +1,4 @@
 module WebTranslateIt
-  
   # A few useful functions
   class Util
     
@@ -31,5 +30,23 @@ module WebTranslateIt
       return 0 if total == 0
       ((processed*10)/total).to_f.ceil*10
     end
+    
+    def self.welcome_message
+      puts "Web Translate It v#{WebTranslateIt::Util.version}"
+    end
+    
+    def self.handle_response(response, return_response = false)
+      if response.code.to_i >= 400 and response.code.to_i < 500
+        "We had a problem connecting to Web Translate It with this API key. Make sure it is correct."
+      elsif response.code.to_i >= 500
+        "Web Translate It is temporarily unavailable. Please try again shortly."
+      else
+        if return_response
+          response.body
+        else
+          "#{response.code.to_i} OK"
+        end
+      end
+    end
   end
 end

data/spec/examples/config/translation.yml

@@ -1,15 +1,6 @@
 # The Project API Token from Web Translate It
-api_key: abcd
+api_key: 4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2
 
-# The Master locale is the locale you translate your project from. Web Translate It shouldn’t 
-# attempt to edit these files.
-ignore_locales: en_GB
-
-# A list of files to translate
-# You can name your language files as you want, as long as the locale name match the
-# locale name you set in Web Translate It, and that the different language files names are
-# differenciated by their locale name.
-# For example, if you set to translate a project in en_US in WTI, you should use the locale en_US in your app
-files:
-  - config/locales/file1_[locale].yml
-  - config/locales/file2_[locale].yml
+# Optional: locales not to sync with Web Translate It.
+# eg. [:en, :fr] or just 'en'
+# ignore_locales: :en

data/spec/web_translate_it/configuration_spec.rb

@@ -1,31 +1,64 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe WebTranslateIt::Configuration do
-  before(:each) do
-    WebTranslateIt::Configuration.const_set("RAILS_ROOT", File.dirname(__FILE__) + '/../examples')
-  end
-  
   describe "#initialize" do
     it "should fetch and not blow up" do
+      Rails = OpenStruct.new(:root => Pathname.new(File.dirname(__FILE__) + "/../examples"))
       lambda{ WebTranslateIt::Configuration.new }.should_not raise_error
     end
         
     it "should load the content of the YAML file" do
       config_hash = {
-        "api_key"        => "abcd",
-        "ignore_locales" => "en_GB",
-        "files"          => ["config/locales/file1_[locale].yml", "config/locales/file2_[locale].yml"]
+        "api_key"        => "4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2",
+        "ignore_locales" => "en_GB"
       }
       YAML.should_receive(:load_file).and_return(config_hash)
-      WebTranslateIt::Configuration.new
+      WebTranslateIt::Configuration.new(File.dirname(__FILE__) + '/../..', 'examples/translation.yml')
     end
     
-    it "should assign the API key, autofetch, files and master_locale" do
+    it "should assign the API key, files" do
+      Rails = OpenStruct.new(:root => Pathname.new(File.dirname(__FILE__) + "/../examples"))
       configuration = WebTranslateIt::Configuration.new
-      configuration.api_key.should == 'abcd'
+      configuration.api_key.should == '4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2'
       configuration.files.first.should be_a(WebTranslateIt::TranslationFile)
-      configuration.ignore_locales.should == ['en_GB']
     end
   end
   
+  describe "#set_locales_to_ignore" do
+    before(:each) do
+      Rails = OpenStruct.new(:root => Pathname.new(File.dirname(__FILE__) + "/../examples"))
+      @configuration = WebTranslateIt::Configuration.new
+    end
+      
+    it "should return an array" do
+      config_hash = { 'ignore_locales' => 'en' }
+      @configuration.set_locales_to_ignore(config_hash).should be_a(Array)
+    end
+    
+    it "should not blow up if no locales are given" do
+      config_hash = { 'ignore_locales' => nil }
+      @configuration.set_locales_to_ignore(config_hash).should be_a(Array)
+      @configuration.set_locales_to_ignore(config_hash).should == []
+    end
+    
+    it "should return an array of 2 elements if given array of strings" do
+      config_hash = { 'ignore_locales' => ['en', 'fr'] }
+      @configuration.set_locales_to_ignore(config_hash).should be_a(Array)
+      @configuration.set_locales_to_ignore(config_hash).should == ['en', 'fr']
+    end
+    
+    it "should return an array of 1 element if given a symbol" do
+      config_hash = { 'ignore_locales' => :en }
+      @configuration.set_locales_to_ignore(config_hash).should be_a(Array)
+      @configuration.set_locales_to_ignore(config_hash).should == ['en']
+    end
+    
+    it "should return an array of 2 element if given an array of symbol and string" do
+      config_hash = { 'ignore_locales' => [:en, 'fr'] }
+      @configuration.set_locales_to_ignore(config_hash).should be_a(Array)
+      @configuration.set_locales_to_ignore(config_hash).should == ['en', 'fr']
+    end
+    
+  end
+  
 end

data/spec/web_translate_it/translation_file_spec.rb

@@ -2,15 +2,15 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe WebTranslateIt::TranslationFile do
   before(:each) do
-    @translation_file = WebTranslateIt::TranslationFile.new(1174, "/config/locales/[locale].yml", "04b254da22a6eb301b103f848e469ad494eea47d")
+    @translation_file = WebTranslateIt::TranslationFile.new(2267, "examples/en.yml", 'fr', "4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2")
   end
   
   describe "#initialize" do
     it "should assign id, file_path and api_key" do
-      tr_file = WebTranslateIt::TranslationFile.new(1174, "/config/locales/[locale].yml", "04b254da22a6eb301b103f848e469ad494eea47d")
-      tr_file.id.should == 1174
-      tr_file.file_path.should == "/config/locales/[locale].yml"
-      tr_file.api_key.should == "04b254da22a6eb301b103f848e469ad494eea47d"
+      tr_file = WebTranslateIt::TranslationFile.new(2267, "examples/en.yml", 'fr', "4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2")
+      tr_file.id.should == 2267
+      tr_file.file_path.should == "examples/en.yml"
+      tr_file.api_key.should == "4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2"
     end
   end
   
@@ -19,50 +19,40 @@ describe WebTranslateIt::TranslationFile do
       file = mock(File)
       file.stub(:puts => true, :close => true)
       File.stub(:exist? => true, :mtime => Time.at(0), :new => file)
-      @translation_file.fetch('fr_FR').should == 200
+      @translation_file.fetch.should == 200
     end
     
     it "should prepare a HTTP request and get a 200 OK if the language file is stale using the force download parameter" do
       file = mock(File)
       file.stub(:puts => true, :close => true)
       File.stub(:exist? => true, :mtime => Time.at(0), :new => file)
-      @translation_file.fetch('fr_FR', true).should == 200
+      @translation_file.fetch(true).should == 200
     end
     
     it "should prepare a HTTP request and get a 304 OK if the language file is fresh" do
       file = mock(File)
       file.stub(:puts => true, :close => true)
       File.stub(:exist? => true, :mtime => Time.now, :new => file)
-      @translation_file.fetch('fr_FR').should == 304
+      @translation_file.fetch.should == 304
     end
     
     it "should prepare a HTTP request and get a 200 OK if the language file is fresh using the force download parameter" do
       file = mock(File)
       file.stub(:puts => true, :close => true)
       File.stub(:exist? => true, :mtime => Time.now, :new => file)
-      @translation_file.fetch('fr_FR', true).should == 200
+      @translation_file.fetch(true).should == 200
     end
   end
   
   describe "#upload" do
     it "should prepare a HTTP request and get a 200 OK" do
       @translation_file.stub(:file_path => File.join(File.dirname(__FILE__), '..', 'examples', 'en.yml'))
-      @translation_file.upload('en')
+      @translation_file.upload
     end
     
     it "should fail if the file does not exist" do
       @translation_file.stub(:file_path => File.join('something', 'that', 'does', 'not', 'exist'))
-      lambda { @translation_file.upload('en') }.should raise_error
-    end
-  end
-  
-  describe "#file_path_for_locale" do
-    it "should replace [locale] by the locale passed as a parameter" do
-      @translation_file.file_path_for_locale('fr').should == "/config/locales/fr.yml"
-    end
-    
-    it "should fail if no parameter is given" do
-      lambda { @translation_file.file_path_for_locale }.should raise_error
+      lambda { @translation_file.upload }.should raise_error
     end
   end
 end

data/spec/web_translate_it_spec.rb

@@ -9,7 +9,7 @@ describe WebTranslateIt do
   
   before(:each) do
     WebTranslateIt::I18n.stub(:locale => 'en')
-    WebTranslateIt::Configuration.const_set("RAILS_ROOT", File.dirname(__FILE__) + '/examples')
+    Rails = OpenStruct.new(:root => Pathname.new(File.dirname(__FILE__) + "/examples"))
     @configuration = WebTranslateIt::Configuration.new
     @file = mock(WebTranslateIt::TranslationFile)
     @file.stub(:fetch => true)

data/version.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: web_translate_it
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors: 
 - "\xC3\x89douard Bri\xC3\xA8re"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 +01:00
+date: 2010-03-22 00:00:00 +01:00
 default_executable: wti
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: mg
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.7
-    version: 
 description: A rack middleware and a handful of rake tasks to sync your translations between webtranslateit.com and your rails applications.
 email: edouard@atelierconvivialite.com
 executables: 
@@ -77,7 +67,7 @@ has_rdoc: true
 homepage: https://webtranslateit.com
 licenses: []
 
-post_install_message: 
+post_install_message: "  ************************************************************\n\n    Thank you for installing web_translate_it\n\n    The version 1.6.0 you are upgrading to has some\n    important breaking changes. Please be sure to read\n    this blog post http://bit.ly/aEox3b\n    for useful information about this release.\n\n  ************************************************************\n"
 rdoc_options: 
 - --main
 - README.md