zendesk_apps_support 1.29.2 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc7a818e32400866027384bc77b49bc2ee8133b
-  data.tar.gz: a66d4a56a160a192a6ec2272eb58ed84dc091411
+  metadata.gz: d4476b8e9538df6d66e4a9cccb93b03d633bf578
+  data.tar.gz: 568614d0401254083bc79846d34d19efe081c90c
 SHA512:
-  metadata.gz: 3ced00c83f13d7e25721b2200648c6104b7db82b1f3b9aa3f181461ddbc39174d148903877292016e331d7fefa2cedc4304f1b670a81e3ff2941cedcc143506d
-  data.tar.gz: 25a3b4fd8d46d00282d5210e48cc4fc21696d2f7e474c5bbbafcf6bcb3e724e06e850088055fb5c20c9977788a6f7b6195fe049553d801a9581e7fa37059453a
+  metadata.gz: 664b051da793aae6c5dbd5222384e3d5a663af29bba331291842d5486e98ee6713bd72dbb1c0766e0a067aed66d7eff0cd7a9d82595a08bb116718d4c2f7732e
+  data.tar.gz: 1c579b00dad7f5900bc8b87264ce95bcfe667a1183e24a9ffcc88171e1bb7ab9de2e3bc80b2dbb8f6f26cb2b399863b903b6d4d5308ca77ed19c2d2467360cb1

data/lib/zendesk_apps_support.rb

@@ -10,6 +10,7 @@ module ZendeskAppsSupport
   autoload :Package,                'zendesk_apps_support/package'
   autoload :Installed,              'zendesk_apps_support/installed'
   autoload :Installation,           'zendesk_apps_support/installation'
+  autoload :Finders,                'zendesk_apps_support/finders'
   autoload :AppRequirement,         'zendesk_apps_support/app_requirement'
   autoload :AppVersion,             'zendesk_apps_support/app_version'
   autoload :StylesheetCompiler,     'zendesk_apps_support/stylesheet_compiler'

data/lib/zendesk_apps_support/finders.rb

@@ -0,0 +1,32 @@
+module ZendeskAppsSupport
+  module Finders
+    class RecordNotFound < StandardError
+      def initialize(msg)
+        super(msg)
+      end
+    end
+
+    def find_by(arg)
+      all.find(&filter_by_arg(arg))
+    end
+
+    def find_by!(arg)
+      found = find_by(arg)
+      fail RecordNotFound.new("Unable to find #{self.name} with #{arg.inspect}") if found.nil?
+      found
+    end
+
+    def where(arg)
+      all.select(&filter_by_arg(arg))
+    end
+
+    private
+
+    def filter_by_arg(arg)
+      fail('More than one key-value pair found') if arg.size > 1
+      attribute, value = arg.to_a.first
+      value = value.to_s if value.is_a? Symbol
+      ->(product) { product.public_send(attribute) == value }
+    end
+  end
+end

data/lib/zendesk_apps_support/location.rb

@@ -1,29 +1,33 @@
 module ZendeskAppsSupport
-  module Location
-    # the numbers below match the enum values on the database, do not change them!
-    LOCATIONS_AVAILABLE = {
-      'zendesk' => {
-        'top_bar' => { 'id' => 1, 'orderable' => true },
-        'nav_bar' => { 'id' => 2, 'orderable' => true },
-        'ticket_sidebar' => { 'id' => 3, 'orderable' => true },
-        'new_ticket_sidebar' => { 'id' => 4, 'orderable' => true },
-        'user_sidebar' => { 'id' => 5, 'orderable' => true },
-        'organization_sidebar' => { 'id' => 6, 'orderable' => true },
-        'background' => { 'id' => 7, 'orderable' => false }
-      },
-      'zopim' => {
-        'chat_sidebar' => { 'id' => 8, 'orderable' => false }
-      }
-    }.freeze
+  class Location
+    extend ZendeskAppsSupport::Finders
+    attr_reader :id, :name, :orderable, :product_code
 
-    class << self
-      def hosts
-        LOCATIONS_AVAILABLE.keys
-      end
+    def initialize(attrs)
+      @id = attrs.fetch(:id)
+      @name = attrs.fetch(:name)
+      @orderable = attrs.fetch(:orderable)
+      @product_code = attrs.fetch(:product_code)
+    end
+
+    def product
+      Product.find_by(code: product_code)
+    end
 
-      def names_for(host)
-        LOCATIONS_AVAILABLE[host.to_s].keys
-      end
+    def self.all
+      LOCATIONS_AVAILABLE
     end
+
+    # the ids below match the enum values on the database, do not change them!
+    LOCATIONS_AVAILABLE = [
+      Location.new(id: 1, orderable: true, name: 'top_bar', product_code: Product::SUPPORT.code),
+      Location.new(id: 2, orderable: true, name: 'nav_bar', product_code: Product::SUPPORT.code),
+      Location.new(id: 3, orderable: true, name: 'ticket_sidebar', product_code: Product::SUPPORT.code),
+      Location.new(id: 4, orderable: true, name: 'new_ticket_sidebar', product_code: Product::SUPPORT.code),
+      Location.new(id: 5, orderable: true, name: 'user_sidebar', product_code: Product::SUPPORT.code),
+      Location.new(id: 6, orderable: true, name: 'organization_sidebar', product_code: Product::SUPPORT.code),
+      Location.new(id: 7, orderable: false, name: 'background', product_code: Product::SUPPORT.code),
+      Location.new(id: 8, orderable: false, name: 'chat_sidebar', product_code: Product::CHAT.code)
+    ].freeze
   end
 end

data/lib/zendesk_apps_support/package.rb

@@ -122,12 +122,14 @@ module ZendeskAppsSupport
       author = manifest_json['author']
       framework_version = manifest_json['frameworkVersion']
       single_install = manifest_json['singleInstall'] || false
+      signed_urls = manifest_json['signedUrls'] || false
       templates = is_no_template ? {} : compiled_templates(app_id, asset_url_prefix)
 
       app_settings = {
         location: locations,
         noTemplate: no_template_locations,
-        singleInstall: single_install
+        singleInstall: single_install,
+        signedUrls: signed_urls
       }.select { |_k, v| !v.nil? }
 
       SRC_TEMPLATE.result(

data/lib/zendesk_apps_support/product.rb

@@ -1,15 +1,25 @@
 module ZendeskAppsSupport
-  module Product
-    # The product code below match the values in the database, do not change them!
+  class Product
+    extend ZendeskAppsSupport::Finders
+    attr_reader :code, :name, :legacy_name
+
+    def initialize(attrs)
+      @code = attrs.fetch(:code)
+      @name = attrs.fetch(:name)
+      @legacy_name = attrs.fetch(:legacy_name)
+    end
+
+    def self.all
+      PRODUCTS_AVAILABLE
+    end
+
+    # The product codes below match the values in the database, do not change them!
     PRODUCTS_AVAILABLE = [
-      {
-        code: 1,
-        name: 'support',
-      },
-      {
-        code: 2,
-        name: 'chat',
-      }
+      Product.new(code: 1, name: 'support', legacy_name: 'zendesk'),
+      Product.new(code: 2, name: 'chat', legacy_name: 'zopim')
     ].freeze
+
+    SUPPORT = find_by!(name: 'support')
+    CHAT    = find_by!(name: 'chat')
   end
 end

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -102,9 +102,11 @@ module ZendeskAppsSupport
           errors = []
           manifest_locations = package.locations
           manifest_locations.find do |host, locations|
-            error = if !Location.hosts.include?(host)
+            # CRUFT: remove when support for legacy names are deprecated
+            product = Product.find_by(legacy_name: host) || Product.find_by(name: host)
+            error = if product.nil?
               ValidationError.new(:invalid_host, host_name: host)
-            elsif (invalid_locations = locations.keys - Location.names_for(host)).any?
+            elsif (invalid_locations = locations.keys - Location.where(product_code: product.code).map(&:name)).any?
               ValidationError.new(:invalid_location,
                                   invalid_locations: invalid_locations.join(', '),
                                   host_name: host,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.29.2
+  version: 1.30.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -160,6 +160,7 @@ files:
 - lib/zendesk_apps_support/assets/src.js.erb
 - lib/zendesk_apps_support/build_translation.rb
 - lib/zendesk_apps_support/engine.rb
+- lib/zendesk_apps_support/finders.rb
 - lib/zendesk_apps_support/i18n.rb
 - lib/zendesk_apps_support/installation.rb
 - lib/zendesk_apps_support/installed.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.