zendesk_apps_support 4.11.1 → 4.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8fedffd68a61d5c41bb26ce85e5912112b6fc2fe6595b17e6164a60dc390e66
-  data.tar.gz: bf78421277309f7d8166f108da3eff4906c66efa3c30fdf537589c854e54b2c9
+  metadata.gz: c9188517f4a57a804b4648f6d4efbe06ec79ed6510b2acc95366aea3419691cb
+  data.tar.gz: e7c7235e7ba466161d93d0ceb5e3f43c1a4c28ee30eeecbddcd698d948ea900b
 SHA512:
-  metadata.gz: cb67d2e2d27605d4bd477a3866f382ac8a78f8314d5d7a80e3c03ea68681074f37f85e2bc7366353031f73a2dffa48fa9e0ee288b39fc6783908311a587d1725
-  data.tar.gz: 51d583a6f058dd550a6ada1d842c0658a28b54e0010f6dbbe01767ae4e79b9fd7adde4a3aae6f0af1e7efc883fc48fb8555666567c8de2f4d7722eb1f9051c56
+  metadata.gz: 5072150921ee6e3eb4f8d070079aedea3854a20a3ab7c55d6e7a2b6715422109e9b7fbf60f82fb2ae9aa6ad73e55f5adbfbdb62ee2ad09d24b095571311eb0ee
+  data.tar.gz: 046b5813b2fc8e18d8b3514834eadd4d886036fde06750013ffa1b9c2aa1bbdb58edc01dbce9bbdb803f614e555f8c77b2e185e960cb9a6f8221d450d72493a7

data/lib/zendesk_apps_support/package.rb

@@ -28,13 +28,13 @@ module ZendeskAppsSupport
       @warnings = []
     end
 
-    def validate(marketplace: true)
+    def validate(marketplace: true, skip_marketplace_translations: false)
       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::Translations.call(self, skip_marketplace_translations: skip_marketplace_translations)
         errors << Validations::Requirements.call(self)
 
         unless manifest.requirements_only? || manifest.marketing_only? || manifest.iframe_only?
@@ -49,8 +49,8 @@ module ZendeskAppsSupport
       errors.flatten.compact
     end
 
-    def validate!(marketplace: true)
-      errors = validate(marketplace: marketplace)
+    def validate!(marketplace: true, skip_marketplace_translations: false)
+      errors = validate(marketplace: marketplace, skip_marketplace_translations: skip_marketplace_translations)
       raise errors.first if errors.any?
       true
     end

data/lib/zendesk_apps_support/validations/translations.rb

@@ -13,13 +13,16 @@ module ZendeskAppsSupport
       end
 
       class << self
-        def call(package)
+        def call(package, opts = {})
           package.files.each_with_object([]) do |file, errors|
             path_match = TRANSLATIONS_PATH.match(file.relative_path)
             next unless path_match
             errors << locale_error(file, path_match[1]) << json_error(file) << format_error(file)
             next unless errors.compact.empty?
-            errors.push(*validate_marketplace_content(file, package)) if file.relative_path == 'translations/en.json'
+            if file.relative_path == 'translations/en.json'
+              # rubocop:disable Metrics/LineLength
+              errors.push(*validate_marketplace_content(file, package, opts.fetch(:skip_marketplace_translations, false)))
+            end
           end.compact
         end
 
@@ -70,24 +73,30 @@ module ZendeskAppsSupport
           ValidationError.new('translation.not_json', file: file.relative_path, errors: e)
         end
 
-        def validate_marketplace_content(file, package)
+        def validate_marketplace_content(file, package, skip_marketplace_translations)
           errors = []
           json = JSON.parse(file.read)
           product_names = Product::PRODUCTS_AVAILABLE.map(&:name)
           present_product_keys = json['app'].is_a?(Hash) ? json['app'].keys & product_names : []
+          skip_marketplace_strings = package.manifest.private? || skip_marketplace_translations
 
           if present_product_keys.empty?
-            errors << validate_top_level_required_keys(json, package, file.relative_path)
+            errors << validate_top_level_required_keys(json, file.relative_path, skip_marketplace_strings)
           else
             errors << validate_products_match_manifest_products(present_product_keys, package, file.relative_path)
-            errors << validate_products_have_required_keys(json, package, present_product_keys, file.relative_path)
+            errors << validate_products_have_required_keys(
+              json,
+              present_product_keys,
+              file.relative_path,
+              skip_marketplace_strings
+            )
           end
           errors.compact
         end
 
-        def validate_top_level_required_keys(json, package, file_path)
+        def validate_top_level_required_keys(json, file_path, skip_marketplace_strings)
           keys = json['app'].is_a?(Hash) ? json['app'].keys : []
-          missing_keys = get_missing_keys(package, keys)
+          missing_keys = get_missing_keys(keys, skip_marketplace_strings)
           return if missing_keys.empty?
           ValidationError.new(
             'translation.missing_required_key',
@@ -96,9 +105,9 @@ module ZendeskAppsSupport
           )
         end
 
-        def validate_products_have_required_keys(json, package, products, file_path)
+        def validate_products_have_required_keys(json, products, file_path, skip_marketplace_strings)
           products.each do |product|
-            missing_keys = get_missing_keys(package, json['app'][product].keys)
+            missing_keys = get_missing_keys(json['app'][product].keys, skip_marketplace_strings)
             next if missing_keys.empty?
             return ValidationError.new(
               'translation.missing_required_key_for_product',
@@ -135,10 +144,9 @@ module ZendeskAppsSupport
           end
         end
 
-        def get_missing_keys(package, keys)
+        def get_missing_keys(keys, skip_marketplace_strings)
           public_app_keys = %w[name short_description installation_instructions long_description]
-          mandatory_keys = package.manifest.private? ? ['name'] : public_app_keys
-
+          mandatory_keys = skip_marketplace_strings ? ['name'] : public_app_keys
           # since we support description as well as short_description for backwards compatibility,
           # validate keys as if description == short_description
           keys_to_validate = keys.map do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.11.1
+  version: 4.11.2
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.