activecube 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43498005fb3b69a08f0570ba26d2a78e2d9a0fc5b25a55107fb218d10378da57
-  data.tar.gz: 6c9e34bac0ad2180f96327fea15d66496ae507618c01ffc1f97ec7fed95d29b9
+  metadata.gz: 219e2133090d27d2c5af643c31657ea1882d9a6e17c5e93dbe3fa8e9c977ca41
+  data.tar.gz: 184e6baf918fbe1ab6098f5209519cd3d33f1b4eda6c385e36146aebfd4f0936
 SHA512:
-  metadata.gz: f810799888278e80e7b3fcab3b678f139edb3f45bb74f7859b4c2904feb8507d3221851525f33fc39576a44263bf0618be3dfa9226a1b41a7794e42f8de6d9ce
-  data.tar.gz: 06456afd2662a24f563132ccbd602376e8db7d61ac68e437a6c3bc12a7d06b9d2f1d6d21917038af516ebc1944bd682dbf2d38b9dc76f8d8649fba6968ed1472
+  metadata.gz: da5c6da9bbccd5269039be4cd2232eb1e9c5972aeaa3dcdc62a592dc3ba0c769f470a04a91e0ed71044792fb7a65f8c8eef2e5e663b948a572989a544391639a
+  data.tar.gz: 1e7e2802abdc89ef0cf41a06c9f96822a2c48f6dbe2db91c0ab97b198f4de857919d61c3c3ffe2ef5cda8be4942becac6337557fa4fd81514f225bbd79c7f64d

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.12)
+    activecube (0.1.13)
       activerecord (>= 5.2)
 
 GEM

data/lib/activecube/cube_definition.rb

@@ -52,7 +52,7 @@ module Activecube
       end
     end
 
-    def metric_column column_name, aggregation = :sum
+    def metric_column column_name
 
       Class.new(Activecube::Metric) do
 
@@ -60,10 +60,17 @@ module Activecube
 
         column column_name
 
+        modifier :calculate
+
         define_method :expression do |model, arel_table, measure, cube_query|
-          self.send aggregation, model, arel_table, measure, cube_query
+          if calculate = measure.modifier(:calculate)
+            self.send(calculate.args.first, model, arel_table, measure, cube_query)
+          else
+            sum(model, arel_table, measure, cube_query)
+          end
         end
 
+
       end
     end
 

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Aleksey Studnev