zendesk_apps_support 1.1.3 → 1.1.4

data/config/locales/en.yml

@@ -27,9 +27,11 @@ en:
             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.'
-            parameters_not_an_array: App Parameters must be an array.
+            parameters_not_an_array: App parameters must be an array.
+            duplicate_parameters: ! 'Duplicate app parameters defined: %{duplicate_parameters}'
             translation:
               invalid_locale: ! '%{file} is not a valid locale. Only two- and three-letter
                 ISO 639 language codes are allowed.'
               not_json: ! '%{file} is not valid JSON. %{errors}'
               not_json_object: ! '%{file} is not a JSON object.'
+            stylesheet_error: ! 'Sass error: %{sass_error}'

data/config/locales/translations/zendesk_apps_support.yml

@@ -67,6 +67,10 @@ parts:
       key: "txt.apps.admin.error.app_build.parameters_not_an_array"
       title: "App builder job: app parameters must be an array"
       value: "App parameters must be an array."
+  - translation:
+      key: "txt.apps.admin.error.app_build.duplicate_parameters"
+      title: "App builder job: duplicate parameters error"
+      value: "Duplicate app parameters defined: %{duplicate_parameters}"
   - translation:
       key: "txt.apps.admin.error.app_build.translation.invalid_locale"
       title: "App builder job: invalid locale file name"
@@ -79,3 +83,7 @@ parts:
       key: "txt.apps.admin.error.app_build.translation.not_json_object"
       title: "App builder job: translation file is not a JSON object"
       value: "%{file} is not a JSON object."
+  - translation:
+      key: "txt.apps.admin.error.app_build.stylesheet_error"
+      title: "App builder job: invalid stylesheet syntax"
+      value: "Sass error: %{sass_error}"

data/lib/zendesk_apps_support.rb

@@ -16,5 +16,6 @@ module ZendeskAppsSupport
     autoload :Templates,             'zendesk_apps_support/validations/templates'
     autoload :Translations,          'zendesk_apps_support/validations/translations'
     autoload :JSHintValidationError, 'zendesk_apps_support/validations/validation_error'
+    autoload :Stylesheets,           'zendesk_apps_support/validations/stylesheets'
   end
 end

data/lib/zendesk_apps_support/package.rb

@@ -18,7 +18,8 @@ module ZendeskAppsSupport
       Validations::Manifest.call(self) +
         Validations::Source.call(self) +
         Validations::Templates.call(self) +
-        Validations::Translations.call(self)
+        Validations::Translations.call(self) +
+        Validations::Stylesheets.call(self)
     end
 
     def files
@@ -65,11 +66,14 @@ module ZendeskAppsSupport
       )
     end
 
+    def customer_css
+      css_file = File.join(root, 'app.css')
+      customer_css = File.exist?(css_file) ? File.read(css_file) : ""
+    end
+
     private
 
     def compiled_templates(app_id, asset_url_prefix)
-      css_file = File.join(root, "app.css")
-      customer_css = File.exist?(css_file) ? File.read(css_file) : ""
       compiled_css = ZendeskAppsSupport::StylesheetCompiler.new(DEFAULT_SCSS + customer_css, app_id, asset_url_prefix).compile
 
       templates = begin

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -19,7 +19,7 @@ module ZendeskAppsSupport
             errors << missing_keys_error(manifest)
             errors << default_locale_error(manifest, package)
             errors << invalid_location_error(manifest)
-            errors << parameters_must_be_an_array(manifest)
+            errors << parameters_error(manifest)
             errors << invalid_hidden_parameter_error(manifest)
             errors.compact!
           end
@@ -29,11 +29,17 @@ module ZendeskAppsSupport
 
         private
 
-        def parameters_must_be_an_array(manifest)
+        def parameters_error(manifest)
           return unless manifest['parameters']
 
           unless manifest['parameters'].kind_of?(Array)
-            ValidationError.new(:parameters_not_an_array)
+            return ValidationError.new(:parameters_not_an_array)
+          end
+
+          para_names = manifest['parameters'].collect{|para| para['name']}
+          duplicate_parameters = para_names.select {|name| para_names.count(name) > 1}.uniq
+          unless duplicate_parameters.empty?
+            return ValidationError.new(:duplicate_parameters, :duplicate_parameters => duplicate_parameters)
           end
         end
 

data/lib/zendesk_apps_support/validations/stylesheets.rb

@@ -0,0 +1,32 @@
+require 'zendesk_apps_support/stylesheet_compiler'
+
+module ZendeskAppsSupport
+  module Validations
+    module Stylesheets
+
+      class << self
+
+        def call(package)
+          if css_error = validate_styles(package.customer_css)
+            [css_error]
+          else
+            []
+          end
+        end
+
+        private
+
+        def validate_styles(css)
+          compiler = ZendeskAppsSupport::StylesheetCompiler.new(css, nil, nil)
+          begin
+            compiler.compile
+          rescue Sass::SyntaxError => e
+            return ValidationError.new(:stylesheet_error, :sass_error => e.message)
+          end
+          nil
+        end
+
+      end
+    end
+  end
+end

