zendesk_apps_support 4.6.3 → 4.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8674f54cb17f6a9aca24d00045c70c817bd8f537
-  data.tar.gz: 85aa66a5a02ac638ad804afb6d7c898080edc90d
+  metadata.gz: 513c653a0a44ec4201b3683bec006c88a34f2950
+  data.tar.gz: 7fc5b30973b7cb1b8c25d3a489b21d549785b516
 SHA512:
-  metadata.gz: e07f95aec8b2625f35724031295897cd634dc5ccf2bd27268b984b864fff71d7103a349c228c876de9055b2f6a3ad883800359855436c8126677c28b2ed371f6
-  data.tar.gz: 0e2d0bc964fd082db3f2b5a5fae29ff903c0e3dc3125d38aad535a2023f67c86b018388d72b5f329ddd3c61bf016929e6b0fab8ff577be56a579835f828aa0da
+  metadata.gz: b6eef964a47a771ed2247b0d4e8ab5dc5ab70ab4eb280c85618b2c272d2b534dd7db0c88d028ac8011c755cbbf4d527534448498f207f8689e01315ea4b7539b
+  data.tar.gz: c1262f2ea2c41ad5c1d96280197a86d08fc603fef97fb439756766b7457708b55ab46b3b248654ba45c6185bc84c477e04d16591f0d9e03e2319b9090926e494

data/config/locales/en.yml

@@ -126,3 +126,5 @@ en:
               is deployed.
             sanitised_svg: The markup in %{svg} has been edited for use in Zendesk
               and may not display as intended.
+            bitmap_in_svg: "%{svg} contains an embedded bitmap and cannot be used
+              as an app icon. It has been replaced with a default placeholder icon."

data/config/locales/translations/zendesk_apps_support.yml

@@ -214,6 +214,10 @@ parts:
       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."
+  - translation:
+      key: "txt.apps.admin.warning.app_build.bitmap_in_svg"
+      title: "App builder job: warning that svg contains an embedded bitmap image and cannot be used"
+      value: "%{svg} contains an embedded bitmap and cannot be used as an app icon. It has been replaced with a default placeholder icon."
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_version"
       title: "App builder job: invalid framework version"

data/lib/zendesk_apps_support/assets/default_app_logo.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+   viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
+<path id="Fill-3" d="M1.5,6.1C1.3,5.9,1,6,1,6.4l0,7c0,0.3,0.2,0.7,0.5,0.9l6,3.6C7.8,18.1,8,18,8,17.6l0-7.1c0-0.3-0.2-0.7-0.5-0.9
+  L1.5,6.1z"/>
+<path id="Fill-5" d="M10.5,17.9c-0.3,0.2-0.5,0-0.5-0.3l0-7c0-0.3,0.2-0.7,0.5-0.9l6-3.6C16.8,5.9,17,6,17,6.4l0,7.1
+  c0,0.3-0.2,0.7-0.5,0.9L10.5,17.9z"/>
+<path id="Fill-1" d="M2.2,3.7c-0.3,0.2-0.3,0.4,0,0.6l6.2,3.6C8.7,8,9.2,8,9.4,7.9l6.3-3.6c0.3-0.2,0.3-0.4,0-0.6L9.5,0.1
+  C9.2,0,8.8,0,8.5,0.1L2.2,3.7z"/>
+</svg>

data/lib/zendesk_apps_support/validations/svg.rb

@@ -4,6 +4,8 @@ require 'loofah'
 module ZendeskAppsSupport
   module Validations
     module Svg
+      PLACEHOLDER_SVG_MARKUP = File.read(File.expand_path('../../assets/default_app_logo.svg', __FILE__))
+
       # whitelist elements and attributes used in Zendesk Garden assets
       Loofah::HTML5::WhiteList::ALLOWED_ELEMENTS_WITH_LIBXML2.add 'symbol'
       Loofah::HTML5::WhiteList::ACCEPTABLE_CSS_PROPERTIES.add 'position'
@@ -31,27 +33,43 @@ module ZendeskAppsSupport
       end
 
       class << self
+        def contains_embedded_bitmap?(markup)
+          Nokogiri::XML(markup).css('//image').any?
+        end
+
+        def rewrite_svg(svg, new_markup, package, errors)
+          warning_string = if contains_embedded_bitmap?(svg.read)
+                             'txt.apps.admin.warning.app_build.bitmap_in_svg'
+                           else
+                             'txt.apps.admin.warning.app_build.sanitised_svg'
+                           end
+
+          package.warnings << I18n.t(warning_string, svg: svg.relative_path)
+          compressed_new_markup = new_markup.tr("\n", '').squeeze(' ').gsub(/\>\s+\</, '><')
+          IO.write(svg.absolute_path, compressed_new_markup)
+        rescue
+          errors << ValidationError.new(:dirty_svg, svg: svg.relative_path)
+        end
+
         def call(package)
           errors = []
 
           package.svg_files.each do |svg|
-            markup = Loofah.xml_fragment(svg.read)
-                           .scrub!(@strip_declaration)
-                           .scrub!(@strip_spaces_between_css_attrs)
-                           .to_xml.strip
-
-            clean_markup = Loofah.xml_fragment(markup)
-                                 .scrub!(:prune)
-                                 .scrub!(@empty_malformed_markup)
-                                 .to_xml
-
-            next if clean_markup == markup
-            begin
-              compressed_clean_markup = clean_markup.tr("\n", '').squeeze(' ').gsub(/\>\s+\</, '><')
-              IO.write(svg.absolute_path, compressed_clean_markup)
-              package.warnings << I18n.t('txt.apps.admin.warning.app_build.sanitised_svg', svg: svg.relative_path)
-            rescue
-              errors << ValidationError.new(:dirty_svg, svg: svg.relative_path)
+            if contains_embedded_bitmap?(svg.read)
+              rewrite_svg(svg, PLACEHOLDER_SVG_MARKUP, package, errors)
+            else
+              markup = Loofah.xml_fragment(svg.read)
+                             .scrub!(@strip_declaration)
+                             .scrub!(@strip_spaces_between_css_attrs)
+                             .to_xml.strip
+
+              clean_markup = Loofah.xml_fragment(markup)
+                                   .scrub!(:prune)
+                                   .scrub!(@empty_malformed_markup)
+                                   .to_xml
+
+              next if clean_markup == markup
+              rewrite_svg(svg, clean_markup, package, errors)
             end
           end
           errors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.4
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -224,6 +224,7 @@ files:
 - lib/zendesk_apps_support/app_file.rb
 - lib/zendesk_apps_support/app_requirement.rb
 - lib/zendesk_apps_support/app_version.rb
+- lib/zendesk_apps_support/assets/default_app_logo.svg
 - lib/zendesk_apps_support/assets/default_styles.scss
 - lib/zendesk_apps_support/assets/default_template.html.erb
 - lib/zendesk_apps_support/assets/installed.js.erb
@@ -273,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.