zendesk_apps_support 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18dad0a88a0050882a95ef6dab859c2a986771e
-  data.tar.gz: 581026a5b94705833c2aa8730768cbf1f0d41fb6
+  metadata.gz: 8760acb02112cebac8b8daca8460f1faedad4e64
+  data.tar.gz: 17b865646f23c21bcdc07a91e9b045107952e3ae
 SHA512:
-  metadata.gz: 55bcb995135adb86d47c323b1240930e8f6635be741fbc5a3953f88cdf3e18e655181c291134978f162c3c6218728fa933ab78e63fd9e73c642cd527e14d82d5
-  data.tar.gz: 2043571958b3add67fdbd1047ab18093a05cef6cb94642c2751fed978c21d9d604ecf2a3f0909c53114c87408dac4dc7396a59a1731fda45221aaa2bb05b78c7
+  metadata.gz: 63f2b79999d8f52ffb0653a3d59788dbb286c34ab8d7c346a03123997deb602459be6e99e5b7df86f82723775bdbde6cfaec33beffdc469a2f6fcdd4dc694a83
+  data.tar.gz: 884dca14e438507f1034090774b9c51d5bce8b9079769095db5302cbb4f340868757e57e0e525a9e8bb53d85dbbc81fd63cb74f3127fd5fd9df0f06cc4899741

data/config/locales/translations/zendesk_apps_support.yml

@@ -17,8 +17,8 @@ parts:
       value: "JSHint errors in %{file}: %{errors}"
   - translation:
       key: "txt.apps.admin.error.app_build.no_template_deprecated_in_v2"
-      title: "App builder job: prevent using noTemplate in v2 apps and give advice on how to migrate"
-      value: "noTemplate is deprecated and cannot be used with frameworkVersion 2 or above. Set the autoLoad or autoHide property for each specific location instead. Learn more: %{link}."
+      title: "App builder job: prevent using noTemplate in v2 apps and give advice on how to migrate. Leave noTemplate and autoHide as is (do not localize)"
+      value: "noTemplate is deprecated and cannot be used with framework version 2 or above. Set the autoLoad or autoHide property for each specific location instead. Learn more: %{link}."
   - translation:
       key: "txt.apps.admin.error.app_build.no_parameters_required"
       title: "App builder job: prevent adding parameters while marketing only"

data/lib/zendesk_apps_support/installed.rb

@@ -3,6 +3,7 @@ require 'erubis'
 
 module ZendeskAppsSupport
   class Installed
+    extend Gem::Deprecate
     INSTALLED_TEMPLATE = Erubis::Eruby.new(File.read(File.expand_path('../assets/installed.js.erb', __FILE__)))
 
     def initialize(appsjs, installations = [])
@@ -10,7 +11,7 @@ module ZendeskAppsSupport
       @installations = installations
     end
 
-    def compile_js(options = {})
+    def compile(options = {})
       installation_order = options.fetch(:installation_orders, {})
 
       INSTALLED_TEMPLATE.result(
@@ -19,5 +20,8 @@ module ZendeskAppsSupport
         installation_orders: installation_order
       )
     end
+
+    alias compile_js compile
+    deprecate :compile_js, :compile, 2017, 1
   end
 end

data/lib/zendesk_apps_support/package.rb

@@ -99,7 +99,8 @@ module ZendeskAppsSupport
       files.select { |f| f =~ %r{^translations/} }
     end
 
-    def compile_js(options)
+    # this is not really compile_js, it compiles the whole app including scss for v1 apps
+    def compile(options)
       begin
         app_id = options.fetch(:app_id)
         asset_url_prefix = options.fetch(:assets_dir)
@@ -132,6 +133,9 @@ module ZendeskAppsSupport
       )
     end
 
+    alias compile_js compile
+    deprecate :compile_js, :compile, 2017, 1
+
     def manifest_json
       @manifest_json ||= read_json(MANIFEST_FILENAME)
     end
@@ -158,7 +162,7 @@ module ZendeskAppsSupport
 
     def compiled_templates(app_id, asset_url_prefix)
       compiler = ZendeskAppsSupport::StylesheetCompiler.new(DEFAULT_SCSS + app_css, app_id, asset_url_prefix)
-      compiled_css = compiler.compile
+      compiled_css = compiler.compile(sassc: manifest.enabled_experiments.include?('newCssCompiler'))
 
       layout = templates['layout'] || DEFAULT_LAYOUT.result
 

data/lib/zendesk_apps_support/sass_functions.rb

@@ -19,3 +19,24 @@ module Sass::Script::Functions
 
   include AppAssetUrl
 end
+
+require 'sassc'
+
+module SassC::Script::Functions
+  module AppAssetUrl
+    def app_asset_url(name)
+      raise ArgumentError, "Expected #{name} to be a string" unless name.is_a? Sass::Script::Value::String
+      result = %{url("#{app_asset_url_helper(name)}")}
+      SassC::Script::String.new(result)
+    end
+
+    private
+
+    def app_asset_url_helper(name)
+      url_builder = options[:app_asset_url_builder]
+      url_builder.app_asset_url(name.value)
+    end
+  end
+
+  include AppAssetUrl
+end

data/lib/zendesk_apps_support/stylesheet_compiler.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'sass'
+require 'sassc'
 require 'zendesk_apps_support/sass_functions'
 
 module ZendeskAppsSupport
@@ -10,8 +11,17 @@ module ZendeskAppsSupport
       @url_prefix = url_prefix
     end
 
-    def compile
-      Sass::Engine.new(wrapped_source, syntax: :scss, app_asset_url_builder: self).render
+    def compile(sassc: false)
+      options = {
+        syntax: :scss, app_asset_url_builder: self
+      }
+      if sassc
+        compiler_class = SassC
+        options[:style] = :compressed
+      else
+        compiler_class = Sass
+      end
+      compiler_class::Engine.new(wrapped_source.dup, options).render
     end
 
     def app_asset_url(name)

data/lib/zendesk_apps_support/validations/marketplace.rb

@@ -2,7 +2,7 @@
 module ZendeskAppsSupport
   module Validations
     module Marketplace
-      WHITELISTED_EXPERIMENTS = ['hashParams'].freeze
+      WHITELISTED_EXPERIMENTS = %w(hashParams newCssCompiler).freeze
 
       class << self
         def call(package)

data/lib/zendesk_apps_support/validations/source.rb

@@ -15,9 +15,8 @@ module ZendeskAppsSupport
         sub: true,
 
         # predefined globals:
-        predef: %w(_ console services helpers alert confirm window document self
-                   JSON Base64 clearInterval clearTimeout setInterval setTimeout
-                   require module exports top frames parent moment),
+        predef: %w(_ console services helpers alert confirm self
+                   JSON Base64 require module exports moment),
 
         browser: true
       }.freeze

data/lib/zendesk_apps_support/validations/stylesheets.rb

@@ -16,7 +16,7 @@ module ZendeskAppsSupport
           compiler = ZendeskAppsSupport::StylesheetCompiler.new(css, nil, nil)
           begin
             compiler.compile
-          rescue Sass::SyntaxError => e
+          rescue SassC::SyntaxError, Sass::SyntaxError => e
             return ValidationError.new(:stylesheet_error, sass_error: e.message)
           end
           nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -27,6 +27,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement