Merge pull request #4 from richmolj/master

Accomodate auto-parsing stats

Author: richmolj

lib/jsonapi_compliable/stats/payload.rb

@@ -12,7 +12,7 @@ def generate
           @directive.each_pair do |name, calculation|
             stats[name] = {}
 
-            each_calculation(name, calculation) do |calc, function|
+            each_calculation(name, parse_calculation(calculation)) do |calc, function|
               stats[name][calc] = function.call(@scope, name)
             end
           end
@@ -21,14 +21,20 @@ def generate
 
       private
 
-      def each_calculation(name, calculation_string)
-        calculations = calculation_string.split(',').map(&:to_sym)
-
+      def each_calculation(name, calculations)
         calculations.each do |calc|
           function = @dsl.stat(name, calc)
           yield calc, function
         end
       end
+
+      def parse_calculation(calculation)
+        if calculation.is_a?(String)
+          calculation.split(',').map(&:to_sym)
+        else
+          calculation.map(&:to_sym)
+        end
+      end
     end
   end
 end

lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

spec/stats/payload_spec.rb

@@ -31,6 +31,15 @@ def stub_stat(attr, calc, result)
         attr2: { maximum: 3 }
       })
     end
+
+    # We may be auto-parsing comma-delimited values
+    context 'when the calculation string is already parsed' do
+      let(:params) { { stats: { attr1: ['count', 'average'] } } }
+
+      it 'generates correct payload' do
+        expect(subject).to eq(attr1: { count: 2, average: 1 })
+      end
+    end
   end
 
   describe '.new' do
@@ -47,8 +56,7 @@ def stub_stat(attr, calc, result)
 
       it 'uses that scope' do
         instance = described_class.new(controller, 'a')
-        expect(instance.instance_variable_get(:@scope))
-          .to eq('a')
+        expect(instance.instance_variable_get(:@scope)).to eq('a')
       end
     end
   end