standardapi 6.0.0.14 → 6.0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e9eb8d2b72416e613c4231e25fb67709bd38ec93607e12dab2705fdf2e05b2
-  data.tar.gz: a5d03ecbbdc3529f6aec1546a933c8353f6f6a1b5cc2aefc7cc0dda1b55fb52c
+  metadata.gz: bbc6b3f7345e1df82060abcc37ee0bcf5f11b88863e1cdab4299f514129b44f6
+  data.tar.gz: cae2c3d6859933c99ac13f0704e35997e3c10603f53d325b3a8ace63607fce94
 SHA512:
-  metadata.gz: 03aa6f252f8fed9a81cfce311cc5596798505f0b683bfb4a5a8c5cc55232c73cd8ed1ee1fa78aa642a5e6ba01bd4e5ee1e142e3d197104b7248e06cc64a91499
-  data.tar.gz: 2f47d3025a871845b0b9e50ac3ff014c94cfecb8ebf2d216d7fb171b5ff37aa3b980432a73498ef31b658768e52a646fe2547d5e80b3bbbf4a394bdd4c19a561
+  metadata.gz: 75a1555b14bbbcfd99f2dcd31cbba472a157c0066a22d597cd1fff9daa7c4f53e1c6461c21c8adde888715a90df07ae7e4e8eb48467b702a7ba45e6dba21de10
+  data.tar.gz: a9deedd375a788e22502b4caea542fdbe935ac6f4d594d8e46ceb79bcf9202e5813b795df9c60c7360ef84a9068b5388d862e95734e9bd05f427f4286ff3d114

data/lib/standard_api/test_case/calculate_tests.rb

@@ -15,16 +15,17 @@ module StandardAPI
         
         if math_column
           column = math_column
-          selects = [{ count: column.name}, { maximum: column.name }, { minimum: column.name }, { average: column.name }]
+          selects = [{ count: column.name }, { maximum: column.name }, { minimum: column.name }, { average: column.name }]
         else
           column = model.columns.sample
-          selects = [{ count: column.name}]
+          selects = [{ count: column.name }]
         end
 
         get resource_path(:calculate, select: selects, format: :json)
         assert_response :ok
         calculations = @controller.instance_variable_get('@calculations')
-        assert_equal [[model.count(column.name), model.maximum(column.name), model.minimum(column.name), model.average(column.name).to_f]], calculations
+        assert_equal [selects.map { |s| model.send(s.keys.first, column.name) }],
+          calculations
       end
 
       test '#calculate.json params[:where]' do
@@ -44,14 +45,10 @@ module StandardAPI
         predicate = { id: { gt: m1.id } }
 
         get resource_path(:calculate, where: predicate, select: selects, format: :json)
-
-        # assert_response :ok
-        # assert_equal [[
-        #   model.filter(predicate).count(column),
-        #   model.filter(predicate).maximum(column),
-        #   model.filter(predicate).minimum(column),
-        #   model.filter(predicate).average(column).to_f
-        # ]], @controller.instance_variable_get('@calculations')
+        assert_response :ok
+        calculations = @controller.instance_variable_get('@calculations')
+        # assert_equal [selects.map { |s| model.send(s.keys.first, column.name) }],
+        #   calculations
       end
 
       test '#calculate.json mask' do

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '6.0.0.14'
+  VERSION = '6.0.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 6.0.0.14
+  version: 6.0.0.15
 platform: ruby
 authors:
 - James Bracy