zendesk_apps_support 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2865d2a5904f7c81d33e611b0e81577782e8c7b1
-  data.tar.gz: 50cb5050e1c0fd28fcaf2585391bfc1efc32f1a6
+  metadata.gz: 3055335096394934cafc9c548907e1cfaaab976e
+  data.tar.gz: bed1c6bdc27453eaea089516fe98e9ba453f578c
 SHA512:
-  metadata.gz: 2ee743704a038fd5df2b1ad62c3c24615bbd5760a8144e27d3db8d11e2ec9112856c9dc5223f93ce50afd788d99cc4c75286c690d8abb55fd9633432a1f0a522
-  data.tar.gz: b7c048132f56b68db4487c06773c64f817ede39be34be846aca38c4c6567ce2a5c4627595cabcd21c189a7b05d093eaad1dd12301bc0ac7cecde2eb40689e2a5
+  metadata.gz: d2185231043764b8709eb2d1289f4562e6aafeb76c4b917d5c39e93accd5dbfdcddeaa1bf206974412ad70bf84b7422e1d8ae0a63d3b14b778155138e1f18736
+  data.tar.gz: 61abb816e118e9e30fe4edd535df19ce2e53a1f8aa0fff48f0b8a2222fae7a006190a85a13c3e5b8ae8783a55b61bcbbbfa88d7b0271847a55aaf03c7901c6a3

data/lib/zendesk_apps_support/package.rb

@@ -26,7 +26,7 @@ module ZendeskAppsSupport
           errors << Validations::Package.call(self)
           errors << Validations::Translations.call(self)
 
-          if has_location?
+          if has_js?
             errors << Validations::Source.call(self)
             errors << Validations::Templates.call(self)
             errors << Validations::Stylesheets.call(self)
@@ -101,8 +101,12 @@ module ZendeskAppsSupport
       customer_css = File.exist?(css_file) ? File.read(css_file) : ""
     end
 
+    def has_js?
+      file_exists?("app.js")
+    end
+
     def has_manifest?
-      File.exist?(File.join(root, "manifest.json"))
+      file_exists?("manifest.json")
     end
 
     def has_location?
@@ -110,7 +114,7 @@ module ZendeskAppsSupport
     end
 
     def has_requirements?
-      File.exist?(File.join(root, "requirements.json"))
+      file_exists?("requirements.json")
     end
 
     def is_requirements_only?
@@ -149,6 +153,10 @@ module ZendeskAppsSupport
       files
     end
 
+    def file_exists?(path)
+      File.exist?(File.join(root, path))
+    end
+
     def read_file(path)
       file_path = File.join(root, path)
       File.read(File.join(root, path))

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -4,7 +4,7 @@ module ZendeskAppsSupport
   module Validations
     module Manifest
 
-      REQUIRED_MANIFEST_FIELDS = %w( author defaultLocale frameworkVersion ).freeze
+      REQUIRED_MANIFEST_FIELDS = %w( author defaultLocale ).freeze
       OAUTH_REQUIRED_FIELDS    = %w( client_id client_secret authorize_uri access_token_uri ).freeze
       LOCATIONS_AVAILABLE      = %w( top_bar nav_bar ticket_sidebar new_ticket_sidebar user_sidebar ).freeze
       TYPES_AVAILABLE          = %W( text password checkbox url number multiline hidden ).freeze
@@ -19,16 +19,18 @@ module ZendeskAppsSupport
           [].tap do |errors|
             errors << missing_keys_error(manifest)
             errors << default_locale_error(manifest, package)
-            errors << invalid_version_error(manifest, package)
             errors << oauth_error(manifest)
             errors << parameters_error(manifest)
             errors << invalid_hidden_parameter_error(manifest)
             errors << invalid_type_error(manifest)
             errors << name_as_parameter_name_error(manifest)
 
-            if package.has_location?
+            if package.has_js?
+              errors << missing_location_error(package)
               errors << invalid_location_error(manifest)
               errors << duplicate_location_error(manifest)
+              errors << missing_framework_version(manifest)
+              errors << invalid_version_error(manifest, package)
             end
             errors.compact!
           end
@@ -70,9 +72,7 @@ module ZendeskAppsSupport
             manifest[key].nil?
           end
 
-          if missing.any?
-            ValidationError.new('manifest_keys.missing', :missing_keys => missing.join(', '), :count => missing.length)
-          end
+          missing_keys_validation_error(missing) if missing.any?
         end
 
         def default_locale_error(manifest, package)
@@ -86,6 +86,10 @@ module ZendeskAppsSupport
           end
         end
 
+        def missing_location_error(package)
+          missing_keys_validation_error(['location']) unless package.has_location?
+        end
+
         def invalid_location_error(manifest)
           invalid_locations = [*manifest['location']] - LOCATIONS_AVAILABLE
           unless invalid_locations.empty?
@@ -102,6 +106,10 @@ module ZendeskAppsSupport
           end
         end
 
+        def missing_framework_version(manifest)
+          missing_keys_validation_error(['frameworkVersion']) if manifest['frameworkVersion'].nil?
+        end
+
         def invalid_version_error(manifest, package)
           valid_to_serve = AppVersion::TO_BE_SERVED
           target_version = manifest['frameworkVersion']
@@ -151,6 +159,12 @@ module ZendeskAppsSupport
           end
         end
 
+        private
+
+        def missing_keys_validation_error(missing_keys)
+          ValidationError.new('manifest_keys.missing', :missing_keys => missing_keys.join(', '), :count => missing_keys.length)
+        end
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n