Merge pull request #45 from zendesk/roman/fix-validation

Fixed validation order

lib/zendesk_apps_support/package.rb

@@ -20,18 +20,21 @@ def initialize(dir)
     def validate
       [].tap do |errors|
 
-        errors << Validations::Package.call(self)
         errors << Validations::Manifest.call(self)
-        errors << Validations::Translations.call(self)
 
-        if has_location?
-          errors << Validations::Source.call(self)
-          errors << Validations::Templates.call(self)
-          errors << Validations::Stylesheets.call(self)
-        end
+        if has_manifest?
+          errors << Validations::Package.call(self)
+          errors << Validations::Translations.call(self)
+
+          if has_location?
+            errors << Validations::Source.call(self)
+            errors << Validations::Templates.call(self)
+            errors << Validations::Stylesheets.call(self)
+          end
 
-        if has_requirements?
-          errors << Validations::Requirements.call(self)
+          if has_requirements?
+            errors << Validations::Requirements.call(self)
+          end
         end
 
         errors.flatten!
@@ -98,6 +101,10 @@ def customer_css
       customer_css = File.exist?(css_file) ? File.read(css_file) : ""
     end
 
+    def has_manifest?
+      File.exist?(File.join(root, "manifest.json"))
+    end
+
     def has_location?
       manifest_json[:location]
     end

spec/app/app.css

@@ -3,4 +3,4 @@ h1 {
   span {
     color: green;
   }
-}
+}

spec/app/translations/en.json

@@ -1,5 +1,5 @@
 {
   "app": {
-    "name":         "Buddha Machine"
+    "name": "Buddha Machine"
   }
 }

spec/app_nomanifest/app.css

@@ -0,0 +1,6 @@
+h1 {
+  color: red;
+  span {
+    color: green;
+  }
+}

spec/app_nomanifest/app.js

@@ -0,0 +1,12 @@
+(function() {
+
+  return {
+    events: {
+      'app.activated':'doSomething'
+    },
+
+    doSomething: function() {
+    }
+  };
+
+}());

spec/app_nomanifest/templates/layout.hdbs

@@ -0,0 +1,11 @@
+<header>
+  <span class="logo"/>
+  <h3>{{setting "name"}}</h3>
+</header>
+<section data-main/>
+<footer>
+  <a href="mailto:{{author.email}}">
+    {{author.name}}
+  </a>
+</footer>
+</div>

spec/app_nomanifest/translations/en.json

@@ -0,0 +1,5 @@
+{
+  "app": {
+    "name": "Buddha Machine"
+  }
+}

spec/package_spec.rb

@@ -9,6 +9,13 @@
     it 'should return all the files within the app folder excluding files in tmp folder' do
       @package.files.map(&:relative_path).should =~ %w(app.css app.js assets/logo-small.png assets/logo.png manifest.json templates/layout.hdbs translations/en.json)
     end
+
+    it 'should error out when manifest is missing' do
+     @package = ZendeskAppsSupport::Package.new('spec/app_nomanifest')
+     err =  @package.validate
+     err.first.class.should == ZendeskAppsSupport::Validations::ValidationError
+     err.first.to_s.should == 'Could not find manifest.json'
+    end
   end
 
   describe 'template_files' do