zendesk_apps_tools 1.2.1 → 1.2.2

data/features/fixtures/quote_character_translation.json

@@ -0,0 +1,6 @@
+{
+  "app": {
+    "description":  "Play the famous zen tunes in your help desk.",
+    "name":         "Buddha \"Machine\""
+  }
+}

data/features/step_definitions/app_steps.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 Given /^an app directory "(.*?)" exists$/ do |app_dir|
   @app_dir = app_dir
   FileUtils.rm_rf(@app_dir)
@@ -40,6 +42,13 @@ Then /^the app file "(.*?)" is created with:$/ do |file, content|
   File.read(file).chomp.gsub(' ', '').should == content.gsub(' ', '')
 end
 
+Then /^the fixture "(.*?)" is used for "(.*?)"$/ do |fixture, app_file|
+  fixture_file = File.join('features', 'fixtures', fixture)
+  app_file_path = File.join(@app_dir, app_file)
+
+  FileUtils.cp(fixture_file, app_file_path)
+end
+
 
 Then /^the zip file should exist in directory "(.*?)"$/ do |path|
   Dir[path + '/app-*.zip'].size.should == 1

data/features/translate.feature

@@ -11,23 +11,26 @@ Feature: Translate app strings
 
   Scenario: Generate template yaml from en.json
     Given an app is created in directory "tmp/aruba"
+    And the fixture "quote_character_translation.json" is used for "translations/en.json"
     When I run "cd tmp/aruba && zat translate create" command with the following details:
       | package name | test_package |
     Then the app file "tmp/aruba/translations/en.yml" is created with:
     """
     ---
-    title: John Test App
+    title: "John Test App"
     packages:
       - default
       - app_test_package
+
     parts:
       - translation:
-        key: txt.apps.test_package.app.description
-        title: ''
-        value: Play the famous zen tunes in your help desk.
+        key: "txt.apps.test_package.app.description"
+        title: ""
+        value: "Play the famous zen tunes in your help desk."
       - translation:
-        key: txt.apps.test_package.app.name
-        title: ''
-        value: Buddha Machine
+        key: "txt.apps.test_package.app.name"
+        title: ""
+        value: "Buddha \"Machine\""
+
     """
 

data/lib/zendesk_apps_tools/translate.rb

@@ -1,6 +1,5 @@
 require 'thor'
 require 'json'
-require 'yaml'
 require 'zendesk_apps_tools/common'
 require 'zendesk_apps_tools/locale_identifier'
 
@@ -10,6 +9,7 @@ module ZendeskAppsTools
     include Thor::Actions
     include ZendeskAppsTools::Common
 
+    CHARACTERS_TO_ESCAPE = %w[ " ]
     LOCALE_ENDPOINT = "https://support.zendesk.com/api/v2/locales.json"
 
     desc 'create', 'Create Zendesk translation file from en.json'
@@ -93,20 +93,19 @@ module ZendeskAppsTools
         translations = user_translations.keys.inject({}) do |translations, key|
           translations.merge( get_translations_for(user_translations, key) )
         end
+        @escaped_translations = escape_values(translations)
 
-        create_file("translations/en.yml", YAML.dump(yaml_structure(app_name, package, translations)))
+        @app_name = app_name
+        @package_name = package
+        template(File.join(Translate.source_root, 'templates/translation.erb.tt'), "translations/en.yml")
       end
 
-      def yaml_structure(app_name, package_name, translations)
+      def escape_values(translations)
         result = {}
-        result['title'] = app_name
-        result['packages'] = ['default', "app_#{package_name}"]
-        result['parts'] = translations.map do |key, value|
-          translation_item = { 'translation' => {} }
-          translation_item['translation']['key'] = "txt.apps.#{package_name}.#{key}"
-          translation_item['translation']['title'] = ''
-          translation_item['translation']['value'] = value
-          translation_item
+        translations.each do |key, value|
+          CHARACTERS_TO_ESCAPE.each do |char|
+            result[key] = value.gsub(char, "\\#{char}")
+          end
         end
 
         result

data/templates/translation.erb.tt

@@ -0,0 +1,13 @@
+---
+title: "<%= @app_name %>"
+packages:
+  - default
+  - app_<%= @package_name %>
+
+parts:
+<% @escaped_translations.each do |key, value| -%>
+  - translation:
+      key: "txt.apps.<%= @package_name %>.<%= key %>"
+      title: ""
+      value: "<%= value %>"
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_tools
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -165,9 +165,11 @@ files:
 - app_template/manifest.json.tt
 - app_template/templates/layout.hdbs
 - app_template/translations/en.json
+- templates/translation.erb.tt
 - README.md
 - LICENSE
 - features/clean.feature
+- features/fixtures/quote_character_translation.json
 - features/new.feature
 - features/package.feature
 - features/step_definitions/app_steps.rb
@@ -201,6 +203,7 @@ specification_version: 3
 summary: Tools to help you develop Zendesk Apps.
 test_files:
 - features/clean.feature
+- features/fixtures/quote_character_translation.json
 - features/new.feature
 - features/package.feature
 - features/step_definitions/app_steps.rb