activecube 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6448e22d9122edb34207112002802381c6f807a60a73150add0dfba415eff2
-  data.tar.gz: f1db99febe43eb9943f96c344bbd77c2c3a42e6619225b9266980b6b2e3c486b
+  metadata.gz: 7d42d7f3082abaee0001f6a0506dd25ceca99d7c1b5426d85b4d36b9334ddf1c
+  data.tar.gz: 616e25180c79b3a2d922925ba996d1503821fa4ba0d16a6dd52ea549a697847e
 SHA512:
-  metadata.gz: c4ea5bf5ac7fc108a1868cdffc4b12a7c916d34b4f93bc9c094f930a405dd27e989e60287d39ebe2ed136add74de86bd0849dcd47122e54489e5a02ddb9276ca
-  data.tar.gz: d67e1cd6832b0c4bbc1ce2669ca145359b34e31ba5182392ff25d5b7e13b9bc639ae4822121821739b52bb7c0f2b829d06fb76c51cbd15b346db5f8a1488a26a
+  metadata.gz: 67ed87f68ef39228ecda9881ba7b8f909c63afd92b6ba6cdc41e1053ccdd7974b7846421d530cd7ec21eb89ffbcaa1439f92892a9a347f3ed36ec655e5b1f140
+  data.tar.gz: 5b81d7c9ac459a01d9761a2f55a86c57efc5a030275b731c96c421579650c3fc282c464231733e177683b85f39b45152405fbef8f30c990bdc742cd3cd8b33ab

data/lib/activecube/definition_methods.rb

@@ -9,8 +9,8 @@ module Activecube
     attr_reader :column_names
 
     def column_name
-      raise "Not defined column for a metric #{self.name}" if column_names.empty?
-      raise "Defined more than one column for a metric #{self.name}" if column_names.count>1
+      raise "Not defined column for a a dimension or metric #{self.name}" if column_names.empty?
+      raise "Defined more than one column for a dimension or metric #{self.name}" if column_names.count>1
       column_names.first
     end
 

data/lib/activecube/processor/composer.rb

@@ -2,6 +2,7 @@ require 'activecube/processor/index'
 require 'activecube/processor/measure_tables'
 require 'activecube/processor/optimizer'
 require 'activecube/processor/table'
+require 'activecube/query/measure_nothing'
 
 module Activecube::Processor
   class Composer
@@ -51,7 +52,10 @@ module Activecube::Processor
 
     def ranked_tables
       tables = cube_query.cube.tables.select{|table| table.matches? cube_query, []}
