Refs #153; Replace custom checks with Epoch.isNonEmptyArray where applicable.

Author: rsandor

src/data.coffee

@@ -69,7 +69,7 @@ Epoch.Data.Format.array = (->
     return result
 
   format = (data=[], options={}) ->
-    return [] unless Epoch.isArray(data) and data.length > 0
+    return [] unless Epoch.isNonEmptyArray(data)
     opt = Epoch.Util.defaults options, defaultOptions
 
     if opt.type == 'time.heatmap'
@@ -137,7 +137,7 @@ Epoch.Data.Format.tuple = (->
     return result
 
   format = (data=[], options={}) ->
-    return [] unless Epoch.isArray(data) and data.length > 0
+    return [] unless Epoch.isNonEmptyArray(data)
     opt = Epoch.Util.defaults options, defaultOptions
 
     if opt.type == 'pie' or opt.type == 'time.heatmap' or opt.type == 'time.gauge'
@@ -224,7 +224,7 @@ Epoch.Data.Format.keyvalue = (->
       value
 
   format = (data=[], keys=[], options={}) ->
-    return [] unless Epoch.isArray(data) and data.length > 0 and keys.length > 0
+    return [] unless Epoch.isNonEmptyArray(data) and Epoch.isNonEmptyArray(keys)
     opt = Epoch.Util.defaults options, defaultOptions
 
     if opt.type == 'pie' or opt.type == 'time.gauge'
@@ -237,7 +237,7 @@ Epoch.Data.Format.keyvalue = (->
       formatBasicPlot data, keys, opt
 
   format.entry = (datum, keys=[], options={}) ->
-    return [] unless datum? and keys? and keys.length > 0
+    return [] unless datum? and Epoch.isNonEmptyArray(keys)
     unless options.startTime?
      options.startTime = parseInt(new Date().getTime() / 1000)
     (layer.values[0] for layer in format([datum], keys, options))
@@ -258,7 +258,7 @@ Epoch.data = (formatter, args...) ->
 # Abstracted here because we'd like to allow models and indivisual charts to
 # perform this action depending on the context.
 Epoch.Data.formatData = (data=[], type, dataFormat) ->
-  return data unless dataFormat? and data.length > 0
+  return data unless Epoch.isNonEmptyArray(data)
 
   if Epoch.isString(dataFormat)
     opts = { type: type }

src/time.coffee

@@ -196,7 +196,7 @@ class Epoch.Time.Plot extends Epoch.Chart.Canvas
     @topAxis.selectAll('.tick').remove() if @topAxis?
 
     for layer in @data
-      continue unless layer.values? and layer.values.length > 0
+      continue unless Epoch.isNonEmptyArray(layer.values)
       [i, k] = [@options.windowSize-1, layer.values.length-1]
       while i >= 0 and k >= 0
         @_pushTick i, layer.values[k].time, false, true

src/time/bar.coffee

@@ -29,7 +29,7 @@ class Epoch.Time.Bar extends Epoch.Time.Stack
     [y, w] = [@y(), @w()]
 
     for layer in @getVisibleLayers()
-      continue unless layer.values.length > 0
+      continue unless Epoch.isNonEmptyArray(layer.values)
       @setStyles(layer.className)
 
       [i, k, trans] = [@options.windowSize, layer.values.length, @inTransition()]
@@ -43,5 +43,5 @@ class Epoch.Time.Bar extends Epoch.Time.Stack
 
         @ctx.fillRect.apply(@ctx, args)
         @ctx.strokeRect.apply(@ctx, args)
-        
+
     super()

src/time/heatmap.coffee

@@ -141,8 +141,7 @@ class Epoch.Time.Heatmap extends Epoch.Time.Plot
 
   # Redraws the entire heatmap for the current data.
   redraw: ->
-    return unless Epoch.isArray(@data) and @data.length > 0 and @data[0].values? and @data[0].values.length > 0
-
+    return unless Epoch.isNonEmptyArray(@data) and Epoch.isNonEmptyArray(@data[0].values)
     entryIndex = @data[0].values.length
     drawColumn = @options.windowSize
 

src/time/line.coffee

@@ -19,7 +19,7 @@ class Epoch.Time.Line extends Epoch.Time.Plot
     [y, w] = [@y(), @w()]
 
     for layer in @getVisibleLayers()
-      continue unless layer.values.length > 0
+      continue unless Epoch.isNonEmptyArray(layer.values)
       @setStyles(layer.className)
       @ctx.beginPath()
 

tests/unit/core/is.coffee

@@ -81,5 +81,8 @@ describe 'Epoch.Util', ->
       assert.notOk Epoch.isNonEmptyArray({})
       assert.notOk Epoch.isNonEmptyArray(->)
 
+    it 'should return false given a null value', ->
+      assert.notOk Epoch.isNonEmptyArray(null)
+
     it 'should return false given an empty array', ->
       assert.notOk Epoch.isNonEmptyArray([])