zendesk_apps_support 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ec75f6edd58e546096a0264c27bb17652cdac8
-  data.tar.gz: f7941d0e10b8ed005b59e88af3c2c6ac50dbe742
+  metadata.gz: 64de3713a3278aa1401945176018eb8251dabe2b
+  data.tar.gz: 12900df7de9e00ef76386f5f0b8597de02ca2cd1
 SHA512:
-  metadata.gz: 006e9e8e880b349aa33a3fcff1925e3fccbe9b12ff0ee950ecba54a79ba73363652f43fddfe27720263c6d949da4b06af14d9ce7a0120fc4c43623fe571e5d20
-  data.tar.gz: 38c4f30c83611fd1e81b13e50df3e5c25027e07348b9dd6352d926cfee0560c156dec281c90e0fd7fbe3ad4fce23c0c9bde28758899ad357ed3c658bd9ffe240
+  metadata.gz: 5dfa543b1937ef9a1fc90ef04e22bd0e5bee34279512557a0f6e1fbebfdead52c062b7434b259d5127710494d8f95df08cb271a50b4200f92c51f480ff9cdba3
+  data.tar.gz: a5743c976fb414931c707afc21fffa8137420c5448d9526daff454dabb6c2e04ef767e5c7f96f46828128ac70512b7adac86f41b13823f147beb5601f81fae0b

data/config/locales/en.yml

@@ -22,6 +22,8 @@ en:
             no_app_js_required: Do not set your app to requirements only if you need
               app.js
             manifest_not_json: manifest is not proper JSON. %{errors}
+            duplicate_manifest_keys: There are duplicate keys specified in the manifest.json
+              file. %{errors}
             missing_manifest: Could not find manifest.json
             nested_manifest: Could not find manifest.json in the root of the zip file,
               but %{found_path} was found. Try re-creating the archive from this directory.

data/config/locales/translations/zendesk_apps_support.yml

@@ -44,6 +44,10 @@ parts:
       key: "txt.apps.admin.error.app_build.manifest_not_json"
       title: "App builder job: manifest is invalid JSON error"
       value: "manifest is not proper JSON. %{errors}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_manifest_keys"
+      title: "App builder job: duplicate keys in manifest"
+      value: "There are duplicate keys specified in the manifest.json file. %{errors}"
   - translation:
       key: "txt.apps.admin.error.app_build.missing_manifest"
       title: "App builder job: missing manifest error"
@@ -131,7 +135,7 @@ parts:
   - translation:
       key: "txt.apps.admin.error.app_build.dirty_svg"
       title: "App builder job: invalid SVG markup error"
-      value: "%{svg} contains invalid markup and was unable to be automatically regenerated."
+      value: "%{svg} contains invalid markup and could not be automatically regenerated."
   - translation:
       key: "txt.apps.admin.error.app_build.oauth_keys.missing.one"
       title: "App builder job: missing oauth fields error"
@@ -209,7 +213,7 @@ parts:
   - translation:
       key: "txt.apps.admin.warning.app_build.sanitised_svg"
       title: "App builder job: warning that contents of svg have been sanitised and overwritten"
-      value: "The markup in %{svg} has been edited for use in Zendesk, and may not display as intended."
+      value: "The markup in %{svg} has been edited for use in Zendesk and may not display as intended."
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_version"
       title: "App builder job: invalid framework version"

data/lib/zendesk_apps_support/manifest.rb

@@ -141,7 +141,8 @@ module ZendeskAppsSupport
     attr_reader :locations
 
     def products_from_locations
-      location_options.map { |lo| lo.location.product_code }
+      location_options.map { |lo| lo.location && lo.location.product_code }
+                      .compact
                       .uniq
                       .map { |code| Product.find_by(code: code) }
     end

data/lib/zendesk_apps_support/package.rb

@@ -28,26 +28,24 @@ module ZendeskAppsSupport
     end
 
     def validate(marketplace: true)
-      [].tap do |errors|
-        errors << Validations::Manifest.call(self)
-
-        if has_manifest?
-          errors << Validations::Marketplace.call(self) if marketplace
-          errors << Validations::Source.call(self)
-          errors << Validations::Translations.call(self)
-          errors << Validations::Requirements.call(self)
-
-          if !manifest.requirements_only? && !manifest.marketing_only? && !manifest.iframe_only?
-            errors << Validations::Templates.call(self)
-            errors << Validations::Stylesheets.call(self)
-          end
+      errors = []
+      errors << Validations::Manifest.call(self)
+      if has_valid_manifest?(errors)
+        errors << Validations::Marketplace.call(self) if marketplace
+        errors << Validations::Source.call(self)
+        errors << Validations::Translations.call(self)
+        errors << Validations::Requirements.call(self)
+
+        unless manifest.requirements_only? || manifest.marketing_only? || manifest.iframe_only?
+          errors << Validations::Templates.call(self)
+          errors << Validations::Stylesheets.call(self)
         end
+      end
 
-        errors << Validations::Banner.call(self) if has_banner?
-        errors << Validations::Svg.call(self) if has_svgs?
+      errors << Validations::Banner.call(self) if has_banner?
+      errors << Validations::Svg.call(self) if has_svgs?
 
-        errors.flatten!.compact!
-      end
+      errors.flatten.compact
     end
 
     def validate!(marketplace: true)
@@ -250,6 +248,10 @@ module ZendeskAppsSupport
 
     private
 
+    def has_valid_manifest?(errors)
+      has_manifest? && errors.flatten.empty?
+    end
+
     def runtime_translations(translations)
       result = translations.dup
       result.delete('name')

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -24,6 +24,8 @@ module ZendeskAppsSupport
 
         rescue JSON::ParserError => e
           return [ValidationError.new(:manifest_not_json, errors: e)]
+        rescue ZendeskAppsSupport::Manifest::OverrideError => e
+          return [ValidationError.new(:duplicate_manifest_keys, errors: e.message)]
         end
 
         private

data/lib/zendesk_apps_support/validations/translations.rb

@@ -64,7 +64,8 @@ module ZendeskAppsSupport
         end
 
         def validate_top_level_required_keys(json, package, file_path)
-          missing_keys = get_missing_keys(package, json['app'].keys)
+          keys = json['app'].is_a?(Hash) ? json['app'].keys : []
+          missing_keys = get_missing_keys(package, keys)
           return if missing_keys.empty?
           ValidationError.new(
             'translation.missing_required_key',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.