data/spec/validations/manifest_spec.rb

@@ -12,6 +12,12 @@ describe ZendeskAppsSupport::Validations::Manifest do
     valid_fields.merge(overrides)
   end
 
+  def create_package(parameter_hash)
+    params = default_required_params(parameter_hash)
+    manifest = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(params))
+    mock('Package', :files => [manifest])
+  end
+
   it 'should have an error when manifest.json is missing' do
     files = [mock('AppFile', :relative_path => 'abc.json')]
     package = mock('Package', :files => files)
@@ -84,7 +90,7 @@ describe ZendeskAppsSupport::Validations::Manifest do
     errors.first().to_s.should =~ /^manifest is not proper JSON/
   end
 
-  context 'with invalid parameter type' do
+  context 'with invalid parameters' do
 
     before do
       ZendeskAppsSupport::Validations::Manifest.stub(:default_locale_error)
@@ -99,12 +105,8 @@ describe ZendeskAppsSupport::Validations::Manifest do
           }
       }
 
-      params = default_required_params(parameter_hash)
-      manifest = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(params))
-      package = mock('Package', :files => [manifest])
-
-      errors = ZendeskAppsSupport::Validations::Manifest.call(package)
-      errors.map(&:to_s).should == ['App Parameters must be an array.']
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(parameter_hash))
+      errors.map(&:to_s).should == ['App parameters must be an array.']
     end
 
     it "doesn't have an error with an array of app parameters" do
@@ -115,20 +117,31 @@ describe ZendeskAppsSupport::Validations::Manifest do
           }]
       }
 
-      params = default_required_params(parameter_hash)
-      manifest = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(params))
-      package = mock('Package', :files => [manifest])
-
-      errors = ZendeskAppsSupport::Validations::Manifest.call(package)
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(parameter_hash))
       errors.should be_empty
     end
 
     it 'behaves when the manifest does not have parameters' do
-      manifest = mock('AppFile', :relative_path => 'manifest.json', :read => JSON.dump(default_required_params))
-      package = mock('Package', :files => [manifest])
-
-      errors = ZendeskAppsSupport::Validations::Manifest.call(package)
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(default_required_params))
       errors.should be_empty
     end
+
+    it 'shows error when duplicate parameters are defined' do
+      parameter_hash = {
+        'parameters' => [
+          {
+            'name' => 'url',
+            'type' => 'string'
+          },
+          {
+            'name' => 'url',
+            'type' => 'string'
+          }
+        ]
+      }
+
+      errors = ZendeskAppsSupport::Validations::Manifest.call(create_package(parameter_hash))
+      errors.map(&:to_s).should == ['Duplicate app parameters defined: ["url"]']
+    end
   end
 end

data/spec/validations/stylesheets_spec.rb

@@ -0,0 +1,34 @@
+require 'zendesk_apps_support'
+
+describe ZendeskAppsSupport::Validations::Stylesheets do
+  it 'does not return errors if there is no custom css' do
+
+    package = stub(:customer_css => "")
+    ZendeskAppsSupport::Validations::Stylesheets.call(package).should be_empty
+  end
+
+  it 'does not return errors for valid css' do
+    valid_css = <<-CSS
+.my-class {
+  border: solid 1px black;
+}
+    CSS
+    package = stub(:customer_css => valid_css)
+
+    errors = ZendeskAppsSupport::Validations::Stylesheets.call(package)
+    errors.should be_empty
+  end
+
+  it 'returns style sheet validation error for invalid css' do
+    invalid_css = <<-CSS
+.my-class {
+  border: }
+}
+    CSS
+    package = stub(:customer_css => invalid_css)
+
+    errors = ZendeskAppsSupport::Validations::Stylesheets.call(package)
+    errors.count.should == 1
+    errors.first.to_s.should match /Sass error: Invalid CSS after.*/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -143,6 +143,7 @@ files:
 - lib/zendesk_apps_support/stylesheet_compiler.rb
 - lib/zendesk_apps_support/validations/manifest.rb
 - lib/zendesk_apps_support/validations/source.rb
+- lib/zendesk_apps_support/validations/stylesheets.rb
 - lib/zendesk_apps_support/validations/templates.rb
 - lib/zendesk_apps_support/validations/translations.rb
 - lib/zendesk_apps_support/validations/validation_error.rb
@@ -165,6 +166,7 @@ files:
 - spec/validations/jshint_error_spec.rb
 - spec/validations/manifest_spec.rb
 - spec/validations/source_spec.rb
+- spec/validations/stylesheets_spec.rb
 - spec/validations/templates_spec.rb
 - spec/validations/translations_spec.rb
 - spec/validations/validation_serialization_spec.rb
@@ -208,6 +210,7 @@ test_files:
 - spec/validations/jshint_error_spec.rb
 - spec/validations/manifest_spec.rb
 - spec/validations/source_spec.rb
+- spec/validations/stylesheets_spec.rb
 - spec/validations/templates_spec.rb
 - spec/validations/translations_spec.rb
 - spec/validations/validation_serialization_spec.rb