activecube 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8d353c9c9d670cda8c4f9de4a3e59994c4f8e6ebd2d25551a5bf712f53db00
-  data.tar.gz: 55ac707acc8dd783318739e8f4bb424454da0c597a54ab89b09c76a16982ac23
+  metadata.gz: ef6448e22d9122edb34207112002802381c6f807a60a73150add0dfba415eff2
+  data.tar.gz: f1db99febe43eb9943f96c344bbd77c2c3a42e6619225b9266980b6b2e3c486b
 SHA512:
-  metadata.gz: 7652d255be72680539226092333c4c1fa081a0416b4ef50a13de17d40385c45628be5e761d1191b9e7e5ab1b55c26ca613012d9e601fda4c44984249bd7053e2
-  data.tar.gz: b20ad10bbec9f17cc95a879f84690739fcb3109e451797e954efd720a0de3fbaeac0a38e7b4a0ab1e647d2f3666d0b4b3de7c93d6bd3441897d3a72ab9db03f2
+  metadata.gz: c4ea5bf5ac7fc108a1868cdffc4b12a7c916d34b4f93bc9c094f930a405dd27e989e60287d39ebe2ed136add74de86bd0849dcd47122e54489e5a02ddb9276ca
+  data.tar.gz: d67e1cd6832b0c4bbc1ce2669ca145359b34e31ba5182392ff25d5b7e13b9bc639ae4822121821739b52bb7c0f2b829d06fb76c51cbd15b346db5f8a1488a26a

data/Gemfile.lock

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

data/README.md

@@ -132,9 +132,7 @@ The methods used to contruct the query:
 - **slice** defines which dimensions slices the results
 - **measure** defines what to measure
 - **when** defines which selectors to apply
-- **desc, asc, take, skip** are for ordering and limiting result set
-
-(take and skip have aliases: offset and limit).
+- **desc, asc, offset, limit** are for ordering and limiting result set
 
 After the query contructed, the following methods can be applied:
 

data/lib/activecube/common/metrics.rb

@@ -12,7 +12,7 @@ module Activecube::Common
         end
       else
         define_method fname do |model, arel_table, measure, cube_query|
-          column = arel_table[self.class.column_name.to_sym]
+          column = pre_aggregate_value model, arel_table, measure, cube_query
           measure.selectors.empty? ? column.send(fname) : column.send(fname.to_s+'If', measure.condition_query(model, arel_table, cube_query))
         end
       end
@@ -21,5 +21,9 @@ module Activecube::Common
     end
 
 
+    def pre_aggregate_value _model, arel_table, _measure, _cube_query
+      arel_table[self.class.column_name.to_sym]
+    end
+
   end
 end

data/lib/activecube/definition_methods.rb

@@ -41,7 +41,8 @@ module Activecube
     end
 
     def field *args
-      (@fields ||= {} )[args.first.to_sym] = Field.new( *args)
+      name = args.first.to_sym
+      (@fields ||= {} )[name] = Field.build( name, args.second )
     end
 
   end

data/lib/activecube/field.rb

@@ -2,11 +2,30 @@ module Activecube
   class Field
 
     attr_reader :name, :definition
-    def initialize *args
-      @name = args.first
-      @definition = args.second
+
+    def self.build name, arg
+      if arg.kind_of? String
+        Field.new name, arg
+      elsif arg.kind_of? Hash
+        Field.new name, arg.symbolize_keys
+      elsif arg.kind_of?(Class) && arg < Field
+        arg.new name
+      else
+        raise ArgumentError, "Unexpected field #{name} definition with #{arg.class.name}"
+      end
+    end
+
+    def initialize name, arg = nil
+      @name = name
+      @definition = arg
     end
 
+    def expression _model, _arel_table, _slice, _cube_query
+      raise ArgumentError, "String expression expected for #{name} field, instead #{definition.class.name} is found" unless definition.kind_of?(String)
+      definition
+    end
 
   end
+
+
 end

data/lib/activecube/processor/composer.rb

@@ -70,7 +70,8 @@ module Activecube::Processor
       @models = []
       measure_tables.group_by(&:table).each_pair do |table, list|
         @models << table.model
-        reduced = cube_query.reduced list.map(&:measure)
+        reduce_options = measure_tables.count==1 ? cube_query.options : []
+        reduced = cube_query.reduced list.map(&:measure), reduce_options
         table_query = table.query reduced
         composed_query = composed_query ? table.join(cube_query, composed_query, table_query) : table_query
       end

data/lib/activecube/query/cube_query.rb

@@ -49,22 +49,20 @@ module Activecube::Query
       self
     end
 
-    def skip *args
+    def offset *args
       args.each{|arg|
         options << Limit.new( arg, :skip)
       }
       self
     end
 
-    def take *args
+    def limit *args
       args.each{|arg|
         options << Limit.new( arg, :take)
       }
       self
     end
 
-    alias_method :limit, :take
-    alias_method :offset, :skip
 
     def query
       composer = Activecube::Processor::Composer.new(self)
@@ -88,7 +86,7 @@ module Activecube::Query
       (measures.map(&:selectors) + selectors).flatten.map(&:required_column_names).flatten.uniq
     end
 
