activecube 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc592d6e33b4c77abc5a2dc0e5bbed62434af3a16403872d8d12540e5a9d7b31
-  data.tar.gz: 69ec2c856c6dab1a6100ebac782995ee1f53fbc776282032f626d6e0334da195
+  metadata.gz: 369247513801c454ee5bddd94d9d16b5e76a09a564b1461fd6910aeff50f512f
+  data.tar.gz: eb104eb20d315005026cde81d06d465aa68d4d450f0c27450afb44e6c6aa8d3d
 SHA512:
-  metadata.gz: 6fd7d10f47d6c23baa720925fd6ed40f0372627b5ec4def3566671feb1025199c9c419c34edaf43a0f019423599d56ca53bbfd44906fcd2accf944aa8128f476
-  data.tar.gz: fa8ef0205dafa5350b6e6319b9437cb03b824f9c98050ae48791a6faeee4959a414adda98688a67392446b9f432c56a33ee85aebab3cd08d358ee69d30dd2299
+  metadata.gz: f69aa684221fa54d01d8010816b895aa625a5454f02f4571757aec758dcb574121eca001bd7a6dbf2eac2579e6197829bafd8e983218af975868f15cff54c277
+  data.tar.gz: 91edb538973ff684ef2bc0eaeeee508176396802d3e48179b18644e084fc744793dbf3fa0f71f2a2b77f018d59b503b12727ad7e76e8f0374f13caaf0644f1f1

data/Gemfile.lock

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

data/lib/activecube.rb

@@ -1,6 +1,7 @@
 require "activecube/version"
 require 'activecube/active_record_extension'
 
+require 'activecube/input_argument_error'
 require 'activecube/base'
 require 'activecube/dimension'
 require 'activecube/metric'

data/lib/activecube/cube_definition.rb

@@ -13,19 +13,19 @@ module Activecube
 
       def [] key
         v = super key
-        v.nil? ? nil : @entry_class.new(@cube, key, v)
+        v.nil? ? nil : @entry_class.new(@cube, key, v.new)
       end
 
     end
 
-    attr_reader :dimensions, :metrics, :selectors, :tables
+    attr_reader :dimensions, :metrics, :selectors, :models
 
     def inspect
       name +
           (@dimensions && " Dimensions: #{@dimensions.keys.join(',')}")+
           (@metrics && " Metrics: #{@metrics.keys.join(',')}")+
           (@selectors && " Selectors: #{@selectors.keys.join(',')}")+
-          (@tables && " Tables: #{@tables.map(&:name).join(',')}")
+          (@models && " Models: #{@models.map(&:name).join(',')}")
     end
 
     private
@@ -43,13 +43,13 @@ module Activecube
     end
 
     def table *args
-      store_definition_array! 'table', (@tables ||= []), [*args].flatten.map{|t| Processor::Table.new t }
+      store_definition_array! 'model', (@models ||= []), [*args].flatten.map{|t| t }
     end
 
     def store_definition_map! name, map, data
       data.each_pair do |key, class_def|
         raise DefinitionError, "#{key} already defined for #{name}" if map.has_key?(key)
-        map[key] = class_def.new
+        map[key] = class_def
       end
     end
 

data/lib/activecube/definition_methods.rb

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

data/lib/activecube/field.rb

@@ -11,7 +11,7 @@ module Activecube
       elsif arg.kind_of?(Class) && arg < Field
         arg.new name
       else
-        raise ArgumentError, "Unexpected field #{name} definition with #{arg.class.name}"
+        raise Activecube::InputArgumentError, "Unexpected field #{name} definition with #{arg.class.name}"
       end
     end
 
@@ -21,7 +21,7 @@ module Activecube
     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)
+      raise Activecube::InputArgumentError, "String expression expected for #{name} field, instead #{definition.class.name} is found" unless definition.kind_of?(String)
       definition
     end
 

data/lib/activecube/input_argument_error.rb

@@ -0,0 +1,4 @@
+module Activecube
+  class InputArgumentError < ::ArgumentError
+  end
+end

data/lib/activecube/processor/composer.rb

@@ -51,7 +51,7 @@ module Activecube::Processor
     end
 
     def ranked_tables
-      tables = cube_query.cube.tables.select{|table| table.matches? cube_query, []}
+      tables = cube_query.tables.select{|table| table.matches? cube_query, []}
       measures = cube_query.measures.empty? ?
                      [Activecube::Query::MeasureNothing.new(cube_query.cube)] :
                      cube_query.measures

data/lib/activecube/query/chain_appender.rb

@@ -10,11 +10,11 @@ module Activecube::Query
           arg
         elsif arg.kind_of? Hash
           arg.collect{|pair|
-            raise ArgumentError, "Unexpected #{pair.second.class.name} to use for #{def_class} as #{arg}[#{pair.first}]" unless pair.second.kind_of?(def_class)
+            raise Activecube::InputArgumentError, "Unexpected #{pair.second.class.name} to use for #{def_class} as #{arg}[#{pair.first}]" unless pair.second.kind_of?(def_class)
             pair.second.alias! pair.first
           }
         else
-          raise ArgumentError, "Unexpected #{arg.class} to use for #{def_class} as #{arg}"
+          raise Activecube::InputArgumentError, "Unexpected #{arg.class} to use for #{def_class} as #{arg}"
         end
       }.flatten
       self

data/lib/activecube/query/cube_query.rb

@@ -14,13 +14,14 @@ module Activecube::Query
 
     include ChainAppender
 
-    attr_reader :cube, :slices, :measures, :selectors, :options
-    def initialize cube, slices = [], measures = [], selectors = [], options = []
+    attr_reader :cube, :slices, :measures, :selectors, :options, :tables
+    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}
     end
 
     def slice *args
@@ -113,7 +114,7 @@ module Activecube::Query
 
       return self if (reduced_measures == self.measures) && (reduced_selectors == self.selectors)
 
-      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options
+      CubeQuery.new cube, slices, reduced_measures, reduced_selectors, other_options, tables
     end
 
     def join_fields

data/lib/activecube/query/selector.rb

@@ -50,7 +50,7 @@ module Activecube::Query
 
     OPERATORS.each do |method|
       define_method(method) do |*args|
-        raise ArgumentError, "Selector for #{method} already set" if operator
+        raise Activecube::InputArgumentError, "Selector for #{method} already set" if operator
         if ARRAY_OPERATORS.include? method
           @operator = Operator.new(method, args.flatten)
         elsif method=='between'
@@ -59,10 +59,10 @@ module Activecube::Query
           elsif args.kind_of?(Array) && (arg = args.flatten).count==2
             @operator = Operator.new(method, arg[0]..arg[1])
           else
-            raise ArgumentError, "Unexpected size of arguments for #{method}, must be Range or Array of 2"
+            raise Activecube::InputArgumentError, "Unexpected size of arguments for #{method}, must be Range or Array of 2"
           end
         else
-          raise ArgumentError, "Unexpected size of arguments for #{method}" unless args.size==1
+          raise Activecube::InputArgumentError, "Unexpected size of arguments for #{method}" unless args.size==1
           @operator = Operator.new(method, args.first)
         end
         self

data/lib/activecube/query/slice.rb

@@ -24,13 +24,13 @@ module Activecube::Query
 
       key = arg.to_sym
 
-      child = if definition.kind_of? Activecube::Dimension
-                definition.class.fields && definition.class.fields[key]
+      child = if definition.kind_of?(Activecube::Dimension) && definition.class.fields && (fdef = definition.class.fields[key])
+                Activecube::Field.build key, fdef
               elsif definition.kind_of?(Activecube::Field) && (hash = definition.definition).kind_of?(Hash)
-                hash[key]
+                Activecube::Field.build key, hash[key]
               end
 
-      raise ArgumentError, "Field #{key} is not defined for #{definition}" unless child
+      raise Activecube::InputArgumentError, "Field #{key} is not defined for #{definition}" unless child
 
       if child.kind_of?(Class) && child <= Activecube::Field
         child = child.new key

data/lib/activecube/query_methods.rb

@@ -12,7 +12,7 @@ module Activecube
     end
 
     def connected_to database: nil, role: nil, &block
-      raise ArgumentError, "Must pass block to method" unless block_given?
+      raise Activecube::InputArgumentError, "Must pass block to method" unless block_given?
       super_model.connected_to(database: database, role: role) do
         @database = database
         @role = role
@@ -24,10 +24,10 @@ module Activecube
 
 
     def super_model
-      raise ArgumentError, "No tables specified for cube #{name}" if tables.count==0
+      raise Activecube::InputArgumentError, "No tables specified for cube #{name}" if models.count==0
 
-      tables.collect{ |t|
-        t.model.ancestors.select{|c| c < ActiveRecord::Base }
+      models.collect{ |t|
+        t.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.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -96,6 +96,7 @@ files:
 - lib/activecube/definition_methods.rb
 - lib/activecube/dimension.rb
 - lib/activecube/field.rb
+- lib/activecube/input_argument_error.rb
 - lib/activecube/metric.rb
 - lib/activecube/modifier.rb
 - lib/activecube/processor/composer.rb