phrase 0.3.0 → 0.3.1

data/README.md

@@ -1,4 +1,4 @@
-# phrase
+# phrase [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/phrase/phrase)
 
 Powerful in-place translation management for your web applications.
 

data/lib/phrase/api/client.rb

@@ -203,9 +203,9 @@ private
   def set_form_data(request, params, separator='&')
     request.body = params.map do |key, value| 
       if value.instance_of?(Array)
-        value.map {|value_item| "#{CGI::escape(key.to_s)}=#{CGI::escape(value_item.to_s)}"}.join(separator)
+        value.map {|value_item| "#{escaped(key.to_s)}=#{escaped(value_item.to_s)}"}.join(separator)
       else
-        "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"
+        "#{escaped(key.to_s)}=#{escaped(value.to_s)}"
       end
     end.join(separator)
     request.content_type = 'application/x-www-form-urlencoded'
@@ -214,4 +214,8 @@ private
   def parsed(raw_data)
     JSON.parse(raw_data)
   end
+  
+  def escaped(value) 
+    CGI::escape(value)
+  end
 end

data/lib/phrase/tool.rb

@@ -10,6 +10,7 @@ class Phrase::Tool
   autoload :Formats, 'phrase/tool/formats'
   autoload :Commands, 'phrase/tool/commands'
   autoload :TagValidator, 'phrase/tool/tag_validator'
+  autoload :EncodingDetector, 'phrase/tool/encoding_detector'
   autoload :Locale, 'phrase/tool/locale'
   
   def initialize(argv)

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

@@ -78,7 +78,7 @@ private
         tagged = " (tagged: #{@tags.join(", ")})" if @tags.size > 0
         print_message "Uploading #{file}#{tagged}..."
         locale = @locale || detect_locale_name_from_file_path(file)
-        api_client.upload(file, File.read(file), @tags, locale)
+        api_client.upload(file, file_content(file), @tags, locale)
         print_message "OK".green
       rescue Exception => e
         print_error "Failed"
@@ -87,6 +87,20 @@ private
     end
   end
   
+  def file_content(file)
+    content = File.open(file).read
+    content = utf16_to_utf8(content) if file_seems_to_be_utf16?(file)
+    content
+  end
+  
+  def utf16_to_utf8(string)
+    string.encode("UTF-8", "UTF-16")
+  end
+  
+  def file_seems_to_be_utf16?(file)
+    Phrase::Tool::EncodingDetector.file_seems_to_be_utf16?(file)
+  end
+  
   def file_valid?(filepath)
     extension = filepath.split('.').last
     ALLOWED_FILE_TYPES.include?(extension)

data/lib/phrase/tool/encoding_detector.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+class Phrase::Tool::EncodingDetector
+  def self.file_seems_to_be_utf16?(file)
+    file_seems_to_be_utf16_be?(file) or file_seems_to_be_utf16_le?(file)
+  end
+  
+  def self.file_seems_to_be_utf16_be?(file)
+    IO.read(file, 2).bytes.to_a == [0xFE, 0xFF]
+  end
+  
+  def self.file_seems_to_be_utf16_le?(file)
+    IO.read(file, 2).bytes.to_a == [0xFF, 0xFE]
+  end
+end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70212288992600 !ruby/object:Gem::Requirement
+  requirement: &70346162428660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212288992600
+  version_requirements: *70346162428660
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70212288992140 !ruby/object:Gem::Requirement
+  requirement: &70346162428200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70212288992140
+  version_requirements: *70346162428200
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70212288991760 !ruby/object:Gem::Requirement
+  requirement: &70346162427820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212288991760
+  version_requirements: *70346162427820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212288991300 !ruby/object:Gem::Requirement
+  requirement: &70346162427360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212288991300
+  version_requirements: *70346162427360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212288990880 !ruby/object:Gem::Requirement
+  requirement: &70346162426940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212288990880
+  version_requirements: *70346162426940
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70212288990460 !ruby/object:Gem::Requirement
+  requirement: &70346162426520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212288990460
+  version_requirements: *70346162426520
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70212288990040 !ruby/object:Gem::Requirement
+  requirement: &70346162426100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212288990040
+  version_requirements: *70346162426100
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70212288989620 !ruby/object:Gem::Requirement
+  requirement: &70346162425680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212288989620
+  version_requirements: *70346162425680
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70212288989200 !ruby/object:Gem::Requirement
+  requirement: &70346162425260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212288989200
+  version_requirements: *70346162425260
 description: phrase allows you to edit translations in-place on the page itself. More
   information at phraseapp.com
 email:
@@ -149,6 +149,7 @@ files:
 - lib/phrase/tool/commands/show_help.rb
 - 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/gettext.rb