phrase 0.4.30 → 0.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4610d2b16754898951af9e7b984c02724b7780c9
-  data.tar.gz: b0db3cb180fd1287a5bc53c41116bea8114ae1ac
+  metadata.gz: bf0b86279fd6eb155d420c6f6e1eb484721f89f5
+  data.tar.gz: 4ab2fdd122f8a275df89fb76f020a48772cb631c
 SHA512:
-  metadata.gz: 27da26a47c96c14dd9163323f6f9510b56037859e2173a2d745cafae425a25b2381ec1941aeeae07c2ae2f2919f14a1d485eb4ab8dd51b2befc84155a3c7bd99
-  data.tar.gz: 8265181ee1f9086b2e92eac7afc1b72a5b4e4c1a55e4e5ad1ac107f7c97d2145299678271a354d15523d6dd2d29598477290a798eb8b2bb96b2b4dc15fde8d61
+  metadata.gz: 169aeda0534c724f894cbbd03f6e08292da3e96fa3f9f1aee4bfa7c900e1098330a577b9383606b632f9988d5992189bda3b28d5035cfc2de5c95eacfc2c7b0f
+  data.tar.gz: 457868e5efae4cf27f2e3e240776b5b5e224f3f1e834447c4200926deee552cecb1c3334b4f20a3f85b7f17c14c292dc4b9e247f3f1d649731d9e49e61c92459

data/lib/phrase/formats.rb

@@ -132,22 +132,23 @@ module Phrase
       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)
+    def self.file_format_exposes_locale?(file_path, format_name=nil)
+      format = format_name || 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)
+    def self.detect_locale_name_from_file_path(file_path, format_name=nil)
+      format = format_name || 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.format_valid?(format)
-      if format.present? then
-        format_handler = handler_class_for_format(format)
-        return format_handler.renders_locale_as_extension? if format_handler.present?
+    def self.format_renders_locale_as_extension?(format)
+      if format.present?
+        format_class = handler_class_for_format(format)
+        format_class.renders_locale_as_extension?
+      else
+        false
       end
-      false
     end
 
     def self.handler_class_for_format(format_name)

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

@@ -7,7 +7,6 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
   def initialize(options, args)
     super(options, args)
     require_auth_token!
-
     @file_names = @args[1..-1]
     @locale = @options.get(:locale)
     @format = @options.get(:format)
@@ -82,16 +81,15 @@ private
   end
 
   def upload_file(file)
-    if file_valid?(file) or Phrase::Formats.format_valid?(@format) then
+    if file_valid?(file) or renders_locale_as_extension?(@format)
       begin
         tagged = " (tagged: #{@tags.join(", ")})" if @tags.size > 0
         print_message "Uploading #{file}#{tagged}..."
-        unless force_use_of_default_locale?(file)
-          locale = detect_locale_name_from_file_path(file)
+        if @locale.present?
+          locale = @locale
         else
-          locale = Phrase::Tool::Locale.find_default_locale.try(:name)
+          locale = guess_locale_for_upload(file, @format)
         end
-        locale = @locale if @locale
         api_client.upload(file, file_content(file), @tags, locale, @format, @update_translations, @skip_unverification, @skip_upload_tags, @convert_emoji)
         print_message "OK".green
       rescue Exception => e
@@ -109,10 +107,6 @@ private
     content
   end
 
-  def force_use_of_default_locale?(file_path)
-    not Phrase::Formats.file_format_exposes_locale?(file_path)
-  end
-
   def utf16_to_utf8(string)
     string.encode("UTF-8", "UTF-16")
   end
@@ -121,6 +115,10 @@ private
     Phrase::Tool::EncodingDetector.file_seems_to_be_utf16?(file)
   end
   
+  def renders_locale_as_extension?(format_name)
+    Phrase::Formats.format_renders_locale_as_extension?(format_name)
+  end
+
   def file_valid?(filepath)
     extension = filepath.split('.').last
     allowed_file_extensions.include?(extension)
@@ -130,6 +128,23 @@ private
     File.exist?(file)
   end
 
+  def guess_locale_for_upload(file, format_name=nil)
+    if file_format_exposes_locale?(file, format_name)
+      locale = detect_locale_name_from_file_path(file, format_name)
+    else
+      locale = Phrase::Tool::Locale.find_default_locale.try(:name)
+    end
+    locale
+  end
+
+  def file_format_exposes_locale?(file, format_name)
+    Phrase::Formats.file_format_exposes_locale?(file, format_name)
+  end
+
+  def detect_locale_name_from_file_path(file, format_name)
+    Phrase::Formats.detect_locale_name_from_file_path(file, format_name)
+  end
+
   def valid_tags_are_given?(tags)
     tags.all? { |tag| Phrase::Tool::TagValidator.valid?(tag) }
   end
@@ -138,10 +153,6 @@ private
     File.exist?(RAILS_DEFAULT_FOLDER) && File.directory?(RAILS_DEFAULT_FOLDER)
   end
 
-  def detect_locale_name_from_file_path(file_path)
-    Phrase::Formats.detect_locale_name_from_file_path(file_path)
-  end
-
   def allowed_file_extensions
     extensions = []
     Phrase::Formats::SUPPORTED_FORMATS.each do |format, handler|

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.30"
+  VERSION = "0.4.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.30
+  version: 0.4.31
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize