activecube 0.1.15 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ee0a4ed85e2f44c15312a2fb5db85b51216c762b11841a6bbeccfe0f61feb1
-  data.tar.gz: e8d1e9cafbdbfae253795a7e800c58c5440b58f8cf2114ed22b4c3939d3b84d8
+  metadata.gz: f4761a4080baea000688c32cd35753b72f0fd51d7e6a0818da31c8bd5141f966
+  data.tar.gz: e5116aa48a23176bd91f4e90bbf6d83ac300c09aa3c04a951afbe8eeb3918133
 SHA512:
-  metadata.gz: c71efd229e58542bb67a2013f2931977cd32bed9c561d6b2f868ddd84584fd2b0d148d2381cdc456d0cb6e63379387fffffa8ced761125124609689476c0de3a
-  data.tar.gz: 4e9d3e28aabfc5abe471db21018db200da52e16c0ca38327bacde36eec88ca16dc8f0592dddb07bc295b31e7c7a3acb4d45044c6f9785dcd013f1fa820369971
+  metadata.gz: 2638118ea471ff784d1689a86dde10a535dcfd0e4eabeb93a9b6206236f116017ffe5d08de03820adb45d5e4291b42ca853c755efa5cddf37d664a09e3122ea9
+  data.tar.gz: 6339c6bad22e0c0fbebbd2e8987ccac2085374fa31e274c902963b5de5b8f5dd6531b19dc95c79ccf9e1722ee277bb469a1bddc03d41d991d8fe64cafa61c63e

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    activecube (0.1.14)
+    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/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'
 
@@ -20,7 +21,18 @@ module Activecube::Query
       @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

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.15"
+  VERSION = "0.1.23"
 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.15
+  version: 0.1.23
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-28 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