phrase 0.4.1 → 0.4.2

data/.gitignore

@@ -21,5 +21,3 @@ test/version_tmp
 /phrase
 .rspec
 /locales
-/ru.lproj
-/res

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/lib/phrase.rb

@@ -49,6 +49,7 @@ module Phrase
   autoload :ViewHelpers, 'phrase/view_helpers'
 
   require 'phrase/api'
+  require 'phrase/formats'
   require 'phrase/version'
   require 'phrase/engine'
   require 'phrase/backend'

data/lib/phrase/api/client.rb

@@ -84,9 +84,10 @@ class Phrase::Api::Client
     end
   end
   
-  def upload(filename, file_content, tags=[], locale=nil)
+  def upload(filename, file_content, tags=[], locale=nil, format=nil)
     begin
       params = {
+        "file_format" => format,
         "filename" => filename,
         "file_content" => file_content,
         "tags[]" => tags
@@ -94,7 +95,7 @@ class Phrase::Api::Client
       params["locale_name"] = locale unless locale.nil?
       perform_api_request("/translation_keys/upload", :post, params)
     rescue Phrase::Api::Exceptions::ServerError => e
-      raise "File #{filename} could not be uploaded"
+      raise "File #{filename} could not be uploaded (#{e})"
     end
     true
   end
@@ -121,6 +122,7 @@ private
   def display_api_error(response)
     error_message = api_error_message(response)
     $stderr.puts error_message
+    $stderr.puts error_message
   end
 
   def api_error_message(response)
@@ -129,6 +131,12 @@ private
       error = parsed(response.body)["error"]
       if error.class == String
         message = error
+      elsif error.class == Hash
+        error.each_pair do |field, messages|
+          messages.each do |msg|
+            message << "#{msg}"
+          end
+        end
       else
         message = parsed(response.body)["message"]
       end
@@ -151,6 +159,7 @@ private
     end
     response = http_client.request(request)
     code = response.code.to_i
+
     if (code == 200)
       return response.body
     else

data/lib/phrase/delegate.rb

@@ -17,7 +17,11 @@ module Phrase::Delegate
     
   protected
     def decorated_key_name
-      "#{Phrase.prefix}phrase_#{@display_key}#{Phrase.suffix}"
+      "#{Phrase.prefix}phrase_#{normalized_display_key}#{Phrase.suffix}"
+    end
+
+    def normalized_display_key
+      @display_key.gsub("<", "[[[[[[html_open]]]]]]").gsub(">", "[[[[[[html_close]]]]]]")
     end
   end
-end
+end

data/lib/phrase/formats.rb

@@ -0,0 +1,151 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    autoload :Custom, 'phrase/formats/custom'
+    autoload :Json, 'phrase/formats/json'
+    autoload :Csv, 'phrase/formats/csv'
+    autoload :Gettext, 'phrase/formats/gettext'
+    autoload :GettextTemplate, 'phrase/formats/gettext_template'
+    autoload :Ini, 'phrase/formats/ini'
+    autoload :Properties, 'phrase/formats/properties'
+    autoload :PropertiesXml, 'phrase/formats/properties_xml'
+    autoload :Plist, 'phrase/formats/plist'
+    autoload :QtPhraseBook, 'phrase/formats/qt_phrase_book'
+    autoload :QtTranslationSource, 'phrase/formats/qt_translation_source'
+    autoload :Resx, 'phrase/formats/resx'
+    autoload :ResxWindowsphone, 'phrase/formats/resx_windowsphone'
+    autoload :SimpleJson, 'phrase/formats/simple_json'
+    autoload :Strings, 'phrase/formats/strings'
+    autoload :Xml, 'phrase/formats/xml'
+    autoload :Tmx, 'phrase/formats/tmx'
+    autoload :Xliff, 'phrase/formats/xliff'
+    autoload :Yaml, 'phrase/formats/yaml'
+    autoload :YamlSymfony, 'phrase/formats/yaml_symfony'
+    
+    class Base
+      def self.supports_extension?(extension)
+        self.extensions.map(&:to_s).include?(extension.to_s)
+      end
+
+      def self.extensions
+        []
+      end
+
+      def self.directory_for_locale(locale)
+        "./"
+      end
+      
+      def self.filename_for_locale(locale)
+        raise "not implemented"
+      end
+      
+      def self.extract_locale_name_from_file_path(file_path)
+        nil
+      end
+      
+      def self.default_locale_name
+        Phrase::Tool::Locale.find_default_locale.try(:name)
+      end
+      
+      def self.locale_aware?
+        false
+      end
+
+      def self.target_directory
+        "phrase/locales/"
+      end
+      
+      def self.config
+        @config ||= get_config
+      end
+
+      def self.get_config
+        config = Phrase::Tool::Config.new
+        config.load
+      end
+      private_class_method :config
+    end
+    
+    SUPPORTED_FORMATS = {
+      custom: Phrase::Formats::Custom,
+      json: Phrase::Formats::Json,
+      csv: Phrase::Formats::Csv,
+      gettext: Phrase::Formats::Gettext,
+      gettext_template: Phrase::Formats::GettextTemplate,
+      ini: Phrase::Formats::Ini,
+      properties: Phrase::Formats::Properties,
+      properties_xml: Phrase::Formats::PropertiesXml,
+      plist: Phrase::Formats::Plist,
+      qph: Phrase::Formats::QtPhraseBook,
+      ts: Phrase::Formats::QtTranslationSource,
+      resx: Phrase::Formats::Resx,
+      resx_windowsphone: Phrase::Formats::ResxWindowsphone,
+      simple_json: Phrase::Formats::SimpleJson,
+      strings: Phrase::Formats::Strings,
+      xml: Phrase::Formats::Xml,
+      tmx: Phrase::Formats::Tmx,
+      xlf: Phrase::Formats::Xliff,
+      yml: Phrase::Formats::Yaml,
+      yml_symfony: Phrase::Formats::YamlSymfony,
+    }
+
+    def self.config
+      @config ||= get_config
+    end
+
+    def self.get_config
+      config = Phrase::Tool::Config.new
+      config.load
+    end
+
+    def self.custom_handler
+      handler_class_for_format(:custom)
+    end
+
+    def self.target_directory(format_name)
+      handler = handler_class_for_format(format_name)
+      custom_handler.target_directory || handler.target_directory
+    end
+    
+    def self.directory_for_locale_in_format(locale, format_name)
+      handler = handler_class_for_format(format_name)
+      custom_directory = custom_handler.directory_for_locale(locale, format_name)
+      custom_directory || handler.directory_for_locale(locale)
+    end
+    
+    def self.filename_for_locale_in_format(locale, format_name)
+      handler = handler_class_for_format(format_name)
+      custom_filename = custom_handler.filename_for_locale(locale, format_name)
+      custom_filename || handler.filename_for_locale(locale)
+    end
+    
+    def self.file_format_exposes_locale?(file_path)
+      format = guess_possible_file_format_from_file_path(file_path)
+      format.nil? ? false : handler_class_for_format(format).locale_aware?
+    end
+    
+    def self.detect_locale_name_from_file_path(file_path)
+      format = guess_possible_file_format_from_file_path(file_path)
+      format.nil? ? nil : handler_class_for_format(format).extract_locale_name_from_file_path(file_path)
+    end
+    
+    def self.handler_class_for_format(format_name)
+      SUPPORTED_FORMATS.fetch(format_name.to_sym)
+    end
+    private_class_method :handler_class_for_format
+    
+    def self.guess_possible_file_format_from_file_path(file_path)
+      extension = extension_from_file_path(file_path)
+      possible_format = SUPPORTED_FORMATS.keys.find do |format|
+        SUPPORTED_FORMATS[format].send(:supports_extension?, extension)
+      end
+    end
+    private_class_method :guess_possible_file_format_from_file_path
+
+    def self.extension_from_file_path(file_path)
+      file_path.split('.').last.downcase
+    end
+    private_class_method :extension_from_file_path
+  end
+end

data/lib/phrase/formats/csv.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Csv < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.csv"
+      end
+      
+      def self.locale_aware?
+        false
+      end
+
+      def self.extensions
+        [:csv]
+      end
+    end
+  end
+end

data/lib/phrase/{tool/formats → formats}/custom.rb

@@ -1,4 +1,6 @@
-class Phrase::Tool::Formats::Custom < Phrase::Tool::Formats::Base
+# -*- encoding : utf-8 -*-
+
+class Phrase::Formats::Custom < Phrase::Formats::Base
   def self.directory_for_locale(locale, format)
     setting = config.locale_directory
     return unless setting

data/lib/phrase/formats/gettext.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Gettext < Phrase::Formats::Base
+      def self.directory_for_locale(locale)
+        "./#{locale.name}/"
+      end
+
+      def self.filename_for_locale(locale)
+        "#{config.domain}.po"
+      end
+
+      def self.target_directory
+        "locales/"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:po]
+      end
+    end
+  end
+end

