phrase 0.4.24 → 0.4.25

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d19161a8b74d93add452fa8141fd6a7c3218736c
+  data.tar.gz: ccc2ffadca6cac58332e772def7ccb8a00798a91
+SHA512:
+  metadata.gz: 7743e6c862f1191d1dbc06b16aa95e982e9d84633bcbb61a1361c9fed8c8d9c9d84d6935b6f0319e702d939397d34c141cba6d526353cdfc5c577ef782d36a0b
+  data.tar.gz: e0ab46de6616360e7d31aec7a7e5d64d41024307c3638dce43b92c049a473cf9d8cff26340ba44021e41b40bb33a6f19c84c291b8a99f5319defff69cbb67a77

data/lib/phrase/api/client.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+  # -*- encoding : utf-8 -*-
 
 require 'cgi'
 require 'json'
@@ -82,7 +82,7 @@ class Phrase::Api::Client
     true
   end
 
-  def download_translations_for_locale(name, format, tag=nil, updated_since=nil, include_empty_translations=nil)
+  def download_translations_for_locale(name, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil)
     raise "You must specify a name" if name.nil? || name.blank?
     raise "You must specify a format" if format.nil? || format.blank?
 
@@ -92,8 +92,10 @@ class Phrase::Api::Client
         locale: name,
         tag: tag,
         updated_since: updated_since,
-        include_empty_translations: include_empty_translations ? "1" : nil
+        include_empty_translations: include_empty_translations ? "1" : nil,
+        convert_emoji: convert_emoji ? "1" : nil
       }
+
       content = perform_api_request("/translations/download", :get, params)
       return content
     rescue Phrase::Api::Exceptions::ServerError => e
@@ -101,7 +103,7 @@ class Phrase::Api::Client
     end
   end
 
-  def upload(filename, file_content, tags=[], locale=nil, format=nil, update_translations=false, skip_unverification=false, skip_upload_tags=false)
+  def upload(filename, file_content, tags=[], locale=nil, format=nil, update_translations=false, skip_unverification=false, skip_upload_tags=false, convert_emoji=false)
     begin
       params = {
         "file_format" => format,
@@ -110,7 +112,8 @@ class Phrase::Api::Client
         "tags[]" => tags,
         "update_translations" => update_translations ? "1" : "0",
         "skip_unverification" => skip_unverification ? "1" : "0",
-        "skip_upload_tags" => skip_upload_tags ? "1" : "0"
+        "skip_upload_tags" => skip_upload_tags ? "1" : "0",
+        "convert_emoji" => convert_emoji ? "1" : "0"
       }
       params["locale_name"] = locale unless locale.nil?
       perform_api_request("/translation_keys/upload", :post, params)

data/lib/phrase/tool/commands.rb

@@ -23,14 +23,16 @@ module Phrase::Tool::Commands
         format: nil,
         update_translations: false,
         skip_unverification: false,
-        skip_upload_tags: false
+        skip_upload_tags: false,
+        convert_emoji: nil
       },
       pull: {
         format: nil,
         target: nil,
         tag: nil,
         updated_since: nil,
-        include_empty_translations: nil
+        include_empty_translations: nil,
+        convert_emoji: nil
       },
       tags: {
         list: true

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

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# -*- encoding : utf-8 -*-f
 
 class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
   ALLOWED_DOWNLOAD_FORMATS = Phrase::Formats::SUPPORTED_FORMATS.keys.map(&:to_s)
@@ -16,6 +16,7 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     @tag = @options.get(:tag)
     @updated_since = @options.get(:updated_since)
     @include_empty_translations = @options.get(:include_empty_translations)
+    @convert_emoji = @options.get(:convert_emoji)
     @target ||= Phrase::Formats.target_directory(@format) if format_valid?(@format)
   end
 
@@ -23,14 +24,14 @@ class Phrase::Tool::Commands::Pull < Phrase::Tool::Commands::Base
     (print_error("Invalid format: #{@format}") and exit_command) unless format_valid?(@format)
     locales_to_download.compact.each do |locale|
       print_message "Downloading #{locale.name}..."
-      fetch_translations_for_locale(locale, @format, @tag, @updated_since, @include_empty_translations)
+      fetch_translations_for_locale(locale, @format, @tag, @updated_since, @include_empty_translations, @convert_emoji)
     end
   end
 
 private
-  def fetch_translations_for_locale(locale, format, tag=nil, updated_since=nil, include_empty_translations=nil)
+  def fetch_translations_for_locale(locale, format, tag=nil, updated_since=nil, include_empty_translations=nil, convert_emoji=nil)
     begin
-      content = api_client.download_translations_for_locale(locale.name, format, tag, updated_since, include_empty_translations)
+      content = api_client.download_translations_for_locale(locale.name, format, tag, updated_since, include_empty_translations, convert_emoji)
       store_content_in_locale_file(locale, content)
     rescue Exception => e
       print_error "Failed"
@@ -47,7 +48,7 @@ private
     begin
       FileUtils.mkpath(path)
       File.open(target, "w") do |file|
-        file.write(content.force_encoding("UTF-8"))
+        file.write(encode(content))
       end
       print_message "Saved to #{clean_path target}".green
     rescue
@@ -56,6 +57,10 @@ private
     end
   end
 
+  def encode content
+    content.force_encoding("UTF-8")
+  end
+
   def clean_path(str)
     str.gsub("/./", "/")
   end

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

@@ -16,6 +16,7 @@ class Phrase::Tool::Commands::Push < Phrase::Tool::Commands::Base
     @update_translations = @options.get(:update_translations)
     @skip_unverification = @options.get(:skip_unverification)
     @skip_upload_tags = @options.get(:skip_upload_tags)
+    @convert_emoji = @options.get(:convert_emoji)
   end
 
   def execute!
@@ -91,7 +92,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, @format, @update_translations, @skip_unverification, @skip_upload_tags)
+        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
         print_error "Failed"

data/lib/phrase/tool/options_factory.rb

@@ -71,6 +71,10 @@ class OptionsFactory
       set[:skip_upload_tags] = skip_upload_tags
     end
 
+    opts.on("--convert-emoji", "Convert Emojis to store and display them correctly in PhraseApp") do |convert_emoji|
+      set[:convert_emoji] = convert_emoji
+    end
+
     opts.on("--secret=YOUR_AUTH_TOKEN", String, "The Auth Token to use for this operation instead of the saved one (optional)") do |secret|
       set[:secret] = secret
     end
@@ -100,6 +104,10 @@ class OptionsFactory
       set[:include_empty_translations] = include_empty_translations
     end
 
+    opts.on("--convert-emoji", "Convert Emoji symbols") do |convert_emoji|
+      set[:convert_emoji] = convert_emoji
+    end
+
     opts.on("--secret=YOUR_AUTH_TOKEN", String, "The Auth Token to use for this operation instead of the saved one (optional)") do |secret|
       set[:secret] = secret
     end

data/lib/phrase/version.rb

@@ -1,3 +1,3 @@
 module Phrase
-  VERSION = "0.4.24"
+  VERSION = "0.4.25"
 end

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: phrase
 version: !ruby/object:Gem::Version
-  version: 0.4.24
-  prerelease: 
+  version: 0.4.25
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: phrase allows you to edit translations in-place on the page itself. More
@@ -264,26 +243,25 @@ files:
 - phrase.gemspec
 homepage: https://phraseapp.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: phrase
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The best way to manage i18n.
 test_files: []