zendesk_apps_support 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3055335096394934cafc9c548907e1cfaaab976e
-  data.tar.gz: bed1c6bdc27453eaea089516fe98e9ba453f578c
+  metadata.gz: 58ceec0aaae39626d6beea11fec546292b8bc189
+  data.tar.gz: ab381ae71f046c859a30f4d69ab4a7461dfbdb9b
 SHA512:
-  metadata.gz: d2185231043764b8709eb2d1289f4562e6aafeb76c4b917d5c39e93accd5dbfdcddeaa1bf206974412ad70bf84b7422e1d8ae0a63d3b14b778155138e1f18736
-  data.tar.gz: 61abb816e118e9e30fe4edd535df19ce2e53a1f8aa0fff48f0b8a2222fae7a006190a85a13c3e5b8ae8783a55b61bcbbbfa88d7b0271847a55aaf03c7901c6a3
+  metadata.gz: c17c0fc787ef6e3031f6b5328b1604ce5e1fd564ad175add7289e099560bde444516d3283bb87e58be3fe67cbb3795873d3de2998b565b5facc17e931e98ecf1
+  data.tar.gz: 493cd4ff0ed9a17cfd625d905e77fff4a86baa98772fc70f0baaabc9a5930d539f1ecd2911d69b3648f26937038af94aeb8a274533653b146e2017330772a289

data/config/locales/en.yml

@@ -18,6 +18,12 @@ en:
                 one: 'Missing required field in manifest: %{missing_keys}'
                 other: 'Missing required fields in manifest: %{missing_keys}'
             requirements_not_json: requirements.json is not proper JSON. %{errors}
+            duplicate_requirements:
+              one: 'requirements.json contains a duplicate key: %{duplicate_keys}'
+              other: 'requirements.json contains duplicate keys: %{duplicate_keys}'
+            invalid_requirements_types:
+              one: 'requirements.json contains an invalid type: %{invalid_types}'
+              other: 'requirements.json contains invalid types: %{invalid_types}'
             oauth_keys:
               missing:
                 one: 'Missing required oauth field in manifest: %{missing_keys}'

data/config/locales/translations/zendesk_apps_support.yml

@@ -44,6 +44,22 @@ parts:
       key: "txt.apps.admin.error.app_build.requirements_not_json"
       title: "App builder job: requirements file is invalid JSON error"
       value: "requirements.json is not proper JSON. %{errors}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_requirements.one"
+      title: "App builder job: requirements file contains duplicate key error"
+      value: "requirements.json contains a duplicate key: %{duplicate_keys}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_requirements.other"
+      title: "App builder job: requirements file contains duplicate keys error"
+      value: "requirements.json contains duplicate keys: %{duplicate_keys}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_requirements_types.one"
+      title: "App builder job: requirements file contains invalid type error"
+      value: "requirements.json contains an invalid type: %{invalid_types}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_requirements_types.other"
+      title: "App builder job: requirements file contains invalid types error"
+      value: "requirements.json contains invalid types: %{invalid_types}"
   - translation:
       key: "txt.apps.admin.error.app_build.oauth_keys.missing.one"
       title: "App builder job: missing oauth fields error"

data/lib/zendesk_apps_support/validations/requirements.rb

@@ -1,29 +1,55 @@
 require 'multi_json'
+require 'json/stream'
+require 'pp'
 
 module ZendeskAppsSupport
   module Validations
     module Requirements
 
+      REQUIREMENTS_TYPES = %w(automations macros targets ticket_fields triggers user_fields).freeze
+
       class <<self
         def call(package)
-          requirements = package.files.find { |f| f.relative_path == 'requirements.json' }
+          requirements_file = package.files.find { |f| f.relative_path == 'requirements.json' }
 
-          errors = []
+          return [ValidationError.new(:missing_requirements)] unless requirements_file
 
-          if requirements && !valid_json?(requirements)
-            errors << ValidationError.new(:requirements_not_json)
+          requirements_stream = requirements_file.read
+          duplicates = non_unique_type_keys(requirements_stream)
+          unless duplicates.empty?
+            return [ValidationError.new(:duplicate_requirements, :duplicate_keys => duplicates.join(', '), :count => duplicates.length)]
           end
 
-          errors
+          requirements = MultiJson.load(requirements_stream)
+          [].tap do |errors|
+            errors << invalid_requirements_types(requirements)
+            errors.compact!
+          end
+        rescue MultiJson::DecodeError => e
+          return [ValidationError.new(:requirements_not_json, :errors => e)]
         end
 
         private
 
-        def valid_json? json
-          MultiJson.load(json)
-          true
-        rescue MultiJson::DecodeError
-          false
+        def invalid_requirements_types(requirements)
+          invalid_types = requirements.keys - REQUIREMENTS_TYPES
+
+          unless invalid_types.empty?
+            ValidationError.new(:invalid_requirements_types, :invalid_types => invalid_types.join(', '), :count => invalid_types.length)
+          end
+        end
+
+        def non_unique_type_keys(requirements)
+          keys = []
+          duplicates = []
+          parser = JSON::Stream::Parser.new do
+            start_object { keys.push({}) }
+            end_object { keys.pop }
+            key { |k| duplicates.push(k) if keys.last.include? k; keys.last[k] = nil }
+          end
+          parser << requirements
+
+          duplicates
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -69,6 +69,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement