activecube 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c706faf950e642b3216ee5bce134ae45c9ad1047395825426897961a2bf357e
-  data.tar.gz: eb49f277b4fe9ade7817fd9b3d69389ec0879ae3a92004c5d2fa85a2a19a1d70
+  metadata.gz: bafdfeabff735168eac514c7a3fa3d80c70e74fcb43372d9110eec9dd58d2eb8
+  data.tar.gz: 45f11a99a45eafaf84a127b2e5328ae77515d835122c000669c66fe06a0777a1
 SHA512:
-  metadata.gz: 5754c7e2658c9456bee51c66f21ca42da0f7198bf155b06386e845745da098c282a89cd4c388d3581421d0c9e89704accd2249c45b3c30ff32e72744d0b52fbe
-  data.tar.gz: e5ff2a9a0ac8706dae669b7c0355f2e04ff5f6bb2ca7415253ada1fe76d1036dbdcd8d5b9202b3c10cd19996184b52498fecd7debf4be4547af01f3b27a0e36b
+  metadata.gz: b2faf2c565024c87ddd2045eb644ded72158ebeeec8ce200cd2937d428961a36a8f61c1d3ab83a433ab423a3270ec4af58d5b36f8d17bb99a2d7af2f0505c91a
+  data.tar.gz: 27da45c79d812fabb3d59a53d2739db1ae7dde7bd6377be3ca00a7733e0ed169719416b49c9bfefc9a6b3c572a5f4ec3d9c8518f8b78a3e9b05f99f015d8eba8

data/Gemfile.lock

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

data/lib/activecube/query/item.rb

@@ -22,9 +22,6 @@ module Activecube::Query
       "#{definition.class.name}(#{key})"
     end
 
-
-    private
-
     def append_with! model, cube_query, table, query
 
       if definition.respond_to?(:with_expression) &&
@@ -36,6 +33,10 @@ module Activecube::Query
       query
     end
 
+    private
+
+
+
     def try_append_with(query, key, expr)
       expr = Arel.sql(expr) if expr.kind_of?(String)
       if (with = query.ast.with)

data/lib/activecube/query/selector.rb

@@ -32,7 +32,11 @@ module Activecube::Query
       end
 
       def append_query model, cube_query, arel_table, query
-        query = append_with!(model, cube_query, arel_table, query)
+
+        @selectors.each do |s|
+          query = s.append_with!(model, cube_query, arel_table, query)
+        end
+
         query.where expression(model, arel_table, cube_query)
       end
 
@@ -111,6 +115,7 @@ module Activecube::Query
     end
 
     def append_query model, cube_query, table, query
+      query = append_with!(model, cube_query, table, query)
       query.where(expression model, table, cube_query)
     end
 

data/lib/activecube/version.rb

@@ -1,3 +1,3 @@
 module Activecube
-  VERSION = "0.1.31"
+  VERSION = "0.1.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Aleksey Studnev