-      cube_query.measures.collect do |measure|
+      measures = cube_query.measures.empty? ?
+                     [Activecube::Query::MeasureNothing.new(cube_query.cube)] :
+                     cube_query.measures
+      measures.collect do |measure|
         by = MeasureTables.new measure
         tables.each{|table|
           next unless table.measures? measure

data/lib/activecube/query/cube_query.rb

@@ -83,7 +83,7 @@ module Activecube::Query
     end
 
     def selector_column_names measures = self.measures
-      (measures.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
+      (measures.map(&:selectors) + slices.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end
 
     def reduced other_measures, other_options
@@ -117,7 +117,7 @@ module Activecube::Query
     end
 
     def join_fields
-      slices.map{|s| s.dimension.class.identity || s.key }.uniq
+      slices.map(&:group_by_columns).uniq
     end
 
     def orderings

data/lib/activecube/query/measure.rb

@@ -10,7 +10,7 @@ module Activecube::Query
       @selectors = selectors
       @modifications = modifications
 
-      modifier_methods! if definition.class.modifiers
+      modifier_methods! if definition && definition.class.modifiers
     end
 
     def required_column_names

data/lib/activecube/query/measure_nothing.rb

@@ -0,0 +1,23 @@
+require 'activecube/query/measure'
+
+module Activecube::Query
+  class MeasureNothing < Measure
+
+    def initialize cube
+      super cube, nil , nil
+    end
+
+    def required_column_names
+      []
+    end
+
+    def append_query _model, _cube_query, _table, query
+      query
+    end
+
+    def to_s
+      "Measure nothing, used for queries where no metrics defined"
+    end
+
+  end
+end

data/lib/activecube/query/selector.rb

@@ -1,7 +1,7 @@
 module Activecube::Query
   class Selector < Item
 
-    OPERATORS = ['eq','ne','gt','lt','gteq','lteq','in','not_in','between']
+    OPERATORS = ['eq','not_eq','gt','lt','gteq','lteq','in','not_in','between']
     ARRAY_OPERATORS = ['in','not_in']
 
     class Operator
@@ -64,7 +64,7 @@ module Activecube::Query
     alias_method :since, :gteq
     alias_method :till, :lteq
     alias_method :is, :eq
-    alias_method :not, :ne
+    alias_method :not, :not_eq
     alias_method :after, :gt
     alias_method :before, :lt
 

data/lib/activecube/query/slice.rb

@@ -1,11 +1,13 @@
 module Activecube::Query
   class Slice < Item
 
-    attr_reader :dimension, :parent
-    def initialize cube, key, definition, parent = nil
+    attr_reader :dimension, :parent, :selectors
+    def initialize cube, key, definition, parent = nil, selectors = []
       super cube, key, definition
       @dimension = parent ? parent.dimension : definition
       @parent = parent
+
+      @selectors = selectors
       
       if parent
         raise "Unexpected class #{definition.class.name}" unless definition.kind_of?(Activecube::Field)
@@ -15,7 +17,7 @@ module Activecube::Query
     end
 
     def required_column_names
-      dimension.class.column_names || []
+      ((dimension.class.column_names || []) + selectors.map(&:required_column_names) ).flatten.uniq
     end
 
     def [] arg
@@ -23,12 +25,12 @@ module Activecube::Query
       key = arg.to_sym
 
       child = if definition.kind_of? Activecube::Dimension
-                definition.class.fields[key]
+                definition.class.fields && definition.class.fields[key]
               elsif definition.kind_of?(Activecube::Field) && (hash = definition.definition).kind_of?(Hash)
                 hash[key]
               end
 
-      raise "Field #{key} is not defined for #{definition}" unless child
+      raise ArgumentError, "Field #{key} is not defined for #{definition}" unless child
 
       if child.kind_of?(Class) && child <= Activecube::Field
         child = child.new key
@@ -41,20 +43,34 @@ module Activecube::Query
     end
 
     def alias! new_key
-      self.class.new cube, new_key, definition, parent
+      self.class.new cube, new_key, definition,  parent, selectors
+    end
+
+    def when *args
+      append *args, @selectors, Selector, cube.selectors
+    end
+
+    def group_by_columns
+      if dimension.class.identity
+        ([dimension.class.identity] + dimension.class.column_names).uniq
+      else
+        [key]
+      end
     end
 
     def append_query model, cube_query, table, query
 
       attr_alias = "`#{key.to_s}`"
-      expr = parent ?
+      expr = (parent || definition.respond_to?(:expression)) ?
                  Arel.sql(definition.expression( model, table, self, cube_query) ) :
                  table[dimension.class.column_name]
 
       query = query.project(expr.as(attr_alias))
 
-      if identity = dimension.class.identity
-        query = query.project(table[identity]).group(table[identity])
+      if dimension.class.identity
+        group_by_columns.each do |column|
+            query = query.project(table[column]).group(table[column])
+        end
       else
         query = query.group(attr_alias)
       end
@@ -63,6 +79,10 @@ module Activecube::Query
         query = query.order(attr_alias)
       end
 
+      selectors.each do |selector|
+        selector.append_query model, cube_query, table, query
+      end
+
       query
     end
 

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - lib/activecube/query/item.rb
 - lib/activecube/query/limit.rb
 - lib/activecube/query/measure.rb
+- lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb
 - lib/activecube/query/or_selector.rb
 - lib/activecube/query/ordering.rb