zendesk_apps_support 1.1.4 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGU4ZDQ2YzkxOWEzNmM2NjJjNDNiZmYzODZjOTdhNmM5MGE3YjA4ZQ==
+  data.tar.gz: !binary |-
+    OGU3MTU0YmJhNDQzODEzMWZhODA0ZmU2YWYxOWYwZWM0OGQ3ZTBkYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWNlZWNjZDg3NzNlNDIxNjc5OWRhZWFlMzBkMWQ3OTUyOGM1MWZlOTYyNjJl
+    NWQ3MjQ5ODJiYzFiNzRmOWZiOTE3ZGY4N2Y1OTZhY2U2ZjdiMzJjYTk1MTky
+    YjEwNGJjYmNkOTk0NzJlN2ViZTRmMjJjMWVlNzIyNTY0NWMxZjI=
+  data.tar.gz: !binary |-
+    MGQ0Njk5YmIxMTMzYmU3YTdiYzNkN2VmMTMyNmIzOWU4NjEyZDk2ZGY2NWVm
+    MzFhZTUzNmMyMGM1NjAwMWEyZTg1MGM5NzNkMTVjMDA4MWE0YTI4NjEyZjQx
+    Zjg5ZjE1ZmZkMzcwYTE4MDJkNjFhYmZjYWNmY2QwODkwMzFhZDY=

data/config/locales/en.yml

@@ -35,3 +35,6 @@ en:
               not_json: ! '%{file} is not valid JSON. %{errors}'
               not_json_object: ! '%{file} is not a JSON object.'
             stylesheet_error: ! 'Sass error: %{sass_error}'
+            invalid_type_parameter:
+              one: ! '%{invalid_types} is an invalid parameter type.'
+              other: ! '%{invalid_types} are invalid parameter types.'

data/config/locales/translations/zendesk_apps_support.yml

@@ -87,3 +87,11 @@ parts:
       key: "txt.apps.admin.error.app_build.stylesheet_error"
       title: "App builder job: invalid stylesheet syntax"
       value: "Sass error: %{sass_error}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_type_parameter.one"
+      title: "App builder job: single invalid parameter type error"
+      value: "%{invalid_types} is an invalid parameter type."
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_type_parameter.other"
+      title: "App builder job: multiple invalid parameter types error"
+      value: "%{invalid_types} are invalid parameter types."

data/lib/zendesk_apps_support/stylesheet_compiler.rb

@@ -12,7 +12,7 @@ module ZendeskAppsSupport
     end
 
     def app_asset_url(name)
-      "#{@url_prefix}/#{name}"
+      "#{@url_prefix}#{name}"
     end
 
     private

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -5,7 +5,8 @@ module ZendeskAppsSupport
     module Manifest
 
       REQUIRED_MANIFEST_FIELDS = %w( author defaultLocale location frameworkVersion).freeze
-      LOCATIONS_AVAILABLE      = %w( nav_bar ticket_sidebar new_ticket_sidebar ).freeze
+      LOCATIONS_AVAILABLE      = %w( nav_bar ticket_sidebar new_ticket_sidebar user_sidebar ).freeze
+      TYPES_AVAILABLE          = %W(text password checkbox url number multiline hidden).freeze
 
       class <<self
         def call(package)
@@ -21,6 +22,7 @@ module ZendeskAppsSupport
             errors << invalid_location_error(manifest)
             errors << parameters_error(manifest)
             errors << invalid_hidden_parameter_error(manifest)
+            errors << invalid_type_error(manifest)
             errors.compact!
           end
         rescue MultiJson::DecodeError => e
@@ -83,6 +85,22 @@ module ZendeskAppsSupport
           end
         end
 
+        def invalid_type_error(manifest)
+          return unless manifest['parameters'].kind_of?(Array)
+
+          invalid_types = []
+
+          manifest["parameters"].each do |parameter|
+            parameter_type = parameter.fetch("type", '')
+
+            invalid_types << parameter_type unless TYPES_AVAILABLE.include?(parameter_type)
+          end
+
+          if invalid_types.any?
+            ValidationError.new(:invalid_type_parameter, :invalid_types => invalid_types.join(', '), :count => invalid_types.length)
+          end
+        end
+
       end
     end
   end

data/spec/package_spec.rb

@@ -39,7 +39,7 @@ describe ZendeskAppsSupport::Package do
 
   describe 'readified_js' do
     it 'should generate js ready for installation' do
-      js = @package.readified_js(nil, 0, 'http://localhost:4567')
+      js = @package.readified_js(nil, 0, 'http://localhost:4567/')
       expected =<<HERE
 (function() {
     with( require('apps/framework/app_scope') ) {
@@ -61,7 +61,7 @@ describe ZendeskAppsSupport::Package do
         ZendeskApps["ABC"] = ZendeskApps.defineApp(source)
                 .reopenClass({ location: "ticket_sidebar" })
                 .reopen({
-                    assetUrlPrefix: "http://localhost:4567",
+                    assetUrlPrefix: "http://localhost:4567/",
                     appClassName: "app-0",
                     author: {
                         name: "John Smith",

data/spec/validations/manifest_spec.rb

@@ -101,7 +101,7 @@ describe ZendeskAppsSupport::Validations::Manifest do
       parameter_hash = {
           'parameters' => {
               'name' => 'a parameter',
-              'type' => 'string'
+              'type' => 'text'
           }
       }
 
@@ -113,7 +113,7 @@ describe ZendeskAppsSupport::Validations::Manifest do
       parameter_hash = {
           'parameters' => [{
               'name' => 'a parameter',
-              'type' => 'string'
+              'type' => 'text'
           }]
       }
 
@@ -131,11 +131,11 @@ describe ZendeskAppsSupport::Validations::Manifest do
         'parameters' => [
           {
             'name' => 'url',
-            'type' => 'string'
+            'type' => 'text'
           },
           {
             'name' => 'url',
-            'type' => 'string'
+            'type' => 'text'
           }
         ]
       }
@@ -143,5 +143,35 @@ describe ZendeskAppsSupport::Validations::Manifest do
       errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(parameter_hash))
       errors.map(&:to_s).should == ['Duplicate app parameters defined: ["url"]']
     end
+
+    it 'has an error when the parameter type is not valid' do
+      parameter_hash = {
+        'parameters' =>
+        [
+         {
+           'name' => 'should be number',
+           'type' => 'integer'
+         }
+        ]
+      }
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(default_required_params.merge(parameter_hash)))
+
+      expect(errors.count).to eq 1
+      expect(errors.first.to_s).to eq "integer is an invalid parameter type."
+    end
+
+    it "doesn't have an error with a correct parameter type" do
+      parameter_hash = {
+        'parameters' =>
+        [
+         {
+           'name' => 'valid type',
+           'type' => 'number'
+         }
+        ]
+      }
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(default_required_params.merge(parameter_hash)))
+      expect(errors).to be_empty
+    end
   end
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.1.4
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jshintrb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,27 +158,26 @@ files:
 homepage: http://github.com/zendesk/zendesk_apps_support
 licenses:
 - Apache License Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Support to help you develop Zendesk Apps.
 test_files:
 - spec/app/app.css