zendesk_apps_support 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6b4d54f6f3f3d669be6796aa70461a280760d8
-  data.tar.gz: 787833b450289df21248a738a138432c69147f21
+  metadata.gz: c1af9b7ff78ef619e400492c4e98711a9e3a1014
+  data.tar.gz: 897349bef78c52a54a97759a4b1dfb66d82c235e
 SHA512:
-  metadata.gz: 0bef1113beb700741e6f095babcf9abe835d9a9e19e5f4846f1422c147f1cdf8b7c2948c927bda5d7a87829066d4481e253d7e641fae22d2db5e9b9b41a6ebdb
-  data.tar.gz: cf551e919001f36e59c84f1cb1a5fafa94a3b5770afb5b60a613ca29a279fe54f4212233e5f0de5dfb0a90ced05383f5bf156f4b6cea2341775c6949e4dc949c
+  metadata.gz: 49de33216f17a4a87460689156ad783291c73821501e89feb2da7347677474d2828742c5488a04621e34810be8cc6e20175810545e9f4bee895f3782a234c5df
+  data.tar.gz: f0a266f0584d30542bcf4056069467986e3e0850f31b10ca90f25dc4ffd6211c529aff92f015e8092c94a46b95bbd111db31f7384ffa0fe00df6d144f516fb58

data/config/locales/en.yml

@@ -27,6 +27,10 @@ en:
             invalid_location:
               one: '%{invalid_locations} is an invalid location.'
               other: '%{invalid_locations} are invalid locations.'
+            duplicate_location:
+              one: '%{duplicate_locations} is a duplicate location.'
+              other: '%{duplicate_locations} are duplicate locations.'
+            name_as_parameter_name: Can't call a parameter 'name'
             invalid_hidden_parameter:
               one: '%{invalid_params} is set to hidden and cannot be required.'
               other: '%{invalid_params} are set to hidden and cannot be required.'

data/config/locales/translations/zendesk_apps_support.yml

@@ -63,6 +63,18 @@ parts:
       key: "txt.apps.admin.error.app_build.invalid_location.other"
       title: "App builder job: invalid locations"
       value: "%{invalid_locations} are invalid locations."
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_location.one"
+      title: "App builder job: duplicate locations"
+      value: "%{duplicate_locations} is a duplicate location."
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_location.other"
+      title: "App builder job: duplicate locations"
+      value: "%{duplicate_locations} are duplicate locations."
+  - translation:
+      key: "txt.apps.admin.error.app_build.name_as_parameter_name"
+      title: "App builder job: error message when developer names a parameter 'name'"
+      value: "Can't call a parameter 'name'"
   - translation:
       key: "txt.apps.admin.error.app_build.invalid_hidden_parameter.one"
       title: "App builder job: hidden parameters set to required"

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -21,11 +21,13 @@ module ZendeskAppsSupport
             errors << missing_keys_error(manifest)
             errors << default_locale_error(manifest, package)
             errors << invalid_location_error(manifest)
+            errors << duplicate_location_error(manifest)
             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)
             errors.compact!
           end
         rescue MultiJson::DecodeError => e
@@ -89,6 +91,15 @@ module ZendeskAppsSupport
           end
         end
 
+        def duplicate_location_error(manifest)
+          locations           = *manifest['location']
+          duplicate_locations = *locations.select { |location| locations.count(location) > 1 }.uniq
+
+          unless duplicate_locations.empty?
+            ValidationError.new(:duplicate_location, :duplicate_locations => duplicate_locations.join(', '), :count => duplicate_locations.length)
+          end
+        end
+
         def invalid_version_error(manifest, package)
           valid_to_serve = AppVersion::TO_BE_SERVED
           target_version = manifest['frameworkVersion']
@@ -102,6 +113,14 @@ module ZendeskAppsSupport
           end
         end
 
+        def name_as_parameter_name_error(manifest)
+          if manifest['parameters'].kind_of?(Array)
+            if manifest['parameters'].any? { |p| p['name'] == 'name' }
+              ValidationError.new(:name_as_parameter_name)
+            end
+          end
+        end
+
         def invalid_hidden_parameter_error(manifest)
           invalid_params = []
 

data/spec/validations/manifest_spec.rb

@@ -65,6 +65,16 @@ describe ZendeskAppsSupport::Validations::Manifest do
     locations_error.should_not be_nil
   end
 
+  it 'should have an error when there are duplicate locations' do
+    manifest = { 'location' => ['ticket_sidebar', 'ticket_sidebar'] }
+    manifest_file = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(manifest))
+    package = mock('Package', :files => [manifest_file])
+    errors = ZendeskAppsSupport::Validations::Manifest.call(package)
+
+    locations_error = errors.find { |e| e.to_s =~ /duplicate/ }
+    locations_error.should_not be_nil
+  end
+
   it 'should have an error when the version is not supported' do
     manifest = { 'frameworkVersion' => '0.7' }
     manifest_file = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(manifest))
@@ -129,6 +139,18 @@ describe ZendeskAppsSupport::Validations::Manifest do
       errors.map(&:to_s).should == ['App parameters must be an array.']
     end
 
+    it 'has an error when there is a parameter called "name"' do
+      parameter_hash = {
+          'parameters' => [{
+              'name' => 'name',
+              'type' => 'text'
+          }]
+      }
+
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(parameter_hash))
+      errors.map(&:to_s).should == ["Can't call a parameter 'name'"]
+    end
+
     it "doesn't have an error with an array of app parameters" do
       parameter_hash = {
           'parameters' => [{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n