Merge pull request peerlibrary#41 from zodern/master

Handle errors inside autoruns

server.coffee

@@ -185,7 +185,13 @@ extendPublish (name, publishFunction, options) ->
     # and that you can return cursors from the function which would be automatically published.
     publish.autorun = (runFunc) ->
       handle = Tracker.autorun (computation) ->
-        result = runFunc.call publish, computation
+        try
+          result = runFunc.call publish, computation
+        catch e
+          if computation.firstRun
+            throw e
+          else
+            publish.error(e)
 
         collectionNames = getCollectionNames result
         allCollectionNames[computation._id] = collectionNames

tests.coffee

@@ -926,3 +926,40 @@ for idGeneration in ['STRING', 'MONGO']
 
     # Register the test case.
     ClassyTestCase.addTest new ReactivePublishTestCase()
+
+if Meteor.isServer
+  Meteor.publish "initial error", () -> 
+    @autorun () =>
+      throw new Meteor.Error('triggered error')
+
+  Meteor.publish "rereun error", () ->
+    reactiveError = new ReactiveVar false
+
+    @autorun () =>
+      if reactiveError.get()
+        throw new Meteor.Error('triggered error')
+
+    setTimeout (-> reactiveError.set(true)), 1000
+    @ready()
+
+class ReactivePublishErrorTests extends ClassyTestCase
+  @testName: "reactivepublish - Errors"
+
+  testClientInitialError: () ->
+      sub = Meteor.subscribe("initial error", {
+        onStop: (error) =>
+          @assertEqual(error.message, '[triggered error]')
+      })
+
+  testClientRerunError: () ->
+    isReady = false
+    Meteor.subscribe("rereun error", {
+      onStop: @expect (error) =>
+        @assertEqual(isReady, true, 'received error on rerun')
+        @assertEqual(error.message, '[triggered error]')
+      onReady: () =>
+        isReady = true
+    })
+
+ClassyTestCase.addTest new ReactivePublishErrorTests
+