standardapi 6.0.0.12 → 6.0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea6fe2070a9d9f2e92b545da5d2f7415568fee783ba45e1be6628822eb49fa7
-  data.tar.gz: a4b14c21227e9790fe4913b173faadc310b7384d09c39cd1891b864fd98c2ff6
+  metadata.gz: 57e9eb8d2b72416e613c4231e25fb67709bd38ec93607e12dab2705fdf2e05b2
+  data.tar.gz: a5d03ecbbdc3529f6aec1546a933c8353f6f6a1b5cc2aefc7cc0dda1b55fb52c
 SHA512:
-  metadata.gz: 451fbdbd66417b109b33d4bc1631f7a9e2913e345b966074baad332168c4184f5d8c7cda94f4e48afb771ef22bd4eb7d9b38986bbd1bd874ceef251001aeddc9
-  data.tar.gz: cd109f69f5115e62a66719b1310af3d28a71ce7124d4cc873c139d44b59680edac0ff6330f935a9b1d2ddca2919d18a89fa7d7718d323689bffbed3ec3f04837
+  metadata.gz: 03aa6f252f8fed9a81cfce311cc5596798505f0b683bfb4a5a8c5cc55232c73cd8ed1ee1fa78aa642a5e6ba01bd4e5ee1e142e3d197104b7248e06cc64a91499
+  data.tar.gz: 2f47d3025a871845b0b9e50ac3ff014c94cfecb8ebf2d216d7fb171b5ff37aa3b980432a73498ef31b658768e52a646fe2547d5e80b3bbbf4a394bdd4c19a561

data/lib/standard_api/test_case/calculate_tests.rb

@@ -3,26 +3,44 @@ module StandardAPI
     module CalculateTests
       extend ActiveSupport::Testing::Declarative
 
-      CALCULATE_COLUMN_TYPES = ["smallint", "int", "bigint", "real", "double precision", "numeric", "interval"]
+      CALCULATE_COLUMN_TYPES = [
+        "smallint", "int", "integer", "bigint", "real", "double precision",
+        "numeric", "interval"
+      ]
 
       test '#calculate.json' do
         create_model
 
-        column = model.columns.find { |x| CALCULATE_COLUMN_TYPES.include?(x.sql_type) }.name
-        selects = [{ count: column}, { maximum: column }, { minimum: column }, { average: column }]
+        math_column = model.columns.find { |x| CALCULATE_COLUMN_TYPES.include?(x.sql_type) }
+        
+        if math_column
+          column = math_column
+          selects = [{ count: column.name}, { maximum: column.name }, { minimum: column.name }, { average: column.name }]
+        else
+          column = model.columns.sample
+          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), model.maximum(column), model.minimum(column), model.average(column).to_f]], calculations
+        assert_equal [[model.count(column.name), model.maximum(column.name), model.minimum(column.name), model.average(column.name).to_f]], calculations
       end
 
       test '#calculate.json params[:where]' do
         m1 = create_model
         create_model
 
-        column = model.columns.find { |x| CALCULATE_COLUMN_TYPES.include?(x.sql_type) }.name
-        selects = [{ count: column}, { maximum: column }, { minimum: column }, { average: column }]
+        math_column = model.columns.find { |x| CALCULATE_COLUMN_TYPES.include?(x.sql_type) }
+        
+        if math_column
+          column = math_column
+          selects = [{ count: column.name}, { maximum: column.name }, { minimum: column.name }, { average: column.name }]
+        else
+          column = model.columns.sample
+          selects = [{ count: column.name}]
+        end
+
         predicate = { id: { gt: m1.id } }
 
         get resource_path(:calculate, where: predicate, select: selects, format: :json)

data/lib/standard_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 6.0.0.12
+  version: 6.0.0.14
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails