phrase 0.4.1 → 0.4.2

data/lib/phrase/formats/resx.rb

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

data/lib/phrase/formats/resx_windowsphone.rb

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

data/lib/phrase/formats/simple_json.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class SimpleJson < 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/strings.rb

@@ -0,0 +1,39 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Strings < Phrase::Formats::Base
+      def self.directory_for_locale(locale)
+        name = locale.code || locale.name
+        "#{formatted(name)}.lproj"
+      end
+      
+      def self.filename_for_locale(locale)
+        "Localizable.strings"
+      end
+      
+      def self.target_directory
+        "./"
+      end
+
+      def self.extract_locale_name_from_file_path(file_path)
+        file_path.scan(/\/([a-zA-Z\-_]*).lproj\//i).first.try(:first)
+      end
+      
+      def self.locale_aware?
+        true
+      end
+      
+      def self.formatted(name)
+        return name unless name.include?("-")
+        parts = name.split("-")
+        "#{parts.first}_#{parts.last.upcase}"
+      end
+      private_class_method :formatted
+
+      def self.extensions
+        [:strings]
+      end
+    end
+  end
+end

data/lib/phrase/formats/tmx.rb

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

data/lib/phrase/formats/xliff.rb

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

data/lib/phrase/formats/xml.rb

@@ -0,0 +1,49 @@
+# -*- encoding : utf-8 -*-
+
+module Phrase
+  module Formats
+    class Xml < Phrase::Formats::Base
+      def self.directory_for_locale(locale)
+        if locale.default?
+          "values" 
+        else
+          name = locale.code || locale.name
+          "values-#{formatted(name)}"
+        end
+      end
+      
+      def self.filename_for_locale(locale)
+        "strings.xml"
+      end
+
+      def self.target_directory
+        "res/"
+      end
+      
+      def self.extract_locale_name_from_file_path(file_path)
+        return default_locale_name if file_path.scan(/\/values\/strings.xml/i).first
+        locale_part = file_path.scan(/\/values-([a-zA-Z\-_]*)\/strings.xml/i).first.try(:first)
+        if locale_part and locale_part.include?("-r")
+          "#{locale_part.split("-r").first}-#{locale_part.split("-r").last}"
+        else
+          locale_part
+        end
+      end
+      
+      def self.locale_aware?
+        true
+      end
+      
+      def self.formatted(name)
+        return name unless name.include?("-")
+        parts = name.split("-")
+        "#{parts.first}-r#{parts.last.upcase}"
+      end
+      private_class_method :formatted
+      
+      def self.extensions
+        [:xml]
+      end
+    end
+  end
+end

data/lib/phrase/formats/yaml.rb

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

data/lib/phrase/formats/yaml_symfony.rb

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

data/lib/phrase/hash_flattener.rb

@@ -1,20 +1,21 @@
 # -*- encoding : utf-8 -*-
 
-module Phrase::HashFlattener
-  
-  FLATTEN_SEPARATOR = "."
-  SEPARATOR_ESCAPE_CHAR = "\001"
+module Phrase
+  module HashFlattener
+    FLATTEN_SEPARATOR = "."
+    SEPARATOR_ESCAPE_CHAR = "\001"
 
-  def self.escape_default_separator(key)
-    key.to_s.tr(FLATTEN_SEPARATOR, SEPARATOR_ESCAPE_CHAR)
-  end
+    def self.escape_default_separator(key)
+      key.to_s.tr(FLATTEN_SEPARATOR, SEPARATOR_ESCAPE_CHAR)
+    end
 
-  def self.flatten(hash, escape, previous_key=nil, &block)
-    hash.each_pair do |key, value|
-      key = escape_default_separator(key) if escape
-      current_key = [previous_key, key].compact.join(FLATTEN_SEPARATOR).to_sym
-      yield current_key, value
-      flatten(value, escape, current_key, &block) if value.is_a?(Hash)
+    def self.flatten(hash, escape, previous_key=nil, &block)
+      hash.each_pair do |key, value|
+        key = escape_default_separator(key) if escape
+        current_key = [previous_key, key].compact.join(FLATTEN_SEPARATOR).to_sym
+        yield current_key, value
+        flatten(value, escape, current_key, &block) if value.is_a?(Hash)
+      end
     end
   end
-end
+end

data/lib/phrase/tool.rb

@@ -7,7 +7,7 @@ require 'phrase'
 class Phrase::Tool
   autoload :Config, 'phrase/tool/config'
   autoload :Options, 'phrase/tool/options'
-  autoload :Formats, 'phrase/tool/formats'
+  autoload :Formats, 'phrase/formats'
   autoload :Commands, 'phrase/tool/commands'
   autoload :TagValidator, 'phrase/tool/tag_validator'
   autoload :EncodingDetector, 'phrase/tool/encoding_detector'

data/lib/phrase/tool/commands/pull.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
-  ALLOWED_DOWNLOAD_FORMATS = %w(yml po xml strings json resx ts qph ini plist properties xlf)
+  ALLOWED_DOWNLOAD_FORMATS = Phrase::Formats::SUPPORTED_FORMATS.keys.map(&:to_s)
   DEFAULT_DOWNLOAD_FORMAT = "yml"
   
   def initialize(options, args)
@@ -13,7 +13,7 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     # TODO: remove DEFAULT_DOWNLOAD_FORMAT when phrase app has been updated
     @format = @options.get(:format) || config.format || DEFAULT_DOWNLOAD_FORMAT
     @target = @options.get(:target)
-    @target ||= Phrase::Tool::Formats.target_directory(@format) if format_valid?(@format)
+    @target ||= Phrase::Formats.target_directory(@format) if format_valid?(@format)
   end
   
   def execute!
@@ -36,8 +36,8 @@ private
   end
   
   def store_content_in_locale_file(locale, content)
-    directory = Phrase::Tool::Formats.directory_for_locale_in_format(locale, @format)
-    filename = Phrase::Tool::Formats.filename_for_locale_in_format(locale, @format)
+    directory = Phrase::Formats.directory_for_locale_in_format(locale, @format)
+    filename = Phrase::Formats.filename_for_locale_in_format(locale, @format)
     path = File.join(base_directory, directory)
     target = File.join(path, filename)
     begin

data/lib/phrase/tool/commands/push.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
-  ALLOWED_FILE_TYPES = %w(yml po pot xml strings json resx ts qph ini plist properties xlf)
   FORMATS_CONTAINING_LOCALE = %q(po yml qph ts xlf)
   RAILS_DEFAULT_FOLDER = "./config/locales/"
   
@@ -11,6 +10,7 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
     
     @file_names = @args[1..-1]
     @locale = @options.get(:locale)
+    @format = @options.get(:format)
     @tags = @options.get(:tags)
     @recursive = @options.get(:recursive)
   end
@@ -80,7 +80,7 @@ private
           locale = Phrase::Tool::Locale.find_default_locale.try(:name)
         end
         locale = @locale if @locale
-        api_client.upload(file, file_content(file), @tags, locale)
+        api_client.upload(file, file_content(file), @tags, locale, @format)
         print_message "OK".green
       rescue Exception => e
         print_error "Failed"
@@ -98,7 +98,7 @@ private
   end
   
   def force_use_of_default_locale?(file_path)
-    not Phrase::Tool::Formats.file_format_exposes_locale?(file_path)
+    not Phrase::Formats.file_format_exposes_locale?(file_path)
   end
   
   def utf16_to_utf8(string)
@@ -111,7 +111,7 @@ private
   
   def file_valid?(filepath)
     extension = filepath.split('.').last
-    ALLOWED_FILE_TYPES.include?(extension)
+    allowed_file_extensions.include?(extension)
   end
 
   def file_exists?(file)
@@ -127,6 +127,14 @@ private
   end
   
   def detect_locale_name_from_file_path(file_path)
-    Phrase::Tool::Formats.detect_locale_name_from_file_path(file_path)
+    Phrase::Formats.detect_locale_name_from_file_path(file_path)
   end
-end
+
+  def allowed_file_extensions
+    extensions = []
+    Phrase::Formats::SUPPORTED_FORMATS.each do |format, handler|
+      extensions = extensions | handler.send(:extensions)
+    end
+    extensions.uniq.map(&:to_s)
+  end
+end

data/lib/phrase/tool/options.rb

@@ -23,7 +23,8 @@ class Phrase::Tool::Options
       push: {
         tags: [],
         recursive: false,
-        locale: nil
+        locale: nil,
+        format: nil
       },
       pull: {
         format: nil,

data/lib/phrase/tool/options_factory.rb

@@ -50,11 +50,15 @@ class OptionsFactory
     opts.on("--locale=en", String, "Locale of the translations your file contain (required for formats that do not include the name of the locale in the file content)") do |locale|
       set[:locale] = locale
     end
+
+    opts.on("--format=yml", String, "See documentation for list of allowed formats") do |format|
+      set[:format] = format
+    end
   end
   private_class_method :push
 
   def self.pull(opts, set)
-    opts.on("--format=yml", String, "See documentation for list of allowed locales") do |format|
+    opts.on("--format=yml", String, "See documentation for list of allowed formats") do |format|
       set[:format] = format
     end
     

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70153559193100 !ruby/object:Gem::Requirement
+  requirement: &70112547553080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70153559193100
+  version_requirements: *70112547553080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70153559192640 !ruby/object:Gem::Requirement
+  requirement: &70112547552620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70153559192640
+  version_requirements: *70112547552620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70153559192220 !ruby/object:Gem::Requirement
+  requirement: &70112547552200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559192220
+  version_requirements: *70112547552200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70153559191800 !ruby/object:Gem::Requirement
+  requirement: &70112547551780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559191800
+  version_requirements: *70112547551780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70153559191380 !ruby/object:Gem::Requirement
+  requirement: &70112547551360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559191380
+  version_requirements: *70112547551360
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70153559190960 !ruby/object:Gem::Requirement
+  requirement: &70112547550940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559190960
+  version_requirements: *70112547550940
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70153559190540 !ruby/object:Gem::Requirement
+  requirement: &70112547550520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559190540
+  version_requirements: *70112547550520
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70153559190120 !ruby/object:Gem::Requirement
+  requirement: &70112547550100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559190120
+  version_requirements: *70112547550100
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &70153559189700 !ruby/object:Gem::Requirement
+  requirement: &70112547549680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559189700
+  version_requirements: *70112547549680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70153559189280 !ruby/object:Gem::Requirement
+  requirement: &70112547549260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70153559189280
+  version_requirements: *70112547549260
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -164,6 +164,27 @@ files:
 - lib/phrase/delegate/fast_gettext.rb
 - lib/phrase/delegate/i18n.rb
 - lib/phrase/engine.rb
+- lib/phrase/formats.rb
+- lib/phrase/formats/csv.rb
+- lib/phrase/formats/custom.rb
+- lib/phrase/formats/gettext.rb
+- lib/phrase/formats/gettext_template.rb
+- lib/phrase/formats/ini.rb
+- lib/phrase/formats/json.rb
+- lib/phrase/formats/plist.rb
+- lib/phrase/formats/properties.rb
+- lib/phrase/formats/properties_xml.rb
+- lib/phrase/formats/qt_phrase_book.rb
+- lib/phrase/formats/qt_translation_source.rb
+- lib/phrase/formats/resx.rb
+- lib/phrase/formats/resx_windowsphone.rb
+- lib/phrase/formats/simple_json.rb
+- lib/phrase/formats/strings.rb
+- lib/phrase/formats/tmx.rb
+- lib/phrase/formats/xliff.rb
+- lib/phrase/formats/xml.rb
+- lib/phrase/formats/yaml.rb
+- lib/phrase/formats/yaml_symfony.rb
 - lib/phrase/hash_flattener.rb
 - lib/phrase/tool.rb
 - lib/phrase/tool/commands.rb
@@ -175,22 +196,6 @@ files:
 - lib/phrase/tool/commands/show_version.rb
 - lib/phrase/tool/config.rb
 - lib/phrase/tool/encoding_detector.rb
-- lib/phrase/tool/formats.rb
-- lib/phrase/tool/formats/base.rb
-- lib/phrase/tool/formats/custom.rb
-- lib/phrase/tool/formats/gettext.rb
-- lib/phrase/tool/formats/gettext_pot.rb
-- lib/phrase/tool/formats/ini.rb
-- lib/phrase/tool/formats/json.rb
-- lib/phrase/tool/formats/plist.rb
-- lib/phrase/tool/formats/properties.rb
-- lib/phrase/tool/formats/qt_phrase_book.rb
-- lib/phrase/tool/formats/qt_translation_source.rb
-- lib/phrase/tool/formats/resx.rb
-- lib/phrase/tool/formats/strings.rb
-- lib/phrase/tool/formats/xliff.rb
-- lib/phrase/tool/formats/xml.rb
-- lib/phrase/tool/formats/yaml.rb
 - lib/phrase/tool/locale.rb
 - lib/phrase/tool/options.rb
 - lib/phrase/tool/options_factory.rb