activecube 0.1.16 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb3ccb257bfc59c8fe18661b176dfe81640f5d55a937af1dc583fae54fd99f71
-  data.tar.gz: 596cce0400e3c8365acbad0266611b085e6edd29ab57a86567438b97943cb3b4
+  metadata.gz: e08b7128492c4b84b982715355728b6506c0eb4dc155875ef1323bc88e9c9777
+  data.tar.gz: 856d25b480a319b11476c9d388f20aa656325f812299018c67df6b44bed322e8
 SHA512:
-  metadata.gz: ec0626748c08a48ea5e9172a2953bb92e4c8fb4a9f7b21f2397ca1b2fc9e076f99108b7887cb13e709e38cd4f19b9db1088eed58bd2f68b14d52a643081d3062
-  data.tar.gz: c0f4547ff2b3eaf19a56038fa8462999de24bd2dc237df0b75b653843f6801ee6a2aa721d45ae7f8da930e265c167cd4157cba349f3836fb2f4df487f611d371
+  metadata.gz: 76d9c60cfba31ac7f65f819dc1e5b8b0d6689aebbb162f8677f45e7388442dfc7d581e2bec945478d058891f61fc2b7b34de5b7e79f40c510bb88c1f21647547
+  data.tar.gz: 880550994778371e8dbd416691bc252a51de37123557ee73ad4c4ac5dcdb273a2a29084787c311b7219629cf42ac782302e664a495e5870deb69e4a6a8323730

data/Gemfile.lock

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

data/lib/activecube.rb

@@ -3,6 +3,7 @@ require 'activecube/active_record_extension'
 
 require 'activecube/input_argument_error'
 require 'activecube/base'
+require 'activecube/view'
 require 'activecube/dimension'
 require 'activecube/metric'
 require 'activecube/selector'

data/lib/activecube/cube_definition.rb

@@ -18,7 +18,7 @@ module Activecube
 
     end
 
-    attr_reader :dimensions, :metrics, :selectors, :models
+    attr_reader :dimensions, :metrics, :selectors, :models, :options
 
     def inspect
       name +
@@ -46,6 +46,10 @@ module Activecube
       store_definition_array! 'model', (@models ||= []), [*args].flatten.map{|t| t }
     end
 
+    def option *args
+      store_definition_array! 'option', (@options ||= []), [*args].flatten.map{|t| t }
+    end
+
     def dim_column column_name
       Class.new(Activecube::Dimension) do
         column column_name

data/lib/activecube/processor/composer.rb

@@ -7,13 +7,13 @@ require 'activecube/query/measure_nothing'
 module Activecube::Processor
   class Composer
 
-    attr_reader :cube_query, :models
+    attr_reader :cube_query, :models, :query
     def initialize cube_query
       @cube_query = cube_query
     end
 
     def build_query
-      compose_queries optimize! ranked_tables
+      @query = compose_queries optimize! ranked_tables
     end
 
     def connection

data/lib/activecube/query/cube_query.rb

@@ -3,6 +3,7 @@ require 'activecube/query/item'
 require 'activecube/query/limit'
 require 'activecube/query/measure'
 require 'activecube/query/ordering'
+require 'activecube/query/option'
 require 'activecube/query/selector'
 require 'activecube/query/slice'
 
@@ -13,29 +14,44 @@ module Activecube::Query
 
     include ChainAppender
 
-    attr_reader :cube, :slices, :measures, :selectors, :options, :tables
+    attr_reader :cube, :slices, :measures, :selectors, :options, :tables, :sql
     def initialize cube, slices = [], measures = [], selectors = [], options = [], model_tables = nil
       @cube = cube
       @slices = slices
       @measures = measures
       @selectors = selectors
       @options = options
-      @tables = model_tables || cube.models.map{|m| Activecube::Processor::Table.new m}
+
+      @tables = model_tables || cube.models.map{|m|
+        m < Activecube::View ? m.new : Activecube::Processor::Table.new(m)
+      }
+
+      cube.options && cube.options.each do |option|
+        define_singleton_method option.to_s.underscore do |*args|
+          @options << Option.new(option, *args)
+          self
+        end
+      end
+
     end
 
     def slice *args
+      clear_sql
       append *args, @slices, Slice, cube.dimensions
     end
 
     def measure *args
+      clear_sql
       append *args, @measures, Measure, cube.metrics
     end
 
     def when *args
+      clear_sql
       append *args, @selectors, Selector, cube.selectors
     end
 
     def desc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new(arg, :desc)
       }
@@ -43,6 +59,7 @@ module Activecube::Query
     end
 
     def asc *args
+      clear_sql
       args.each{|arg|
         options << Ordering.new( arg, :asc)
       }
@@ -50,6 +67,7 @@ module Activecube::Query
     end
 
     def offset *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :skip)
       }
@@ -57,6 +75,7 @@ module Activecube::Query
     end
 
     def limit *args