data/lib/phrase/formats/gettext_template.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class GettextTemplate < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.pot"
+      end
+
+      def self.locale_aware?
+        false
+      end
+
+      def self.extensions
+        [:pot]
+      end
+    end
+  end
+end

data/lib/phrase/formats/ini.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Ini < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.ini"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:ini]
+      end
+    end
+  end
+end

data/lib/phrase/formats/json.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Json < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.json"
+      end
+      
+      def self.locale_aware?
+        false
+      end
+
+      def self.extensions
+        [:json]
+      end
+    end
+  end
+end

data/lib/phrase/formats/plist.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Plist < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.plist"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:plist]
+      end
+    end
+  end
+end

data/lib/phrase/formats/properties.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Properties < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.properties"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:properties]
+      end
+    end
+  end
+end

data/lib/phrase/formats/properties_xml.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class PropertiesXml < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.xml"
+      end
+      
+      def self.locale_aware?
+        false
+      end
+
+      def self.extensions
+        [:xml]
+      end
+    end
+  end
+end

data/lib/phrase/formats/qt_phrase_book.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class QtPhraseBook < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.qph"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:qph]
+      end
+    end
+  end
+end

data/lib/phrase/formats/qt_translation_source.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats 
+    class QtTranslationSource < Phrase::Formats::Base
+      def self.filename_for_locale(locale)
+        "phrase.#{locale.name}.ts"
+      end
+      
+      def self.locale_aware?
+        true
+      end
+
+      def self.extensions
+        [:ts]
+      end
+    end
+  end
+end