-    def reduced other_measures
+    def reduced other_measures, other_options
 
       common_selectors = []
       other_measures.each_with_index do |m,i|
@@ -115,11 +113,11 @@ module Activecube::Query
 
       return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)
 
-      CubeQuery.new cube, slices, reduced_measures, reduced_selectors
+      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options
     end
 
     def join_fields
-      slices.map{|s| s.dimension_class.identity || s.key }.uniq
+      slices.map{|s| s.dimension.class.identity || s.key }.uniq
     end
 
     def orderings

data/lib/activecube/query/ordering.rb

@@ -9,7 +9,8 @@ module Activecube
       end
 
       def append_query _model, _cube_query, _table, query
-        query.order(::Arel.sql(argument.to_s).send(direction))
+        text = argument.to_s.split(',').map{|s| "`#{s}`"}.join(',')
+        query.order(::Arel.sql(text).send(direction))
       end
 
     end

data/lib/activecube/query/selector.rb

@@ -44,7 +44,7 @@ module Activecube::Query
       define_method(method) do |*args|
         raise ArgumentError, "Selector for #{method} already set" if operator
         if ARRAY_OPERATORS.include? method
-          @operator = Operator.new(method, args)
+          @operator = Operator.new(method, args.flatten)
         elsif method=='between'
           if args.kind_of?(Range)
             @operator = Operator.new(method, args)

data/lib/activecube/query/slice.rb

@@ -1,36 +1,59 @@
 module Activecube::Query
   class Slice < Item
 
-    attr_reader :field, :modifier
-    def initialize cube, key, dimension, field = nil, modifier = nil
-      super cube, key, dimension
-      @field = field
-      @modifier = modifier
-      field_methods! if field.try(:definition).kind_of?(Hash)
+    attr_reader :dimension, :parent
+    def initialize cube, key, definition, parent = nil
+      super cube, key, definition
+      @dimension = parent ? parent.dimension : definition
+      @parent = parent
+      
+      if parent
+        raise "Unexpected class #{definition.class.name}" unless definition.kind_of?(Activecube::Field)
+        field_methods! if definition.class < Activecube::Field
+      end  
+      
     end
 
-    def [] key
-      unless (definition.kind_of? Activecube::Dimension) && !self.field && (field = definition.class.fields[key])
-        raise "Field #{key} is not defined for #{definition.name}"
-      end
-      Slice.new cube, key, definition, field
+    def required_column_names
+      dimension.class.column_names || []
     end
 
-    def alias! new_key
-      self.class.new cube, new_key, definition, field, modifier
+    def [] arg
+
+      key = arg.to_sym
+
+      child = if definition.kind_of? Activecube::Dimension
+                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
+
+      if child.kind_of?(Class) && child <= Activecube::Field
+        child = child.new key
+      elsif !child.kind_of?(Activecube::Field)
+        child = Activecube::Field.new(key, child)
+      end
+
+      Slice.new cube, key, child, self
+
     end
 
-    def dimension_class
-      definition.class
+    def alias! new_key
+      self.class.new cube, new_key, definition, parent
     end
 
-    def append_query _model, cube_query, table, query
+    def append_query model, cube_query, table, query
 
       attr_alias = "`#{key.to_s}`"
-      expr = field ? Arel.sql( modifier || field.definition ) : table[dimension_class.column_name]
+      expr = parent ?
+                 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
+      if identity = dimension.class.identity
         query = query.project(table[identity]).group(table[identity])
       else
         query = query.group(attr_alias)
@@ -44,23 +67,21 @@ module Activecube::Query
     end
 
     def to_s
-      "Dimension #{super}"
+      parent ? "Dimension #{dimension}[#{super}]" : "Dimension #{super}"
     end
-
-
-    private
-
+    
     def field_methods!
-      field.definition.each_pair do |k,v|
-        if v.kind_of? Proc
-          define_singleton_method k, ((proc {|x| @modifier = x; self}) << v)
-        elsif v.kind_of? String
-          define_singleton_method k do @modifier = v; self end
-        else
-          raise "Unexpected type #{k.class.name} for definition of #{name}[#{k}]"
+      excluded = [:expression] + self.class.instance_methods(false)
+      definition.class.instance_methods(false).each do |name|
+        unless excluded.include?(name)
+          define_singleton_method name do |*args|
+            definition.send name, *args
+            self
+          end
         end
       end
     end
+        
 
   end
 end

data/lib/activecube/query_methods.rb

@@ -5,7 +5,7 @@ module Activecube
 
     attr_reader :database, :role
 
-    [:slice, :measure, :when, :skip, :take, :desc, :asc].each do |method|
+    [:slice, :measure, :when, :desc, :asc, :limit, :offset].each do |method|
       define_method(method) do |*args|
         Query::CubeQuery.new(self).send method, *args
       end
@@ -25,10 +25,9 @@ module Activecube
 
     def super_model
       raise ArgumentError, "No tables specified for cube #{name}" if tables.count==0
-      return tables.first.model if tables.count==1
 
       tables.collect{ |t|
-        t.model.ancestors.select{|c| c <= ActiveRecord::Base }.reverse
+        t.model.ancestors.select{|c| c < ActiveRecord::Base }
       }.transpose.select{|c|
         c.uniq.count==1
       }.last.first

data/lib/activecube/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord