activecube 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb3ccb257bfc59c8fe18661b176dfe81640f5d55a937af1dc583fae54fd99f71
-  data.tar.gz: 596cce0400e3c8365acbad0266611b085e6edd29ab57a86567438b97943cb3b4
+  metadata.gz: 4ba2ca856a96d75c2628e55d650d8151b8a7a21b4f403e147d9d1f84f19a94b8
+  data.tar.gz: ea75a5c6d7fa9471213788d65be3c55e5a4b0587af8c53c14b79d7c02f40d554
 SHA512:
-  metadata.gz: ec0626748c08a48ea5e9172a2953bb92e4c8fb4a9f7b21f2397ca1b2fc9e076f99108b7887cb13e709e38cd4f19b9db1088eed58bd2f68b14d52a643081d3062
-  data.tar.gz: c0f4547ff2b3eaf19a56038fa8462999de24bd2dc237df0b75b653843f6801ee6a2aa721d45ae7f8da930e265c167cd4157cba349f3836fb2f4df487f611d371
+  metadata.gz: 92fec873743db10f2f2b7b9bbd919e96d960ade4a3abf2dd0fd82f32e5642ff0eddccfd78ec66a787e62a1de5958b12143410899edd7a80251525cb907dbc29a
+  data.tar.gz: 1006ba66ef723a95503b61d1598226358f1c0a8fbff3946a4a0ea7aa6f34408c016a817e3a7a8bfd35588b9b49aac45a7feed8058e7db47792eedcd367167256

data/Gemfile.lock

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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord