zendesk_apps_support 3.4.5 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f78e45efd544037efc8773f9c6bc6573864e0d
-  data.tar.gz: 5b5fdbc2f694b12aeb30abcdaee2776b4d35cf40
+  metadata.gz: 4989892ae59b6757887256e7546490877f807907
+  data.tar.gz: 5d5f77a49ffded79659ac94fb949a402791c6e98
 SHA512:
-  metadata.gz: 16869dd1c60567d06c63756cb72007701f97627d63974bdfd7078e60b329eb7b62bb91a0acbd7b63965d1941884ef0bb7cceb56166e5e4c8a9fe9c7d169e4ddc
-  data.tar.gz: 1eec8327b122efc60ea8f918bac97750252d0a552a1bb6a705c51d9ecd6023c7740afee1055be5de248dcac8e714d530cd669bd73c3cec233599821a8ae53847
+  metadata.gz: 21c8ffd2a39ac6d0a7ccf666035ce06997616aa9e88af988ce19f79e1dd021886865dce5fce22d9eac9037e0a2c9ebba904c8b7fe1eab520c409a3a7cf7d7284
+  data.tar.gz: dde683e6071c2b52f408c138076bc4685b7edb1e7a9ae57c2ecffef152bbba3cd76e31c3a94c9309bc85970c1f4c00da5ec6bc13b5d477d938bb44cb6274ad3e

data/README.md

@@ -1,7 +1,7 @@
 # Zendesk Apps Support
 
 ## Description
-Classes to manage and validate zendesk apps. This is a gem used in [Zendesk Apps Tools](https://github.com/zendesk/zendesk_apps_tools/).
+Classes to manage and validate Zendesk Apps. This is a gem used in [Zendesk Apps Tools](https://github.com/zendesk/zendesk_apps_tools/).
 
 ## Owners
 This repo is owned and maintained by the Zendesk Apps team. You can reach us on vegemite@zendesk.com. We are located in Melbourne!

data/config/locales/en.yml

@@ -92,6 +92,7 @@ en:
               invalid_format: "%{field} is invalid for translation."
               not_json: "%{file} is not valid JSON. %{errors}"
               not_json_object: "%{file} is not a JSON object."
+              missing_required_key: 'Missing required key from %{file}: %{missing_key}'
             stylesheet_error: 'Sass error: %{sass_error}'
             invalid_type_parameter:
               one: "%{invalid_types} is an invalid parameter type."

data/config/locales/translations/zendesk_apps_support.yml

@@ -234,6 +234,10 @@ parts:
       key: "txt.apps.admin.error.app_build.translation.not_json_object"
       title: "App builder job: translation file is not a JSON object"
       value: "%{file} is not a JSON object."
+  - translation:
+      key: "txt.apps.admin.error.app_build.translation.missing_required_key"
+      title: "App builder job: required key missing from translation file"
+      value: "Missing required key from %{file}: %{missing_key}"
   - translation:
       key: "txt.apps.admin.error.app_build.stylesheet_error"
       title: "App builder job: invalid stylesheet syntax"

data/lib/zendesk_apps_support/manifest.rb

@@ -47,8 +47,10 @@ module ZendeskAppsSupport
 
     def products
       @products ||=
-        if requirements_only? || marketing_only?
+        if requirements_only?
           [ Product::SUPPORT ]
+        elsif marketing_only?
+          products_ignore_locations || [ Product::SUPPORT ]
         else
           products_from_locations
         end
@@ -138,6 +140,12 @@ module ZendeskAppsSupport
                       .map { |code| Product.find_by(code: code) }
     end
 
+    def products_ignore_locations
+      locations.keys.map do |product_name|
+        Product.find_by(name: product_name)
+      end
+    end
+
     def set_locations_and_hosts
       @locations =
         case original_locations

data/lib/zendesk_apps_support/package.rb

@@ -243,7 +243,7 @@ module ZendeskAppsSupport
     def runtime_translations(translations)
       result = translations.dup
       result.delete('name')
-      result.delete('description')
+      result.delete('short_description')
       result.delete('long_description')
       result.delete('installation_instructions')
       result
@@ -251,6 +251,7 @@ module ZendeskAppsSupport
 
     def process_translations(locale_path)
       translations = File.exist?(locale_path) ? JSON.parse(File.read(locale_path)) : {}
+      translations['app'].delete('name') if translations.key?('app')
       translations['app'].delete('package') if translations.key?('app')
       remove_zendesk_keys(translations)
     end

data/lib/zendesk_apps_support/validations/translations.rb

@@ -17,6 +17,7 @@ module ZendeskAppsSupport
             path_match = TRANSLATIONS_PATH.match(file.relative_path)
             if path_match
               errors << locale_error(file, path_match[1]) << json_error(file)
+              errors << required_keys(file) if errors.compact.empty?
             end
           end.compact
         end
@@ -47,6 +48,14 @@ module ZendeskAppsSupport
           ValidationError.new('translation.not_json', file: file.relative_path, errors: e)
         end
 
+        def required_keys(file)
+          return if file.relative_path != 'translations/en.json' || JSON.parse(file.read)['app']['name']
+
+          ValidationError.new('translation.missing_required_key',
+                              file: file.relative_path,
+                              missing_key: 'app.name')
+        end
+
         def validate_translation_format(json)
           json.keys.each do |key|
             raise TranslationFormatError, "'#{key}': '#{json[key]}'" unless json[key].is_a? Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n