zendesk_apps_support 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f36f2639f048681823a88ef9669638499ce53d2
-  data.tar.gz: 526ed308014fe9475d670597f63904a112ecdd5c
+  metadata.gz: 05ad3567f597664ad8ce94c872134e67f2e9bda7
+  data.tar.gz: 2a3f1251f376c3e59f81ec773586aafa559c50f9
 SHA512:
-  metadata.gz: 881df6e418a86e65c7e8774b72f96924fd2b5d4aa96ffa34bb27d1f9fadc141d852835cc6677ceae7bfcad3284399b785f788c91547b982f20e5d109319a3b0b
-  data.tar.gz: d49736cdfb17419959dadee4b5755f0ef709432d0ffea53bf86655fe57ed5ec9794c1ea4276a8dcd3c9c93fe6be183f54dc23725fc19904295d5aff831e307dc
+  metadata.gz: b56372c5c05c92f5e17b213a53fcfabdbdf4533691ad0cab5738eb0c28aa31719ae22f6ba7488432565f537ca39605bec0abd611ce8586588d47b1f1ce62a8e1
+  data.tar.gz: a5661aba54f00f86803467580fc11eb04ccda18d7ef808e72275548e8c55267675d9475b50a9fe68e5b89696e842783be12e75a8cfa8eee52774df9984d9b9c6

data/config/locales/en.yml

@@ -83,6 +83,10 @@ en:
             duplicate_reference: 'Duplicate reference in manifest: "%{key}".'
             duplicate_reference_values: Initially set to "%{original}", attempted
               overwrite to "%{attempted}".
+            locations_must_be_urls: App locations need to be URLs for this framework
+              version.
+            locations_cant_be_urls: App locations must not be URLs for this framework
+              version.
         warning:
           app_build:
             deprecated_version: You are targeting a deprecated version of the framework.

data/config/locales/translations/zendesk_apps_support.yml

@@ -220,3 +220,11 @@ parts:
       key: "txt.apps.admin.error.app_build.duplicate_reference_values"
       title: "This sentence follows txt.apps.admin.error.app_build.duplicate_reference. The values are included to help find the problem."
       value: "Initially set to \"%{original}\", attempted overwrite to \"%{attempted}\"."
+  - translation:
+      key: "txt.apps.admin.error.app_build.locations_must_be_urls"
+      title: "The locations needed to be URLs, but they were empty."
+      value: "App locations need to be URLs for this framework version."
+  - translation:
+      key: "txt.apps.admin.error.app_build.locations_cant_be_urls"
+      title: "The locations can't be URLs, but they were."
+      value: "App locations must not be URLs for this framework version."

data/lib/zendesk_apps_support/manifest.rb

@@ -23,6 +23,7 @@ module ZendeskAppsSupport
     }.freeze
 
     attr_reader(*RUBY_TO_JSON.keys)
+    attr_reader :locations
 
     alias_method :requirements_only?, :requirements_only
     alias_method :signed_urls?, :signed_urls
@@ -45,27 +46,9 @@ module ZendeskAppsSupport
       !locations.values.all?(&:empty?)
     end
 
-    def locations
-      @locations ||=
-        case original_locations
-        when Hash
-          @used_hosts = original_locations.keys
-          replace_legacy_locations original_locations
-        when Array
-          @used_hosts = ['support']
-          { 'support' => NoOverrideHash[original_locations.map { |location| [ location, LEGACY_URI_STUB ] }] }
-        when String
-          @used_hosts = ['support']
-          { 'support' => { original_locations => LEGACY_URI_STUB } }
-        # TODO: error out for numbers and Booleans
-        else # NilClass
-          @used_hosts = ['support']
-          { 'support' => {} }
-        end
-    end
-
     def unknown_hosts
-      @unknown_hosts ||= @used_hosts - Product::PRODUCTS_AVAILABLE.flat_map { |p| [p.name, p.legacy_name] }
+      @unknown_hosts ||=
+        @used_hosts - Product::PRODUCTS_AVAILABLE.flat_map { |p| [p.name, p.legacy_name] }
     end
 
     def iframe_only?
@@ -91,10 +74,30 @@ module ZendeskAppsSupport
       @private = m.fetch('private', true)
       @signed_urls ||= false
       @no_template ||= false
+      set_locations_and_hosts
     end
 
     private
 
+    def set_locations_and_hosts
+      @locations =
+        case original_locations
+        when Hash
+          @used_hosts = original_locations.keys
+          replace_legacy_locations original_locations
+        when Array
+          @used_hosts = ['support']
+          { 'support' => NoOverrideHash[original_locations.map { |location| [ location, LEGACY_URI_STUB ] }] }
+        when String
+          @used_hosts = ['support']
+          { 'support' => { original_locations => LEGACY_URI_STUB } }
+        # TODO: error out for numbers and Booleans
+        else # NilClass
+          @used_hosts = ['support']
+          { 'support' => {} }
+        end
+    end
+
     def replace_legacy_locations(original_locations)
       NoOverrideHash.new.tap do |new_locations_obj|
         Product::PRODUCTS_AVAILABLE.each do |product|

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -244,7 +244,7 @@ module ZendeskAppsSupport
             url != stub
           end
           legacy_locations = (!iframe_locations && manifest.location?) || locations_any?(locations) do |url|
-            url != stub
+            url == stub
           end
           if manifest.iframe_only?
             return ValidationError.new(:locations_must_be_urls) if legacy_locations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - James A. Rosen