+      clear_sql
       args.each{|arg|
         options << Limit.new( arg, :take)
       }
@@ -65,13 +84,12 @@ module Activecube::Query
 
 
     def query
-      composer = Activecube::Processor::Composer.new(self)
-      sql = composer.build_query.to_sql
-      composer.connection.exec_query(sql)
+      sql = to_query.to_sql
+      @composed.connection.exec_query(sql)
     end
 
     def to_query
-      Activecube::Processor::Composer.new(self).build_query
+      @composed.try(:query) || (@composed = Activecube::Processor::Composer.new(self)).build_query
     end
 
     def to_sql
@@ -124,5 +142,10 @@ module Activecube::Query
       options.select{|s| s.kind_of? Ordering}
     end
 
+    private
+
+    def clear_sql
+      @composed = nil
+    end
   end
 end

data/lib/activecube/query/option.rb

@@ -0,0 +1,17 @@
+module Activecube
+  module Query
+    class Option
+
+      attr_reader :argument, :value
+      def initialize argument, value
+        @argument = argument
+        @value = value
+      end
+
+      def append_query _model, _cube_query, _table, query
+        query
+      end
+
+    end
+  end
+end

data/lib/activecube/query/selector.rb

@@ -20,13 +20,13 @@ module Activecube::Query
       end
 
       def to_s
-        "Selector any(#{@selectors.map(&:to_s).join(',')})"
+        "Selector #{operator.operation}(#{@selectors.map(&:to_s).join(',')})"
       end
 
       def expression model, arel_table, cube_query
         expr = nil
         @selectors.each do |s|
-          expr = expr ? expr.send(@operator, s.expression(model, arel_table, cube_query)) : s.expression(model, arel_table, cube_query)
+          expr = expr ? expr.send( operator.operation, s.expression(model, arel_table, cube_query)) : s.expression(model, arel_table, cube_query)
         end
         expr
       end
@@ -137,11 +137,11 @@ module Activecube::Query
     end
 
     def self.or(selectors)
-      CombineSelector.new(selectors, :or)
+      CombineSelector.new(selectors, Operator.new(:or, nil) )
     end
 
     def self.and(selectors)
-      CombineSelector.new(selectors, :and)
+      CombineSelector.new(selectors, Operator.new(:and, nil))
     end
 
   end

data/lib/activecube/query_methods.rb

@@ -24,9 +24,12 @@ module Activecube
 
 
     def super_model
-      raise Activecube::InputArgumentError, "No tables specified for cube #{name}" if models.count==0
+      raise Activecube::InputArgumentError, "No tables specified for cube #{name}" unless models && models.count>0
 
-      models.collect{ |t|
+
+      models.collect{|m|
+        m < View ? m.models : m
+      }.flatten.uniq.collect{ |t|
         t.ancestors.select{|c| c < ActiveRecord::Base }
       }.transpose.select{|c|
         c.uniq.count==1

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.16"
+  VERSION = "0.1.24"
 end

data/lib/activecube/view.rb

@@ -0,0 +1,34 @@
+require 'activecube/view_definition'
+require 'activecube/view_connection'
+
+module Activecube
+  class View
+    extend ViewDefinition
+    extend ViewConnection
+
+    def model
+      self.class
+    end
+
+    def name
+      model.name
+    end
+
+    def matches? query, _measures = query.measures
+      true
+    end
+
+    def measures? measure
+      true
+    end
+
+    def query _cube_query
+      raise "query method have to be implemented in #{name}"
+    end
+
+    def join _cube_query, _left_query, _right_query
+      raise "join method have to be implemented in #{name}"
+    end
+
+  end
+end

data/lib/activecube/view_connection.rb

@@ -0,0 +1,11 @@
+require 'active_support/concern'
+
+module Activecube::ViewConnection
+
+    attr_reader :connection
+
+    def connect_to connection
+      @connection = connection
+    end
+
+end

data/lib/activecube/view_definition.rb

@@ -0,0 +1,16 @@
+require 'active_support/concern'
+
+module Activecube::ViewDefinition
+
+    attr_reader :activecube_indexes, :models
+
+    def index index_name, *args
+      (@activecube_indexes ||= []) << Activecube::Processor::Index.new(index_name,*args)
+    end
+
+    def table x
+      (@models ||= []) << x
+    end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.24
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,12 +111,16 @@ files:
 - lib/activecube/query/measure.rb
 - lib/activecube/query/measure_nothing.rb
 - lib/activecube/query/modification.rb
+- lib/activecube/query/option.rb
 - lib/activecube/query/ordering.rb
 - lib/activecube/query/selector.rb
 - lib/activecube/query/slice.rb
 - lib/activecube/query_methods.rb
 - lib/activecube/selector.rb
 - lib/activecube/version.rb
+- lib/activecube/view.rb
+- lib/activecube/view_connection.rb
+- lib/activecube/view_definition.rb
 homepage: https://github.com/bitquery/activecube
 licenses:
 - MIT