zendesk_apps_support 1.18.4 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3704f0f39594427cf4d4c7dcf6d481b89c04740b
-  data.tar.gz: addec33456215b3300ea96eb148057e973ab442e
+  metadata.gz: 2ace40b56ef156df8ee9d1d75701446de28de6f0
+  data.tar.gz: 9646fb502276edd309aa2e4201ce3ddaa4ad8997
 SHA512:
-  metadata.gz: 03452ab686734b9df47989de200531cb2df02643831893e07687750a92092bd8bb93d6e4c10244ce838a68c57925bd29371a51ada6cb0e50d785a8311d7d0da3
-  data.tar.gz: 458d822c9b0919f1f8fc6a32216c5d753d1306a69474c31dcff48fc79f113d9f922b97687c396687b051e732374ddfd991e0f8b1d797a06e00defaac83864c68
+  metadata.gz: df6abfa20f351c08abe3477bb01677c67e04a8d4e8331b7d99c8af19398b7b602bd0a4ab12f6272c296882286e724a9af8d9641d6214d49a6bcb70f23d9e2716
+  data.tar.gz: baea6079f6fb78b82526593935424cb2c04ff104eb6432d02f3e81c3cbd30257cec00f4655280e8edd3507aa17e794ecbca8e874b491f34ca89f29cff1cf4e28

data/config/locales/en.yml

@@ -45,9 +45,10 @@ en:
             invalid_default_locale: '%{defaultLocale} is not a valid default locale.'
             missing_translation_file: 'Missing translation file for locale ''%{defaultLocale}''.
               Please read: http://developer.zendesk.com/documentation/apps/i18n.html'
+            invalid_host: '%{host_name} is an invalid host for apps.'
             invalid_location:
-              one: '%{invalid_locations} is an invalid location.'
-              other: '%{invalid_locations} are invalid locations.'
+              one: '%{invalid_locations} is an invalid location in %{host_name}.'
+              other: '%{invalid_locations} are invalid locations in %{host_name}.'
             duplicate_location:
               one: '%{duplicate_locations} is a duplicate location.'
               other: '%{duplicate_locations} are duplicate locations.'

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -5,8 +5,11 @@ module ZendeskAppsSupport
     module Manifest
       REQUIRED_MANIFEST_FIELDS = %w( author defaultLocale ).freeze
       OAUTH_REQUIRED_FIELDS    = %w( client_id client_secret authorize_uri access_token_uri ).freeze
-      LOCATIONS_AVAILABLE      = %w( top_bar nav_bar ticket_sidebar new_ticket_sidebar user_sidebar organization_sidebar ).freeze
       TYPES_AVAILABLE          = %w( text password checkbox url number multiline hidden ).freeze
+      LOCATIONS_AVAILABLE      = {
+        'zendesk' => %w( top_bar nav_bar ticket_sidebar new_ticket_sidebar user_sidebar organization_sidebar ),
+        'zopim' => %w( chat_sidebar )
+      }.freeze
 
       class <<self
         def call(package)
@@ -104,9 +107,14 @@ module ZendeskAppsSupport
         end
 
         def invalid_location_error(manifest)
-          invalid_locations = [*manifest['location']] - LOCATIONS_AVAILABLE
-          unless invalid_locations.empty?
-            ValidationError.new(:invalid_location, invalid_locations: invalid_locations.join(', '), count: invalid_locations.length)
+          manifest_location = manifest['location'].is_a?(Hash) ? manifest['location'] : { 'zendesk' => [*manifest['location']] }
+          manifest_location.find do |host, locations|
+            error = if !LOCATIONS_AVAILABLE.keys.include?(host)
+              ValidationError.new(:invalid_host, host_name: host)
+            elsif (invalid_locations = locations - LOCATIONS_AVAILABLE[host]).any?
+              ValidationError.new(:invalid_location, invalid_locations: invalid_locations.join(', '), host_name: host, count: invalid_locations.length)
+            end
+            break error if error
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.18.4
+  version: 1.19.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n